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

Fixbuild issue
Some checks failed
testing / test-sqlite (push) Blocked by required conditions
Details
mirror / mirror (push) Has been skipped
Details
testing / lint-backend (push) Successful in 15m47s
Details
testing / checks-backend (push) Successful in 5m33s
Details
testing / test-unit (push) Successful in 14m2s
Details
testing / test-mysql (push) Failing after 40m4s
Details
testing / test-pgsql (push) Has been cancelled
Details

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

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

@ -372,15 +372,7 @@ 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) {
return gothUser.RawData["preferred_username"] return user_model.NormalizeUserName(gothUser.RawData["preferred_username"].(string))
// switch setting.OAuth2Client.Username {
// case setting.OAuth2UsernameEmail:
// return user_model.NormalizeUserName(strings.Split(gothUser.Email, "@")[0])
// case setting.OAuth2UsernameNickname:
// return user_model.NormalizeUserName(gothUser.NickName)
// default: // OAuth2UsernameUserid
// return gothUser.UserID, nil
// }
} }
// HandleSignOut resets the session and sets the cookies // HandleSignOut resets the session and sets the cookies