Merge pull request #328 from yokowu/feat-user-tip

feat: 优化用户登录注册提示

Author: yokowu

backend/errcode/errcode.go

@@ -14,6 +14,7 @@ var (
 	ErrUserNotFound        = web.NewBadRequestErr("err-user-not-found")
 	ErrUserLock            = web.NewBadRequestErr("err-user-lock")
 	ErrPassword            = web.NewBadRequestErr("err-password")
+	ErrAccountAlreadyExist = web.NewBadRequestErr("err-account-already-exist")
 	ErrInviteCodeInvalid   = web.NewBadRequestErr("err-invite-code-invalid")
 	ErrEmailInvalid        = web.NewBadRequestErr("err-email-invalid")
 	ErrOAuthStateInvalid   = web.NewBadRequestErr("err-oauth-state-invalid")

backend/errcode/locale.en.toml

@@ -7,6 +7,9 @@ other = "User not found"
 [err-user-lock]
 other = "User is locked"
 
+[err-account-already-exist]
+other = "Account already exists"
+
 [err-password]
 other = "Incorrect password"
 

backend/errcode/locale.zh.toml

@@ -7,6 +7,9 @@ other = "用户不存在"
 [err-user-lock]
 other = "用户已锁定"
 
+[err-account-already-exist]
+other = "当前账号已经注册"
+
 [err-only-admin]
 other = "仅管理员可操作"
 

backend/internal/user/repo/user.go

@@ -136,18 +136,25 @@ func (r *UserRepo) innerValidateInviteCode(ctx context.Context, tx *db.Tx, code
 	return ic, nil
 }
 
-func (r *UserRepo) CreateUser(ctx context.Context, user *db.User) (*db.User, error) {
+func (r *UserRepo) CreateUser(ctx context.Context, us *db.User) (*db.User, error) {
 	var res *db.User
 	err := entx.WithTx(ctx, r.db, func(tx *db.Tx) error {
 		if err := r.checkLimit(ctx, tx); err != nil {
 			return err
 		}
+		n, err := tx.User.Query().Where(user.Email(us.Email)).Count(ctx)
+		if err != nil {
+			return err
+		}
+		if n > 0 {
+			return errcode.ErrAccountAlreadyExist
+		}
 		u, err := tx.User.Create().
-			SetUsername(user.Username).
-			SetEmail(user.Email).
-			SetPassword(user.Password).
-			SetStatus(user.Status).
-			SetPlatform(user.Platform).
+			SetUsername(us.Username).
+			SetEmail(us.Email).
+			SetPassword(us.Password).
+			SetStatus(us.Status).
+			SetPlatform(us.Platform).
 			Save(ctx)
 		if err != nil {
 			return err
@@ -377,7 +384,8 @@ func (r *UserRepo) OAuthRegister(ctx context.Context, platform consts.UserPlatfo
 			Where(useridentity.Platform(platform), useridentity.IdentityID(req.ID)).
 			First(ctx)
 		if err == nil {
-			return fmt.Errorf("user already exists for platform %s and identity ID %s", platform, req.ID)
+			e := fmt.Errorf("user already exists for platform %s and identity ID %s", platform, req.ID)
+			return errcode.ErrAccountAlreadyExist.Wrap(e)
 		}
 		if !db.IsNotFound(err) {
 			return err