MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-29 16:33:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Suppress ExternalLoginUserNotExist error (#21504) (#21572)

Browse source 
Backport of #21504

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
KN4CK3R 2022-10-25 18:08:05 +02:00 committed by GitHub
parent 169c08e20a
commit 2ccf940464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -613,9 +613,11 @@ func handleUserCreated(ctx *context.Context, u *user_model.User, gothUser *goth.
// update external user information
if gothUser != nil {
if err := externalaccount.UpdateExternalUser(u, *gothUser); err != nil {
if !user_model.IsErrExternalLoginUserNotExist(err) {
log.Error("UpdateExternalUser failed: %v", err)
}
}
}
// Send confirmation email
if !u.IsActive && u.ID > 1 {

2
routers/web/auth/oauth.go
View file

@ -1061,8 +1061,10 @@ func handleOAuth2SignIn(ctx *context.Context, source *auth.Source, u *user_model
// update external user information
if err := externalaccount.UpdateExternalUser(u, gothUser); err != nil {
if !user_model.IsErrExternalLoginUserNotExist(err) {
log.Error("UpdateExternalUser failed: %v", err)
}
}
if err := resetLocale(ctx, u); err != nil {
ctx.ServerError("resetLocale", err)