chore: tweak setting name

docs/apidocs.swagger.yaml

@@ -2045,12 +2045,12 @@ definitions:
   apiv1WorkspaceGeneralSetting:
     type: object
     properties:
-      disallowSignup:
+      disallowUserRegistration:
         type: boolean
-        description: disallow_signup disallows signup for new users.
-      disallowPasswordSignin:
+        description: disallow_user_registration disallows user registration.
+      disallowPasswordAuth:
         type: boolean
-        description: disallow_password_signin disallows user to sign in with password. Except for the admins.
+        description: disallow_password_auth disallows password authentication.
       additionalScript:
         type: string
         description: additional_script is the additional script.

proto/api/v1/workspace_setting_service.proto

@@ -36,10 +36,10 @@ message WorkspaceSetting {
 }
 
 message WorkspaceGeneralSetting {
-  // disallow_signup disallows signup for new users.
-  bool disallow_signup = 1;
-  // disallow_password_signin disallows user to sign in with password. Except for the admins.
-  bool disallow_password_signin = 2;
+  // disallow_user_registration disallows user registration.
+  bool disallow_user_registration = 1;
+  // disallow_password_auth disallows password authentication.
+  bool disallow_password_auth = 2;
   // additional_script is the additional script.
   string additional_script = 3;
   // additional_style is the additional style.

proto/store/workspace_setting.proto

@@ -31,10 +31,10 @@ message WorkspaceBasicSetting {
 }
 
 message WorkspaceGeneralSetting {
-  // disallow_signup disallows signup for new users.
-  bool disallow_signup = 1;
-  // disallow_password_signin disallows user to sign in with password. Except for the admins.
-  bool disallow_password_signin = 2;
+  // disallow_user_registration disallows user registration.
+  bool disallow_user_registration = 1;
+  // disallow_password_auth disallows password authentication.
+  bool disallow_password_auth = 2;
   // additional_script is the additional script.
   string additional_script = 3;
   // additional_style is the additional style.

server/router/api/v1/auth_service.go

@@ -62,8 +62,8 @@ func (s *APIV1Service) SignIn(ctx context.Context, request *v1pb.SignInRequest)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to get workspace general setting, err: %s", err))
 	}
-	// Check if the password sign in is allowed.
-	if workspaceGeneralSetting.DisallowPasswordSignin && user.Role == store.RoleUser {
+	// Check if the password auth in is allowed.
+	if workspaceGeneralSetting.DisallowPasswordAuth && user.Role == store.RoleUser {
 		return nil, status.Errorf(codes.PermissionDenied, "password signin is not allowed")
 	}
 	if user.RowStatus == store.Archived {
@@ -184,7 +184,7 @@ func (s *APIV1Service) SignUp(ctx context.Context, request *v1pb.SignUpRequest)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to get workspace general setting, err: %s", err))
 	}
-	if workspaceGeneralSetting.DisallowSignup {
+	if workspaceGeneralSetting.DisallowUserRegistration {
 		return nil, status.Errorf(codes.PermissionDenied, "sign up is not allowed")
 	}
 

server/router/api/v1/workspace_setting_service.go

@@ -132,11 +132,11 @@ func convertWorkspaceGeneralSettingFromStore(setting *storepb.WorkspaceGeneralSe
 		return nil
 	}
 	generalSetting := &v1pb.WorkspaceGeneralSetting{
-		DisallowSignup:         setting.DisallowSignup,
-		DisallowPasswordSignin: setting.DisallowPasswordSignin,
-		AdditionalScript:       setting.AdditionalScript,
-		AdditionalStyle:        setting.AdditionalStyle,
-		WeekStartDayOffset:     setting.WeekStartDayOffset,
+		DisallowUserRegistration: setting.DisallowUserRegistration,
+		DisallowPasswordAuth:     setting.DisallowPasswordAuth,
+		AdditionalScript:         setting.AdditionalScript,
+		AdditionalStyle:          setting.AdditionalStyle,
+		WeekStartDayOffset:       setting.WeekStartDayOffset,
 	}
 	if setting.CustomProfile != nil {
 		generalSetting.CustomProfile = &v1pb.WorkspaceCustomProfile{
@@ -155,11 +155,11 @@ func convertWorkspaceGeneralSettingToStore(setting *v1pb.WorkspaceGeneralSetting
 		return nil
 	}
 	generalSetting := &storepb.WorkspaceGeneralSetting{
-		DisallowSignup:         setting.DisallowSignup,
-		DisallowPasswordSignin: setting.DisallowPasswordSignin,
-		AdditionalScript:       setting.AdditionalScript,
-		AdditionalStyle:        setting.AdditionalStyle,
-		WeekStartDayOffset:     setting.WeekStartDayOffset,
+		DisallowUserRegistration: setting.DisallowUserRegistration,
+		DisallowPasswordAuth:     setting.DisallowPasswordAuth,
+		AdditionalScript:         setting.AdditionalScript,
+		AdditionalStyle:          setting.AdditionalStyle,
+		WeekStartDayOffset:       setting.WeekStartDayOffset,
 	}
 	if setting.CustomProfile != nil {
 		generalSetting.CustomProfile = &storepb.WorkspaceCustomProfile{

web/src/components/Settings/WorkspaceSection.tsx

@@ -100,17 +100,17 @@ const WorkspaceSection = () => {
         </Link>
       </div>
       <div className="w-full flex flex-row justify-between items-center">
-        <span>Disallow signup</span>
+        <span>Disallow user registration</span>
         <Switch
-          checked={workspaceGeneralSetting.disallowSignup}
-          onChange={(event) => updatePartialSetting({ disallowSignup: event.target.checked })}
+          checked={workspaceGeneralSetting.disallowUserRegistration}
+          onChange={(event) => updatePartialSetting({ disallowUserRegistration: event.target.checked })}
         />
       </div>
       <div className="w-full flex flex-row justify-between items-center">
-        <span>Disallow password signin</span>
+        <span>Disallow password auth</span>
         <Switch
-          checked={workspaceGeneralSetting.disallowPasswordSignin}
-          onChange={(event) => updatePartialSetting({ disallowPasswordSignin: event.target.checked })}
+          checked={workspaceGeneralSetting.disallowPasswordAuth}
+          onChange={(event) => updatePartialSetting({ disallowPasswordAuth: event.target.checked })}
         />
       </div>
       <div className="w-full flex flex-row justify-between items-center">

web/src/pages/SignIn.tsx

@@ -65,12 +65,12 @@ const SignIn = () => {
             {workspaceGeneralSetting.customProfile?.title || "Memos"}
           </p>
         </div>
-        {!workspaceGeneralSetting.disallowPasswordSignin ? (
+        {!workspaceGeneralSetting.disallowPasswordAuth ? (
           <PasswordSignInForm />
         ) : (
           <p className="w-full text-2xl mt-2 dark:text-gray-500">Password auth is not allowed.</p>
         )}
-        {!workspaceGeneralSetting.disallowSignup && !workspaceGeneralSetting.disallowPasswordSignin && (
+        {!workspaceGeneralSetting.disallowUserRegistration && !workspaceGeneralSetting.disallowPasswordAuth && (
           <p className="w-full mt-4 text-sm">
             <span className="dark:text-gray-500">{t("auth.sign-up-tip")}</span>
             <Link to="/auth/signup" className="cursor-pointer ml-2 text-blue-600 hover:underline" unstable_viewTransition>

web/src/pages/SignUp.tsx

@@ -79,7 +79,7 @@ const SignUp = () => {
             {workspaceGeneralSetting.customProfile?.title || "Memos"}
           </p>
         </div>
-        {!workspaceGeneralSetting.disallowSignup ? (
+        {!workspaceGeneralSetting.disallowUserRegistration ? (
           <>
             <p className="w-full text-2xl mt-2 dark:text-gray-500">{t("auth.create-your-account")}</p>
             <form className="w-full mt-2" onSubmit={handleFormSubmit}>