thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Change how username is retrieved from SSO
Some checks failed
mirror / mirror (push) Has been skipped
Details
testing / lint-backend (push) Failing after 6m40s
Details
testing / checks-backend (push) Failing after 3m57s
Details
testing / test-unit (push) Has been skipped
Details
testing / test-mysql (push) Has been skipped
Details
testing / test-pgsql (push) Has been skipped
Details
testing / test-sqlite (push) Has been skipped
Details

Browse source
This commit is contained in:
Anthony Lawn 2024-02-03 09:58:29 -06:00
parent 623f13f2dc
commit 2488750ea4
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
routers/web/auth/auth.go
View file

@ -372,14 +372,15 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember, obeyRe
} }
func getUserName(gothUser *goth.User) (string, error) { func getUserName(gothUser *goth.User) (string, error) {
switch setting.OAuth2Client.Username { return gothUser.RawData["preferred_username"]
case setting.OAuth2UsernameEmail: // switch setting.OAuth2Client.Username {
return user_model.NormalizeUserName(strings.Split(gothUser.Email, "@")[0]) // case setting.OAuth2UsernameEmail:
case setting.OAuth2UsernameNickname: // return user_model.NormalizeUserName(strings.Split(gothUser.Email, "@")[0])
return user_model.NormalizeUserName(gothUser.NickName) // case setting.OAuth2UsernameNickname:
default: // OAuth2UsernameUserid // return user_model.NormalizeUserName(gothUser.NickName)
return gothUser.UserID, nil // default: // OAuth2UsernameUserid
} // return gothUser.UserID, nil
// }
} }
// HandleSignOut resets the session and sets the cookies // HandleSignOut resets the session and sets the cookies