同步历史版本代码

internal/logic/public/user/updateBindEmailLogic.go

@@ -2,6 +2,7 @@ package user
 
 import (
 	"context"
+	"strings"
 
 	"github.com/perfect-panel/server/pkg/constant"
 
@@ -31,24 +32,42 @@ func NewUpdateBindEmailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *U
 }
 
 func (l *UpdateBindEmailLogic) UpdateBindEmail(req *types.UpdateBindEmailRequest) error {
+	req.Email = strings.ToLower(strings.TrimSpace(req.Email))
+
 	u, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User)
 	if !ok {
 		logger.Error("current user is not found in context")
 		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
 	}
-	method, err := l.svcCtx.UserModel.FindUserAuthMethodByUserId(l.ctx, "email", u.Id)
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "FindUserAuthMethodByOpenID error")
+
+	familyHelper := newFamilyBindingHelper(l.ctx, l.svcCtx)
+
+	method, err := familyHelper.getUserEmailMethod(u.Id)
+	if err != nil {
+		return err
 	}
+	if method != nil {
+		if method.AuthIdentifier == req.Email {
+			return errors.Wrapf(xerr.NewErrCode(xerr.FamilyAlreadyBound), "email already bound to current user")
+		}
+		return errors.Wrapf(xerr.NewErrCode(xerr.FamilyCrossBindForbidden), "email already bound to another account")
+	}
+
 	m, err := l.svcCtx.UserModel.FindUserAuthMethodByOpenID(l.ctx, "email", req.Email)
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "FindUserAuthMethodByOpenID error")
 	}
-	// email already bind
-	if m.Id > 0 {
-		return errors.Wrapf(xerr.NewErrCode(xerr.UserExist), "email already bind")
+	if m != nil && m.Id > 0 {
+		if m.UserId == u.Id {
+			return errors.Wrapf(xerr.NewErrCode(xerr.FamilyAlreadyBound), "email already bound to current user")
+		}
+		if err = familyHelper.validateJoinFamily(m.UserId, u.Id); err != nil {
+			return err
+		}
+		return errors.Wrapf(xerr.NewErrCode(xerr.EmailBindError), "email already bound to another user")
 	}
-	if method.Id == 0 {
+
+	if method == nil || method.Id == 0 {
 		method = &user.AuthMethods{
 			UserId:         u.Id,
 			AuthType:       "email",