浏览代码

allow comma in password closes #121

Milo Schwartz 5 月之前
父节点
当前提交
bb5573a8f4
共有 2 个文件被更改,包括 4 次插入6 次删除
  1. 1 1
      server/auth/passwordSchema.ts
  2. 3 5
      src/app/[orgId]/settings/resources/CreateResourceForm.tsx

+ 1 - 1
server/auth/passwordSchema.ts

@@ -4,7 +4,7 @@ export const passwordSchema = z
     .string()
     .min(8, { message: "Password must be at least 8 characters long" })
     .max(64, { message: "Password must be at most 64 characters long" })
-    .regex(/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).*$/, {
+    .regex(/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[,#?!@$%^&*-]).*$/, {
         message: `Your password must meet the following conditions:
 at least one uppercase English letter,
 at least one lowercase English letter,

+ 3 - 5
src/app/[orgId]/settings/resources/CreateResourceForm.tsx

@@ -164,8 +164,6 @@ export default function CreateResourceForm({
     }, [open]);
 
     async function onSubmit(data: CreateResourceFormValues) {
-        console.log(data);
-
         const res = await api
             .put<AxiosResponse<Resource>>(
                 `/org/${orgId}/site/${data.siteId}/resource/`,
@@ -194,16 +192,16 @@ export default function CreateResourceForm({
             setResourceId(id);
 
             if (data.http) {
-                goToResource();
+                goToResource(id);
             } else {
                 setShowSnippets(true);
             }
         }
     }
 
-    function goToResource() {
+    function goToResource(id?: number) {
         // navigate to the resource page
-        router.push(`/${orgId}/settings/resources/${resourceId}`);
+        router.push(`/${orgId}/settings/resources/${id || resourceId}`);
     }
 
     return (