From 2f29bbcee449ccd02ca4c7586e286664d259a94f Mon Sep 17 00:00:00 2001
From: Lakhan Samani <lakhan.m.samani@gmail.com>
Date: Wed, 2 Feb 2022 12:30:11 +0530
Subject: [PATCH] fix: oauth callback update user

---
 server/handlers/oauth_callback.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/handlers/oauth_callback.go b/server/handlers/oauth_callback.go
index b490c6b..50d783d 100644
--- a/server/handlers/oauth_callback.go
+++ b/server/handlers/oauth_callback.go
@@ -96,8 +96,8 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 			if !strings.Contains(signupMethod, provider) {
 				signupMethod = signupMethod + "," + provider
 			}
+			user = existingUser
 			user.SignupMethods = signupMethod
-			user.Password = existingUser.Password
 
 			if user.EmailVerifiedAt == nil {
 				now := time.Now().Unix()
@@ -136,12 +136,13 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 			} else {
 				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)
 		sessionstore.SetUserSession(user.ID, authToken.FingerPrint, authToken.RefreshToken.Token)