refactor: Choose between user registration phone number and email address (#1270)

wzh425 · web-flow · commit f6b8173c2efa · 2024-04-01T14:23:26.000+08:00
diff --git a/src/Contracts/Masa.Auth.Contracts.Admin/Sso/RegisterFieldDto.cs b/src/Contracts/Masa.Auth.Contracts.Admin/Sso/RegisterFieldDto.cs
@@ -11,18 +11,12 @@ public class RegisterFieldDto
 
     public bool Required { get; set; }
 
-    public bool CannotUpdate { get; private set; }
-
     [JsonConstructor]
     public RegisterFieldDto(RegisterFieldTypes registerFieldType, int sort, bool required)
     {
         RegisterFieldType = registerFieldType;
         Sort = sort;
         Required = required;
-        if (RegisterFieldType is RegisterFieldTypes.PhoneNumber)
-        {
-            CannotUpdate = true;
-        }
     }
 }
 
diff --git a/src/Services/Masa.Auth.Service.Admin/Application/Subjects/CommandHandler.cs b/src/Services/Masa.Auth.Service.Admin/Application/Subjects/CommandHandler.cs
@@ -93,11 +93,15 @@ async Task RegisterVerifyAsync(RegisterByEmailModel model)
                 throw new UserFriendlyException(errorCode: UserFriendlyExceptionCodes.INVALID_EMAIL_CAPTCHA);
             }
         }
-        var smsCodeKey = CacheKey.MsgCodeRegisterAndLoginKey(model.PhoneNumber);
-        var smsCode = await _distributedCacheClient.GetAsync<string>(smsCodeKey);
-        if (!model.SmsCode.Equals(smsCode))
+
+        if (model.UserRegisterType == UserRegisterTypes.PhoneNumber || !string.IsNullOrEmpty(model.PhoneNumber))
         {
-            throw new UserFriendlyException(errorCode: UserFriendlyExceptionCodes.INVALID_SMS_CAPTCHA);
+            var smsCodeKey = CacheKey.MsgCodeRegisterAndLoginKey(model.PhoneNumber);
+            var smsCode = await _distributedCacheClient.GetAsync<string>(smsCodeKey);
+            if (!model.SmsCode.Equals(smsCode))
+            {
+                throw new UserFriendlyException(errorCode: UserFriendlyExceptionCodes.INVALID_SMS_CAPTCHA);
+            }
         }
     }
 
diff --git a/src/Services/Masa.Auth.Service.Admin/Properties/launchSettings.json b/src/Services/Masa.Auth.Service.Admin/Properties/launchSettings.json
@@ -22,8 +22,8 @@
         "MASA_NAMESPACE": "masastack",
         "MASA_CLUSTER": "Default",
         "OTLP_URL": "https://otel-collector.masastack:9013",
-        "REDIS": "{\"RedisHost\": \"10.130.0.235\", \"RedisPort\": 24615, \"RedisDb\": 0,\"RedisPassword\": \"Hzss@123\"}",
-        "CONNECTIONSTRING": "{\"Server\": \"10.130.0.235\", \"Port\": 24878,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}",
+        "REDIS": "{\"RedisHost\": \"10.130.0.19\", \"RedisPort\": 2135, \"RedisDb\": 3,\"RedisPassword\": \"Hzss@123\"}",
+        "CONNECTIONSTRING": "{\"Server\": \"10.130.0.19\", \"Port\": 2415,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}",
         "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"http://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"http://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"http://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"http://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"http://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"http://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"http://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"http://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]",
         "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}",
         "MASA_ENVIRONMENT": "Development",
diff --git a/src/Services/Masa.Auth.Service.Admin/appsettings.Development.json b/src/Services/Masa.Auth.Service.Admin/appsettings.Development.json
@@ -7,6 +7,6 @@
     }
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Server=10.130.0.235,24878;Database=auth_dev;User Id=ss;Password=Hzss@123;"
+    "DefaultConnection": "Server=10.130.0.19,2415;Database=auth_dev;User Id=ss;Password=Hzss@123;"
   }
 }
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/AddCustomLoginRegisterDialog.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/AddCustomLoginRegisterDialog.razor.cs
@@ -85,6 +85,12 @@ public async Task AddCustomLoginAsync(FormContext context)
             OpenErrorMessage(T("Register configuration items are required"));
             return;
         }
+        if (!CustomLogin.RegisterFields.Any(r => (r.RegisterFieldType == RegisterFieldTypes.PhoneNumber || r.RegisterFieldType == RegisterFieldTypes.Email) && r.Required))
+        {
+            Tab = CustomLoginTab.Register;
+            OpenErrorMessage(T("PhoneNumberAndEmailEmptyError"));
+            return;
+        }
 
         await CustomLoginService.AddAsync(CustomLogin);
         OpenSuccessMessage(T("Add Custom Login success"));
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/ConfigRegister.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/ConfigRegister.razor
@@ -26,10 +26,10 @@
             {
                 <MRow Class="mb-6" @key="@(registerField.RegisterFieldType!=default?registerField.RegisterFieldType:registerField.Sort)">
                     <MCol Cols="6">
-                        <RegisterFieldSelect @bind-Value="registerField.RegisterFieldType" Disabled="registerField.CannotUpdate" Excludes="Value.Select(v => v.RegisterFieldType).ToList()" />
+                        <RegisterFieldSelect @bind-Value="registerField.RegisterFieldType" Excludes="Value.Select(v => v.RegisterFieldType).ToList()" />
                     </MCol>
                     <MCol Cols="2" Class="d-flex">
-                        <MSwitch @bind-Value="registerField.Required" Disabled="registerField.CannotUpdate" Class="my-auto my-0 pt-0" TValue="bool"/>
+                        <MSwitch @bind-Value="registerField.Required" Class="my-auto my-0 pt-0" TValue="bool"/>
                     </MCol>
                     <MCol Class="d-flex">
                         <div class="my-auto">
@@ -39,7 +39,7 @@
                             <MButton Class="mr-6" Icon OnClick="async () =>await Down(registerField)" Disabled="registerField.Sort == Value.Max(v => v.Sort)">
                                 <SIcon Tooltip="@T("Down")">mdi-menu-down</SIcon>
                             </MButton>
-                            <MButton Class="mr-6" Icon OnClick="async () =>await Remove(registerField)" Disabled="registerField.CannotUpdate">
+                            <MButton Class="mr-6" Icon OnClick="async () =>await Remove(registerField)">
                                 <SIcon Tooltip="@T("Delete")">mdi-delete-outline</SIcon>
                             </MButton>
                         </div>
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/UpdateCustomLoginRegisterDialog.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/UpdateCustomLoginRegisterDialog.razor.cs
@@ -80,6 +80,12 @@ public async Task UpdateCustomLoginAsync(FormContext context)
             OpenErrorMessage(T("Register configuration items are required"));
             return;
         }
+        if (!CustomLogin.RegisterFields.Any(r => (r.RegisterFieldType == RegisterFieldTypes.PhoneNumber || r.RegisterFieldType == RegisterFieldTypes.Email) && r.Required))
+        {
+            Tab = CustomLoginTab.Register;
+            OpenErrorMessage(T("PhoneNumberAndEmailEmptyError"));
+            return;
+        }
 
         await CustomLoginService.UpdateAsync(CustomLogin);
         OpenSuccessMessage(T("Edit Custom Login data success"));
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/en-US.json b/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/en-US.json
@@ -45,7 +45,8 @@
   "CustomLoginBlock": {
     "TitleName": "Name",
     "NameRequired": "Name is required",
-    "DisplayNameRequired": "DisplayName is required"
+    "DisplayNameRequired": "DisplayName is required",
+    "PhoneNumberAndEmailEmptyError": "One of phone number and email must have a value"
   },
   "ConfirmChangePassword": "I confirm to change the password",
   "PasswordValidateFailed": "Password validate failed",
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json b/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json
@@ -518,7 +518,8 @@
     "Name is required": "姓名必须填写",
     "Title is required": "标题必须填写",
     "NameRequired": "姓名必须填写",
-    "DisplayNameRequired": "昵称必须填写"
+    "DisplayNameRequired": "昵称必须填写",
+    "PhoneNumberAndEmailEmptyError": "电话号码和邮件其中一个必须有值"
   },
 
   "OperationLog": "操作日志",
diff --git a/src/Web/Masa.Auth.Web.Admin.Server/Properties/launchSettings.json b/src/Web/Masa.Auth.Web.Admin.Server/Properties/launchSettings.json
@@ -22,8 +22,8 @@
         "TLS_NAME": "",
         "MASA_CLUSTER": "Default",
         "OTLP_URL": "https://otel-collector.masastack:9013",
-        "REDIS": "{\"RedisHost\": \"10.130.0.235\", \"RedisPort\": 24615, \"RedisDb\": 0,\"RedisPassword\": \"Hzss@123\"}",
-        "CONNECTIONSTRING": "{\"Server\": \"10.130.0.235\", \"Port\": 24878,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}",
+        "REDIS": "{\"RedisHost\": \"10.130.0.19\", \"RedisPort\": 2135, \"RedisDb\": 3,\"RedisPassword\": \"Hzss@123\"}",
+        "CONNECTIONSTRING": "{\"Server\": \"10.130.0.19\", \"Port\": 2415,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}",
         "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"http://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"http://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"http://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"http://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"http://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"http://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"http://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"http://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]",
         "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}",
         "MASA_ENVIRONMENT": "Development",
diff --git a/src/Web/Masa.Auth.Web.Sso/Pages/Account/Login/RegisterSection.razor.cs b/src/Web/Masa.Auth.Web.Sso/Pages/Account/Login/RegisterSection.razor.cs
@@ -131,7 +131,7 @@ await AuthClient.UserService.RegisterByPhoneAsync(new RegisterByPhoneModel
 
             var loginInputModel = new LoginInputModel
             {
-                PhoneLogin = true,
+                PhoneLogin = RegisterFields.Any(x => x.RegisterFieldType == RegisterFieldTypes.PhoneNumber),
                 SmsCode = _inputModel.SmsCode,
                 Password = _inputModel.Password,
                 Account = _inputModel.Email ?? "",
diff --git a/src/Web/Masa.Auth.Web.Sso/Properties/launchSettings.json b/src/Web/Masa.Auth.Web.Sso/Properties/launchSettings.json
@@ -23,8 +23,8 @@
         "MASA_NAMESPACE": "masastack",
         "MASA_CLUSTER": "Default",
         "OTLP_URL": "https://otel-collector.masastack:9013",
-        "REDIS": "{\"RedisHost\": \"10.130.0.235\", \"RedisPort\": 24615, \"RedisDb\": 0,\"RedisPassword\": \"Hzss@123\"}",
-        "CONNECTIONSTRING": "{\"Server\": \"10.130.0.235\", \"Port\": 24878,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}",
+        "REDIS": "{\"RedisHost\": \"10.130.0.19\", \"RedisPort\": 2135, \"RedisDb\": 3,\"RedisPassword\": \"Hzss@123\"}",
+        "CONNECTIONSTRING": "{\"Server\": \"10.130.0.19\", \"Port\": 2415,\"Database\":\"pm-dev\",\"UserId\": \"ss\",\"Password\":\"Hzss@123\"}",
         "MASA_STACK": "[{\"id\":\"pm\",\"service\":{\"id\":\"pm-service-dev\",\"domain\":\"http://pm-service-dev.masastack.com\"},\"web\":{\"id\":\"pm-web-dev\",\"domain\":\"https://pm-dev.masastack.com\"}},{\"id\":\"dcc\",\"service\":{\"id\":\"dcc-service-dev\",\"domain\":\"http://dcc-service-dev.masastack.com\"},\"web\":{\"id\":\"dcc-web-dev\",\"domain\":\"https://dcc-dev.masastack.com\"}},{\"id\":\"tsc\",\"service\":{\"id\":\"tsc-service-dev\",\"domain\":\"http://tsc-service-dev.masastack.com\"},\"web\":{\"id\":\"tsc-web-dev\",\"domain\":\"https://tsc-dev.masastack.com\"}},{\"id\":\"alert\",\"service\":{\"id\":\"alert-service-dev\",\"domain\":\"http://alert-service-dev.masastack.com\"},\"web\":{\"id\":\"alert-web-dev\",\"domain\":\"https://alert-dev.masastack.com\"}},{\"id\":\"scheduler\",\"service\":{\"id\":\"scheduler-service-dev\",\"domain\":\"http://scheduler-service-dev.masastack.com\"},\"worker\":{\"id\":\"scheduler-worker-dev\",\"domain\":\"http://scheduler-worker-dev.masastack.com\"},\"web\":{\"id\":\"scheduler-web-dev\",\"domain\":\"https://scheduler-dev.masastack.com\"}},{\"id\":\"mc\",\"service\":{\"id\":\"mc-service-dev\",\"domain\":\"http://mc-service-dev.masastack.com\"},\"web\":{\"id\":\"mc-web-dev\",\"domain\":\"https://mc-dev.masastack.com\"}},{\"id\":\"auth\",\"service\":{\"id\":\"auth-service-dev\",\"domain\":\"http://auth-service-dev.masastack.com\"},\"web\":{\"id\":\"auth-web-dev\",\"domain\":\"https://auth-dev.masastack.com\"},\"sso\":{\"id\":\"auth-sso-dev\",\"domain\":\"https://auth-sso-dev.masastack.com\"}}]",
         "ELASTIC": "{\"Nodes\": [\"http://es-ydy-new.lonsid.cn:9200\"],\"Index\": \"auth_user_development\"}",
         "MASA_ENVIRONMENT": "Development",

Original file line number	Diff line number	Diff line change
`@@ -11,18 +11,12 @@ public class RegisterFieldDto`
`11`	`11`
`12`	`12`	`public bool Required { get; set; }`
`13`	`13`
`14`		`- public bool CannotUpdate { get; private set; }`
`15`		`-`
`16`	`14`	`[JsonConstructor]`
`17`	`15`	`public RegisterFieldDto(RegisterFieldTypes registerFieldType, int sort, bool required)`
`18`	`16`	`{`
`19`	`17`	`RegisterFieldType = registerFieldType;`
`20`	`18`	`Sort = sort;`
`21`	`19`	`Required = required;`
`22`		`- if (RegisterFieldType is RegisterFieldTypes.PhoneNumber)`
`23`		`- {`
`24`		`- CannotUpdate = true;`
`25`		`- }`
`26`	`20`	`}`
`27`	`21`	`}`
`28`	`22`
Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,15 @@ async Task RegisterVerifyAsync(RegisterByEmailModel model)`
`93`	`93`	`throw new UserFriendlyException(errorCode: UserFriendlyExceptionCodes.INVALID_EMAIL_CAPTCHA);`
`94`	`94`	`}`
`95`	`95`	`}`
`96`		`- var smsCodeKey = CacheKey.MsgCodeRegisterAndLoginKey(model.PhoneNumber);`
`97`		`- var smsCode = await _distributedCacheClient.GetAsync<string>(smsCodeKey);`
`98`		`- if (!model.SmsCode.Equals(smsCode))`
	`96`	`+`
	`97`	`+ if (model.UserRegisterType == UserRegisterTypes.PhoneNumber \|\| !string.IsNullOrEmpty(model.PhoneNumber))`
`99`	`98`	`{`
`100`		`- throw new UserFriendlyException(errorCode: UserFriendlyExceptionCodes.INVALID_SMS_CAPTCHA);`
	`99`	`+ var smsCodeKey = CacheKey.MsgCodeRegisterAndLoginKey(model.PhoneNumber);`
	`100`	`+ var smsCode = await _distributedCacheClient.GetAsync<string>(smsCodeKey);`
	`101`	`+ if (!model.SmsCode.Equals(smsCode))`
	`102`	`+ {`
	`103`	`+ throw new UserFriendlyException(errorCode: UserFriendlyExceptionCodes.INVALID_SMS_CAPTCHA);`
	`104`	`+ }`
`101`	`105`	`}`
`102`	`106`	`}`
`103`	`107`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`}`
`8`	`8`	`},`
`9`	`9`	`"ConnectionStrings": {`
`10`		`- "DefaultConnection": "Server=10.130.0.235,24878;Database=auth_dev;User Id=ss;Password=Hzss@123;"`
	`10`	`+ "DefaultConnection": "Server=10.130.0.19,2415;Database=auth_dev;User Id=ss;Password=Hzss@123;"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ await AuthClient.UserService.RegisterByPhoneAsync(new RegisterByPhoneModel`
`131`	`131`
`132`	`132`	`var loginInputModel = new LoginInputModel`
`133`	`133`	`{`
`134`		`- PhoneLogin = true,`
	`134`	`+ PhoneLogin = RegisterFields.Any(x => x.RegisterFieldType == RegisterFieldTypes.PhoneNumber),`
`135`	`135`	`SmsCode = _inputModel.SmsCode,`
`136`	`136`	`Password = _inputModel.Password,`
`137`	`137`	`Account = _inputModel.Email ?? "",`