Skip to content

fix(oauth): auto-bind verified external login to existing active user by email #1613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
renich wants to merge 2 commits into
base: dev
Choose a base branch
from
+37 −18
Open

fix(oauth): auto-bind verified external login to existing active user by email #1613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ee3902
fix(oauth): auto-bind verified external login to existing active user…
renich Sep 13, 2026
394b25d
fix(oauth): send verification email when binding existing user
renich Sep 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 37 additions & 18 deletions internal/service/user_external_login/user_external_login_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,31 @@ func (us *UserExternalLoginService) ExternalLogin(
}, nil
}

if _, exist, err := us.userRepo.GetByEmail(ctx, externalUserInfo.Email); err != nil {
oldUserInfo, exist, err := us.userRepo.GetByEmail(ctx, externalUserInfo.Email)
if err != nil {
return nil, err
} else if exist {
}
if !exist {
// if user is not a member, register a new user
oldUserInfo, err = us.registerNewUser(ctx, externalUserInfo)
if err != nil {
return nil, err
}
// set default user notification config for external user
if err := us.userNotificationConfigService.SetDefaultUserNotificationConfig(ctx, []string{oldUserInfo.ID}); err != nil {
log.Errorf("set default user notification config failed, err: %v", err)
}
} else if oldUserInfo.Status == entity.UserStatusDeleted {
return &schema.UserExternalLoginResp{
ErrTitle: translator.Tr(handler.GetLangByCtx(ctx), reason.UserAccessDenied),
ErrMsg: translator.Tr(handler.GetLangByCtx(ctx), reason.UserAccessDenied),
}, nil
} else {
if err := us.userRepo.UpdateLastLoginDate(ctx, oldUserInfo.ID); err != nil {
log.Errorf("update user last login date failed: %v", err)
}
}
// if user is not a member, register a new user
oldUserInfo, err := us.registerNewUser(ctx, externalUserInfo)
if err != nil {
return nil, err
}

// bind external user info to user
err = us.bindOldUser(ctx, externalUserInfo, oldUserInfo)
if err != nil {
Expand All @@ -211,11 +223,6 @@ func (us *UserExternalLoginService) ExternalLogin(
log.Error(err)
}

// set default user notification config for external user
if err := us.userNotificationConfigService.SetDefaultUserNotificationConfig(ctx, []string{oldUserInfo.ID}); err != nil {
log.Errorf("set default user notification config failed, err: %v", err)
}

accessToken, _, err := us.userCommonService.CacheLoginUserInfo(
ctx, oldUserInfo.ID, newMailStatus, oldUserInfo.Status, externalUserInfo.ExternalID)
return &schema.UserExternalLoginResp{AccessToken: accessToken}, err
Expand Down Expand Up @@ -361,18 +368,30 @@ func (us *UserExternalLoginService) ExternalLoginBindingUserSendEmail(
return &schema.ExternalLoginBindingUserSendEmailResp{}, nil
}

if _, exist, err := us.userRepo.GetByEmail(ctx, req.Email); err != nil {
oldUserInfo, exist, err := us.userRepo.GetByEmail(ctx, req.Email)
if err != nil {
return nil, err
} else if exist && !req.Must {
resp.EmailExistAndMustBeConfirmed = true
return resp, nil
} else if exist {
resp.EmailExistAndMustBeConfirmed = true
return resp, nil
}

externalLoginInfo.Email = req.Email
userInfo, err := us.registerNewUser(ctx, externalLoginInfo)
var userInfo *entity.User
if !exist {
externalLoginInfo.Email = req.Email
userInfo, err = us.registerNewUser(ctx, externalLoginInfo)
if err != nil {
return nil, err
}
resp.AccessToken, _, err = us.userCommonService.CacheLoginUserInfo(
ctx, userInfo.ID, userInfo.MailStatus, userInfo.Status, externalLoginInfo.ExternalID)
if err != nil {
log.Error(err)
}
} else {
externalLoginInfo.Email = req.Email
userInfo = oldUserInfo
}
if err != nil {
return nil, err
}
Expand Down