diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 0ec2072c0ff..8d10d5adce3 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -608,7 +608,8 @@ ENABLED = true ;; * https://github.com/hickford/git-credential-oauth ;; * https://github.com/git-ecosystem/git-credential-manager ;; * https://gitea.com/gitea/tea -;DEFAULT_APPLICATIONS = git-credential-oauth, git-credential-manager, tea +;; * Gitea App (the official Gitea mobile app) +;DEFAULT_APPLICATIONS = git-credential-oauth, git-credential-manager, tea, gitea-app ;; ;; By default, OAuth2 applications can only use "http" and "https" as their redirect URI schemes. ;; If you need to use other schemes (e.g. for desktop applications), you can specify them here as a comma-separated list. diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go index f67a5560654..b9e4a6b0ba5 100644 --- a/models/auth/oauth2.go +++ b/models/auth/oauth2.go @@ -83,6 +83,11 @@ func BuiltinApplications() map[string]*BuiltinOAuth2Application { DisplayName: "tea", RedirectURIs: []string{"http://127.0.0.1", "https://127.0.0.1"}, } + m["b757811a-05c8-4c76-8d74-a5ee3d2073f2"] = &BuiltinOAuth2Application{ + ConfigName: "gitea-app", + DisplayName: "Gitea App", + RedirectURIs: []string{"com.gitea.app://oauth/callback"}, + } return m } diff --git a/modules/setting/oauth2.go b/modules/setting/oauth2.go index 0c2db10edf7..94bdf780dd4 100644 --- a/modules/setting/oauth2.go +++ b/modules/setting/oauth2.go @@ -108,7 +108,7 @@ var OAuth2 = struct { JWTSigningAlgorithm: "RS256", JWTSigningPrivateKeyFile: "jwt/private.pem", MaxTokenLength: math.MaxInt16, - DefaultApplications: []string{"git-credential-oauth", "git-credential-manager", "tea"}, + DefaultApplications: []string{"git-credential-oauth", "git-credential-manager", "tea", "gitea-app"}, } func loadOAuth2From(rootCfg ConfigProvider) { diff --git a/modules/setting/oauth2_test.go b/modules/setting/oauth2_test.go index a2235c6fc8a..7da186a9f49 100644 --- a/modules/setting/oauth2_test.go +++ b/modules/setting/oauth2_test.go @@ -62,7 +62,7 @@ func TestGetGeneralSigningSecretSave(t *testing.T) { func TestOauth2DefaultApplications(t *testing.T) { cfg, _ := NewConfigProviderFromData(``) loadOAuth2From(cfg) - assert.Equal(t, []string{"git-credential-oauth", "git-credential-manager", "tea"}, OAuth2.DefaultApplications) + assert.Equal(t, []string{"git-credential-oauth", "git-credential-manager", "tea", "gitea-app"}, OAuth2.DefaultApplications) cfg, _ = NewConfigProviderFromData(`[oauth2] DEFAULT_APPLICATIONS = tea