Add emailRegister check

internal/rpc/chat/login.go

@@ -92,12 +92,22 @@ func (o *chatSvr) SendVerifyCode(ctx context.Context, req *chat.SendVerifyCodeRe
 			}
 		}
 	case constant.VerificationCodeForLogin, constant.VerificationCodeForResetPassword:
-		_, err := o.Database.TakeAttributeByPhone(ctx, req.AreaCode, req.PhoneNumber)
-		if o.Database.IsNotFound(err) {
-			return nil, errs.ErrArgs.Wrap("phone unregistered")
-		} else if err != nil {
-			return nil, err
+		if req.Email == "" {
+			_, err := o.Database.TakeAttributeByPhone(ctx, req.AreaCode, req.PhoneNumber)
+			if o.Database.IsNotFound(err) {
+				return nil, eerrs.ErrAccountNotFound.Wrap("phone unregistered")
+			} else if err != nil {
+				return nil, err
+			}
+		} else {
+			_, err := o.Database.TakeAttributeByEmail(ctx, req.Email)
+			if o.Database.IsNotFound(err) {
+				return nil, eerrs.ErrAccountNotFound.Wrap("email unregistered")
+			} else if err != nil {
+				return nil, err
+			}
 		}
+
 	default:
 		return nil, errs.ErrArgs.Wrap("used unknown")
 	}
@@ -275,9 +285,16 @@ func (o *chatSvr) RegisterUser(ctx context.Context, req *chat.RegisterUserReq) (
 				return nil, err
 			}
 		}
-		if _, err := o.verifyCode(ctx, o.verifyCodeJoin(req.User.AreaCode, req.User.PhoneNumber), req.VerifyCode); err != nil {
-			return nil, err
+		if req.User.Email == "" {
+			if _, err := o.verifyCode(ctx, o.verifyCodeJoin(req.User.AreaCode, req.User.PhoneNumber), req.VerifyCode); err != nil {
+				return nil, err
+			}
+		} else {
+			if _, err := o.verifyCode(ctx, req.User.Email, req.VerifyCode); err != nil {
+				return nil, err
+			}
 		}
+
 	}
 	log.ZDebug(ctx, "usedInvitationCode", usedInvitationCode)
 	if req.User.UserID == "" {
@@ -304,6 +321,7 @@ func (o *chatSvr) RegisterUser(ctx context.Context, req *chat.RegisterUserReq) (
 			return nil, err
 		}
 	}
+	var registerType int32
 	if req.User.PhoneNumber != "" {
 		if req.User.AreaCode[0] != '+' {
 			req.User.AreaCode = "+" + req.User.AreaCode
@@ -320,7 +338,9 @@ func (o *chatSvr) RegisterUser(ctx context.Context, req *chat.RegisterUserReq) (
 		} else if !o.Database.IsNotFound(err) {
 			return nil, err
 		}
+		registerType = constant.PhoneRegister
 	}
+
 	if req.User.Account != "" {
 		_, err := o.Database.TakeAttributeByAccount(ctx, req.User.Account)
 		if err == nil {
@@ -329,8 +349,10 @@ func (o *chatSvr) RegisterUser(ctx context.Context, req *chat.RegisterUserReq) (
 			return nil, err
 		}
 	}
+
 	if req.User.Email != "" {
 		_, err := o.Database.TakeAttributeByEmail(ctx, req.User.Email)
+		registerType = constant.EmailRegister
 		if err == nil {
 			return nil, eerrs.ErrEmailAlreadyRegister.Wrap()
 		} else if !o.Database.IsNotFound(err) {
@@ -368,6 +390,7 @@ func (o *chatSvr) RegisterUser(ctx context.Context, req *chat.RegisterUserReq) (
 		AllowVibration: constant.DefaultAllowVibration,
 		AllowBeep:      constant.DefaultAllowBeep,
 		AllowAddFriend: constant.DefaultAllowAddFriend,
+		RegisterType:   registerType,
 	}
 	if err := o.Database.RegisterUser(ctx, register, account, attribute); err != nil {
 		return nil, err
@@ -427,7 +450,14 @@ func (o *chatSvr) Login(ctx context.Context, req *chat.LoginReq) (*chat.LoginRes
 	}
 	var verifyCodeID *uint
 	if req.Password == "" {
-		id, err := o.verifyCode(ctx, o.verifyCodeJoin(req.AreaCode, req.PhoneNumber), req.VerifyCode)
+		var id uint
+		var err error
+		if req.Email == "" {
+			id, err = o.verifyCode(ctx, o.verifyCodeJoin(req.AreaCode, req.PhoneNumber), req.VerifyCode)
+		} else {
+			id, err = o.verifyCode(ctx, req.Email, req.VerifyCode)
+		}
+
 		if err != nil {
 			return nil, err
 		}

internal/rpc/chat/password.go

@@ -16,7 +16,6 @@ package chat
 
 import (
 	"context"
-
 	"github.com/OpenIMSDK/tools/log"
 
 	"github.com/OpenIMSDK/tools/errs"
@@ -31,7 +30,14 @@ func (o *chatSvr) ResetPassword(ctx context.Context, req *chat.ResetPasswordReq)
 	if req.Password == "" {
 		return nil, errs.ErrArgs.Wrap("password must be set")
 	}
-	verifyCodeID, err := o.verifyCode(ctx, o.verifyCodeJoin(req.AreaCode, req.PhoneNumber), req.VerifyCode)
+	var verifyCodeID uint
+	var err error
+	if req.Email == "" {
+		verifyCodeID, err = o.verifyCode(ctx, o.verifyCodeJoin(req.AreaCode, req.PhoneNumber), req.VerifyCode)
+	} else {
+		verifyCodeID, err = o.verifyCode(ctx, req.Email, req.VerifyCode)
+	}
+
 	if err != nil {
 		return nil, err
 	}

internal/rpc/chat/utils.go

@@ -57,6 +57,7 @@ func DbToPbUserFullInfo(attribute *chat.Attribute) *common.UserFullInfo {
 		AllowBeep:        attribute.AllowBeep,
 		AllowVibration:   attribute.AllowVibration,
 		GlobalRecvMsgOpt: attribute.GlobalRecvMsgOpt,
+		RegisterType:     attribute.RegisterType,
 	}
 }
 

pkg/common/constant/constant.go

@@ -184,3 +184,8 @@ const (
 const DefaultPlatform = 1
 
 const CtxApiToken = "api-token"
+
+const (
+	EmailRegister = 1
+	PhoneRegister = 2
+)

pkg/common/db/table/chat/attribute.go

@@ -37,6 +37,7 @@ type Attribute struct {
 	AllowBeep        int32     `gorm:"column:allow_beep;default:1"`
 	AllowAddFriend   int32     `gorm:"column:allow_add_friend;default:1"`
 	GlobalRecvMsgOpt int32     `gorm:"column:global_recv_msg_opt;default:0"`
+	RegisterType     int32     `gorm:"column:register_type"`
 }
 
 func (Attribute) TableName() string {

pkg/proto/chat/chat.go

@@ -269,7 +269,7 @@ func (x *SearchLogsReq) Check() error {
 }
 
 func EmailCheck(email string) error {
-	pattern := `^[0-9a-z][_.0-9a-z-]{0,31}@([0-9a-z][0-9a-z-]{0,30}[0-9a-z]\.){1,4}[a-z]{2,4}$`
+	pattern := `^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$`
 	if err := regexMatch(pattern, email); err != nil {
 		return errs.Wrap(err, "Email is invalid")
 	}