Fix GitHub OAuth

oj-lab · Oct 1, 2024 · db89ff0 · db89ff0
1 parent 1035ddc
commit db89ff0
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/cmd/web_server/handler/auth.go b/cmd/web_server/handler/auth.go
@@ -73,14 +73,16 @@ func githubCallback(ginCtx *gin.Context) {
 	}
 	var user *user_model.User
 	if total <= 0 {
-		uuid := uuid.New()
-		user, err = user_service.CreateUser(ginCtx, user_model.User{
-			Account:     uuid.String(),
+		creatingUser := user_model.User{
+			Account:     uuid.New().String(),
 			Name:        githubUser.Name,
-			Email:       &githubUser.Email,
 			AvatarURL:   githubUser.AvatarURL,
 			GithubLogin: &githubUser.Login,
-		})
+		}
+		if len(githubUser.Email) > 0 {
+			creatingUser.Email = &githubUser.Email
+		}
+		user, err = user_service.CreateUser(ginCtx, creatingUser)
 		if err != nil {
 			gin_utils.NewInternalError(ginCtx, fmt.Sprintf("failed to create user: %v", err))
 			return