Suppress `ExternalLoginUserNotExist` error (#21504) (#21572)

Backport of #21504

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
index ea5c7232a8aec3941bffddc40e58ff06eebc84e8..bda6789d8d674e3fdaf264f898391f765827576e 100644 (file)
--- a/routers/web/auth/auth.go
+++ b/routers/web/auth/auth.go
@@ -613,7 +613,9 @@ 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 {
-                       log.Error("UpdateExternalUser failed: %v", err)
+                       if !user_model.IsErrExternalLoginUserNotExist(err) {
+                               log.Error("UpdateExternalUser failed: %v", err)
+                       }
                }
        }
 

diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
index a9fc39d0195c1ebb5626084f6dbfad35030852cd..0492d306562018ead4c0a62b5c2f6bcb8ca01352 100644 (file)
--- a/routers/web/auth/oauth.go
+++ b/routers/web/auth/oauth.go
@@ -1061,7 +1061,9 @@ func handleOAuth2SignIn(ctx *context.Context, source *auth.Source, u *user_model
 
                // update external user information
                if err := externalaccount.UpdateExternalUser(u, gothUser); err != nil {
-                       log.Error("UpdateExternalUser failed: %v", err)
+                       if !user_model.IsErrExternalLoginUserNotExist(err) {
+                               log.Error("UpdateExternalUser failed: %v", err)
+                       }
                }
 
                if err := resetLocale(ctx, u); err != nil {