aboutsummaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorBaltazár Radics <baltazar.radics@gmail.com>2024-11-18 12:24:17 +0100
committerGitHub <noreply@github.com>2024-11-18 19:24:17 +0800
commit5eb0ee49a101bfc899892f4879d5da4a4bcfbfbf (patch)
treecb426a91147039176b05c0e0dba105cd3060c263 /routers
parent896314c7a2be7987b07f5e7ca7aa4b0a82c97c71 (diff)
downloadgitea-5eb0ee49a101bfc899892f4879d5da4a4bcfbfbf.tar.gz
gitea-5eb0ee49a101bfc899892f4879d5da4a4bcfbfbf.zip
Use user.FullName in Oauth2 id_token response (#32542)
This makes `/login/oauth/authorize` behave the same way as the `/login/oauth/userinfo` endpoint.
Diffstat (limited to 'routers')
-rw-r--r--routers/web/auth/oauth2_provider.go2
-rw-r--r--routers/web/auth/oauth_test.go21
2 files changed, 2 insertions, 21 deletions
diff --git a/routers/web/auth/oauth2_provider.go b/routers/web/auth/oauth2_provider.go
index d844d42421..2ccc4a2253 100644
--- a/routers/web/auth/oauth2_provider.go
+++ b/routers/web/auth/oauth2_provider.go
@@ -98,7 +98,7 @@ func InfoOAuth(ctx *context.Context) {
response := &userInfoResponse{
Sub: fmt.Sprint(ctx.Doer.ID),
- Name: ctx.Doer.FullName,
+ Name: ctx.Doer.DisplayName(),
PreferredUsername: ctx.Doer.Name,
Email: ctx.Doer.Email,
Picture: ctx.Doer.AvatarLink(ctx),
diff --git a/routers/web/auth/oauth_test.go b/routers/web/auth/oauth_test.go
index 78af97fa9c..8d9365fab4 100644
--- a/routers/web/auth/oauth_test.go
+++ b/routers/web/auth/oauth_test.go
@@ -10,7 +10,6 @@ import (
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
- "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/services/oauth2_provider"
"github.com/golang-jwt/jwt/v5"
@@ -66,25 +65,7 @@ func TestNewAccessTokenResponse_OIDCToken(t *testing.T) {
// Scopes: openid profile email
oidcToken = createAndParseToken(t, grants[0])
- assert.Equal(t, user.Name, oidcToken.Name)
- assert.Equal(t, user.Name, oidcToken.PreferredUsername)
- assert.Equal(t, user.HTMLURL(), oidcToken.Profile)
- assert.Equal(t, user.AvatarLink(db.DefaultContext), oidcToken.Picture)
- assert.Equal(t, user.Website, oidcToken.Website)
- assert.Equal(t, user.UpdatedUnix, oidcToken.UpdatedAt)
- assert.Equal(t, user.Email, oidcToken.Email)
- assert.Equal(t, user.IsActive, oidcToken.EmailVerified)
-
- // set DefaultShowFullName to true
- oldDefaultShowFullName := setting.UI.DefaultShowFullName
- setting.UI.DefaultShowFullName = true
- defer func() {
- setting.UI.DefaultShowFullName = oldDefaultShowFullName
- }()
-
- // Scopes: openid profile email
- oidcToken = createAndParseToken(t, grants[0])
- assert.Equal(t, user.FullName, oidcToken.Name)
+ assert.Equal(t, user.DisplayName(), oidcToken.Name)
assert.Equal(t, user.Name, oidcToken.PreferredUsername)
assert.Equal(t, user.HTMLURL(), oidcToken.Profile)
assert.Equal(t, user.AvatarLink(db.DefaultContext), oidcToken.Picture)