Fixed username validation in LoginForm & RegisterForm

sikka-software · Oct 23, 2023 · 4cd4584 · 4cd4584
1 parent 44876c4
commit 4cd4584
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/components/blocks/auth/RegisterForm.tsx b/components/blocks/auth/RegisterForm.tsx
@@ -92,6 +92,7 @@ type RegisterFormTypes = {
     emailInvalidText: string;
     usernameLabel: string;
     usernamePlaceholder: string;
+    usernameInvalid: string;
     usernameRequired: string;
     passwordLabel: string;
     passwordPlaceholder: string;
@@ -138,9 +139,14 @@ export const RegisterForm: FC<RegisterFormTypes> = ({ texts, ...props }) => {
       case "username":
         fieldSchemas["username"] = z
           .string({ required_error: texts?.usernameRequired })
-          .refine((value) => value !== "", {
-            message: texts?.usernameRequired,
-          });
+          .min(1, { message: texts?.usernameRequired })
+          .refine(
+            (value) => {
+              const isValid = /^[a-zA-Z][a-zA-Z0-9_-]{2,14}$/.test(value);
+              return isValid;
+            },
+            { message: texts?.usernameInvalid }
+          );
         break;
     }
   });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sikka/hawa",
-  "version": "0.10.16",
+  "version": "0.10.17",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {

diff --git a/stories/BlocksStories/AuthStories/Login.stories.tsx b/stories/BlocksStories/AuthStories/Login.stories.tsx
@@ -119,7 +119,7 @@ export const MagicLink: Story = {
             usernameLabel: t("usernameLabel"),
             usernamePlaceholder: t("usernamePlaceholder"),
             usernameRequired: t("usernameRequired"),
-            usernameInvalid: "tet",
+            usernameInvalid: t("usernameInvalid"),
             phoneRequiredText: t("phoneRequiredText"),
             passwordLabel: t("passwordLabel"),
             passwordPlaceholder: t("passwordPlaceholder"),

diff --git a/stories/BlocksStories/AuthStories/Register.stories.tsx b/stories/BlocksStories/AuthStories/Register.stories.tsx
@@ -59,6 +59,7 @@ const Template = (args: any, globals: any) => {
           usernameLabel: t("usernameLabel"),
           usernamePlaceholder: t("usernamePlaceholder"),
           usernameRequired: t("usernameRequired"),
+          usernameInvalid: t("usernameInvalid"),
           passwordLabel: t("passwordLabel"),
           passwordPlaceholder: t("passwordPlaceholder"),
           passwordRequiredText: t("passwordRequiredText"),

diff --git a/stories/translations/ar.json b/stories/translations/ar.json
@@ -40,6 +40,7 @@
   "usernameLabel": "اسم المستخدم",
   "usernamePlaceholder": "ادخل المستخدم",
   "usernameRequired": " اسم المستخدم مطلوب",
+  "usernameInvalid": "صيغة إسم المستخدم غير صحيحة",
   "phoneRequiredText": "رقم الجوال مطلوب",
   "phoneInvalid": "صيغة رقم الجوال غير صحيحة",
   "phoneLabel": "رقم الجوال",

diff --git a/stories/translations/en.json b/stories/translations/en.json
@@ -40,6 +40,7 @@
   "usernameLabel": "Username",
   "usernamePlaceholder": "Enter your username",
   "usernameRequired": "Username is required",
+  "usernameInvalid": "Username format is invalid",
   "phoneRequiredText": "Phone is required",
   "phoneInvalid": "Phone is invalid",
   "phoneLabel": "Phone number",