Skip to content

Commit 2f29bbc

Browse files
committed
fix: oauth callback update user
1 parent 63a8c82 commit 2f29bbc

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

server/handlers/oauth_callback.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ func OAuthCallbackHandler() gin.HandlerFunc {
9696
if !strings.Contains(signupMethod, provider) {
9797
signupMethod = signupMethod + "," + provider
9898
}
99+
user = existingUser
99100
user.SignupMethods = signupMethod
100-
user.Password = existingUser.Password
101101

102102
if user.EmailVerifiedAt == nil {
103103
now := time.Now().Unix()
@@ -136,13 +136,14 @@ func OAuthCallbackHandler() gin.HandlerFunc {
136136
} else {
137137
user.Roles = existingUser.Roles
138138
}
139-
user.Key = existingUser.Key
140-
user.ID = existingUser.ID
139+
141140
user, err = db.Provider.UpdateUser(user)
141+
if err != nil {
142+
c.JSON(500, gin.H{"error": err.Error()})
143+
return
144+
}
142145
}
143146

144-
user, _ = db.Provider.GetUserByEmail(user.Email)
145-
146147
authToken, _ := token.CreateAuthToken(user, inputRoles)
147148
sessionstore.SetUserSession(user.ID, authToken.FingerPrint, authToken.RefreshToken.Token)
148149
cookie.SetCookie(c, authToken.AccessToken.Token, authToken.RefreshToken.Token, authToken.FingerPrintHash)

0 commit comments

Comments
 (0)