From f11bdfffa902dceaad9b28cc2267ddd8bf6c65a9 Mon Sep 17 00:00:00 2001 From: hiifong Date: Sun, 2 Feb 2025 14:46:30 +0800 Subject: [PATCH] Pre-register OAuth application for gh-tea --- custom/conf/app.example.ini | 3 ++- models/auth/oauth2.go | 5 +++++ modules/setting/oauth2.go | 2 +- modules/setting/oauth2_test.go | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 899209874f7cc..8829c19c409ed 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -581,7 +581,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 +;; * https://github.com/hiifong/gh-tea +;DEFAULT_APPLICATIONS = git-credential-oauth, git-credential-manager, tea, gh-tea ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go index c270e4856e767..ef17e998026a2 100644 --- a/models/auth/oauth2.go +++ b/models/auth/oauth2.go @@ -73,6 +73,11 @@ func BuiltinApplications() map[string]*BuiltinOAuth2Application { DisplayName: "tea", RedirectURIs: []string{"http://127.0.0.1", "https://127.0.0.1"}, } + m["9c0c7633-de85-4b51-938b-9fabc8cb7099"] = &BuiltinOAuth2Application{ + ConfigName: "gh-tea", + DisplayName: "gh-tea", + RedirectURIs: []string{"http://127.0.0.1", "https://127.0.0.1"}, + } return m } diff --git a/modules/setting/oauth2.go b/modules/setting/oauth2.go index 0d3e63e0b4aa3..17933cfcfe4fb 100644 --- a/modules/setting/oauth2.go +++ b/modules/setting/oauth2.go @@ -106,7 +106,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", "gh-tea"}, } func loadOAuth2From(rootCfg ConfigProvider) { diff --git a/modules/setting/oauth2_test.go b/modules/setting/oauth2_test.go index d0e5ccf13d26b..42e384d0eaf5e 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", "gh-tea"}, OAuth2.DefaultApplications) cfg, _ = NewConfigProviderFromData(`[oauth2] DEFAULT_APPLICATIONS = tea