Suppress ExternalLoginUserNotExist error (#21504) (#21572)

KN4CK3R · lunny · web-flow · commit 2ccf9404647b · 2022-10-26T00:08:05.000+08:00
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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,9 @@ func handleUserCreated(ctx context.Context, u user_model.User, gothUser *goth.`
`613`	`613`	`// update external user information`
`614`	`614`	`if gothUser != nil {`
`615`	`615`	`if err := externalaccount.UpdateExternalUser(u, *gothUser); err != nil {`
`616`		`- log.Error("UpdateExternalUser failed: %v", err)`
	`616`	`+ if !user_model.IsErrExternalLoginUserNotExist(err) {`
	`617`	`+ log.Error("UpdateExternalUser failed: %v", err)`
	`618`	`+ }`
`617`	`619`	`}`
`618`	`620`	`}`
`619`	`621`
Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,9 @@ func handleOAuth2SignIn(ctx context.Context, source auth.Source, u *user_model`
`1061`	`1061`
`1062`	`1062`	`// update external user information`
`1063`	`1063`	`if err := externalaccount.UpdateExternalUser(u, gothUser); err != nil {`
`1064`		`- log.Error("UpdateExternalUser failed: %v", err)`
	`1064`	`+ if !user_model.IsErrExternalLoginUserNotExist(err) {`
	`1065`	`+ log.Error("UpdateExternalUser failed: %v", err)`
	`1066`	`+ }`
`1065`	`1067`	`}`
`1066`	`1068`
`1067`	`1069`	`if err := resetLocale(ctx, u); err != nil {`