devstack/authorizer
4
0
Fork 0
Code Pull Requests Actions Activity

fix: oauth callback update user

Browse Source
This commit is contained in:
Lakhan Samani 2022-02-02 12:30:11 +05:30
parent 63a8c82535
commit 2f29bbcee4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/handlers/oauth_callback.go
View File

@ -96,8 +96,8 @@ func OAuthCallbackHandler() gin.HandlerFunc {
if !strings.Contains(signupMethod, provider) { if !strings.Contains(signupMethod, provider) {
signupMethod = signupMethod + "," + provider signupMethod = signupMethod + "," + provider
} }
user = existingUser
user.SignupMethods = signupMethod user.SignupMethods = signupMethod
user.Password = existingUser.Password
if user.EmailVerifiedAt == nil { if user.EmailVerifiedAt == nil {
now := time.Now().Unix() now := time.Now().Unix()
@ -136,12 +136,13 @@ func OAuthCallbackHandler() gin.HandlerFunc {
} else { } else {
user.Roles = existingUser.Roles user.Roles = existingUser.Roles
} }
user.Key = existingUser.Key
user.ID = existingUser.ID
user, err = db.Provider.UpdateUser(user)
}
user, _ = db.Provider.GetUserByEmail(user.Email) user, err = db.Provider.UpdateUser(user)
if err != nil {
c.JSON(500, gin.H{"error": err.Error()})
return
}
}
authToken, _ := token.CreateAuthToken(user, inputRoles) authToken, _ := token.CreateAuthToken(user, inputRoles)
sessionstore.SetUserSession(user.ID, authToken.FingerPrint, authToken.RefreshToken.Token) sessionstore.SetUserSession(user.ID, authToken.FingerPrint, authToken.RefreshToken.Token)