p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(plugin): If user login with external account and email is exist, active user directly.

This commit is contained in:
LinkinStars 2023-03-01 10:48:11 +08:00
parent 334a1eceaa
commit 1065946c43
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/controller/connector_controller.go
View File

@ -74,6 +74,7 @@ func (cc *ConnectorController) ConnectorRedirect(connector plugin.Connector) (fn
ctx.Redirect(http.StatusFound, "/50x")
return
}
log.Debugf("connector received: %+v", userInfo)
u := &schema.ExternalLoginUserInfoCache{
Provider: connector.ConnectorSlugName(),
ExternalID: userInfo.ExternalID,

35
internal/service/user_external_login/user_external_login_service.go
View File

@ -68,13 +68,18 @@ func (us *UserExternalLoginService) ExternalLogin(
return nil, err
}
if exist {
// if user is already a member, login directly
oldUserInfo, exist, err := us.userRepo.GetByUserID(ctx, oldExternalLoginUserInfo.UserID)
if err != nil {
return nil, err
}
if exist {
if exist && oldUserInfo.Status != entity.UserStatusDeleted {
newMailStatus, err := us.activeUser(ctx, oldUserInfo.MailStatus, oldUserInfo.ID)
if err != nil {
log.Error(err)
}
accessToken, _, err := us.userCommonService.CacheLoginUserInfo(
ctx, oldUserInfo.ID, oldUserInfo.MailStatus, oldUserInfo.Status)
ctx, oldUserInfo.ID, newMailStatus, oldUserInfo.Status)
return &schema.UserExternalLoginResp{AccessToken: accessToken}, err
}
}
@ -93,19 +98,27 @@ func (us *UserExternalLoginService) ExternalLogin(
if err != nil {
return nil, err
}
// if user is not a member, register a new user
if !exist {
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 {
return nil, err
}
// If user login with external account and email is exist, active user directly.
newMailStatus, err := us.activeUser(ctx, oldUserInfo.MailStatus, oldUserInfo.ID)
if err != nil {
log.Error(err)
}
accessToken, _, err := us.userCommonService.CacheLoginUserInfo(
ctx, oldUserInfo.ID, oldUserInfo.MailStatus, oldUserInfo.Status)
ctx, oldUserInfo.ID, newMailStatus, oldUserInfo.Status)
return &schema.UserExternalLoginResp{AccessToken: accessToken}, err
}
@ -150,6 +163,22 @@ func (us *UserExternalLoginService) bindOldUser(ctx context.Context,
return err
}
func (us *UserExternalLoginService) activeUser(ctx context.Context, oldMailStatus int, userID string) (
mailStatus int, err error) {
log.Infof("user %s login with external account, try to active email, old status is %d", userID, oldMailStatus)
if oldMailStatus == entity.EmailStatusAvailable {
return oldMailStatus, nil
}
err = us.userRepo.UpdateEmailStatus(ctx, userID, entity.EmailStatusAvailable)
if err != nil {
return oldMailStatus, err
}
if err = us.userActivity.UserActive(ctx, userID); err != nil {
return oldMailStatus, err
}
return entity.EmailStatusAvailable, nil
}
// ExternalLoginBindingUserSendEmail Send an email for third-party account login for binding user
func (us *UserExternalLoginService) ExternalLoginBindingUserSendEmail(
ctx context.Context, req *schema.ExternalLoginBindingUserSendEmailReq) (