update to adjust more type

openimsdk · Dec 15, 2023 · 0a18e14 · 0a18e14
1 parent f20ec27
commit 0a18e14
Show file tree

Hide file tree

Showing 8 changed files with 578 additions and 572 deletions.
diff --git a/internal/rpc/chat/login.go b/internal/rpc/chat/login.go
@@ -321,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
@@ -337,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 {
@@ -346,10 +349,10 @@ func (o *chatSvr) RegisterUser(ctx context.Context, req *chat.RegisterUserReq) (
 			return nil, err
 		}
 	}
-	var emailRegister bool
+
 	if req.User.Email != "" {
 		_, err := o.Database.TakeAttributeByEmail(ctx, req.User.Email)
-		emailRegister = true
+		registerType = constant.EmailRegister
 		if err == nil {
 			return nil, eerrs.ErrEmailAlreadyRegister.Wrap()
 		} else if !o.Database.IsNotFound(err) {
@@ -387,7 +390,7 @@ func (o *chatSvr) RegisterUser(ctx context.Context, req *chat.RegisterUserReq) (
 		AllowVibration: constant.DefaultAllowVibration,
 		AllowBeep:      constant.DefaultAllowBeep,
 		AllowAddFriend: constant.DefaultAllowAddFriend,
-		EmailRegister:  emailRegister,
+		RegisterType:   registerType,
 	}
 	if err := o.Database.RegisterUser(ctx, register, account, attribute); err != nil {
 		return nil, err

diff --git a/internal/rpc/chat/utils.go b/internal/rpc/chat/utils.go
@@ -57,7 +57,7 @@ func DbToPbUserFullInfo(attribute *chat.Attribute) *common.UserFullInfo {
 		AllowBeep:        attribute.AllowBeep,
 		AllowVibration:   attribute.AllowVibration,
 		GlobalRecvMsgOpt: attribute.GlobalRecvMsgOpt,
-		EmailRegistered:  attribute.EmailRegister,
+		RegisterType:     attribute.RegisterType,
 	}
 }
 

diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go
@@ -184,3 +184,8 @@ const (
 const DefaultPlatform = 1
 
 const CtxApiToken = "api-token"
+
+const (
+	EmailRegister = 1
+	PhoneRegister = 2
+)
diff --git a/pkg/common/db/table/chat/attribute.go b/pkg/common/db/table/chat/attribute.go
@@ -37,7 +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"`
-	EmailRegister    bool      `gorm:"column:email_register"`
+	RegisterType     int32     `gorm:"column:register_type"`
 }
 
 func (Attribute) TableName() string {

diff --git a/pkg/proto/chat/chat.pb.go b/pkg/proto/chat/chat.pb.go
diff --git a/pkg/proto/chat/chat.proto b/pkg/proto/chat/chat.proto
@@ -44,7 +44,7 @@ message UpdateUserInfoReq{
   OpenIMServer.protobuf.Int32Value  allowBeep = 12;
   OpenIMServer.protobuf.Int32Value  allowVibration = 13;
   OpenIMServer.protobuf.Int32Value  globalRecvMsgOpt = 14;
-  OpenIMServer.protobuf.BoolValue  emailRegistered = 15;
+  OpenIMServer.protobuf.Int32Value RegisterType = 15;
 }
 
 message UpdateUserInfoResp{
@@ -114,7 +114,7 @@ message RegisterUserInfo {
   string email = 8;
   string account = 9;
   string password = 10;
-  bool emailRegistered = 11;
+  int32 RegisterType = 11;
 }
 
 message RegisterUserReq {

diff --git a/pkg/proto/common/common.pb.go b/pkg/proto/common/common.pb.go
diff --git a/pkg/proto/common/common.proto b/pkg/proto/common/common.proto
@@ -33,7 +33,7 @@ message UserFullInfo{
   int32  allowBeep = 13;
   int32  allowVibration = 14;
   int32 globalRecvMsgOpt = 15;
-  bool emailRegistered = 16;
+  int32 registerType = 16;
 }
 
 message UserPublicInfo{