Replace z.email method with regular expression

template/apps/api/src/resources/account/account.constants.ts

@@ -0,0 +1,2 @@
+export const emailRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+export const passwordRegex = /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d\W]{6,}$/g;

template/apps/api/src/resources/account/actions/forgot-password.ts

@@ -6,9 +6,10 @@ import { emailService } from 'services';
 import { validateMiddleware } from 'middlewares';
 import { AppKoaContext, Next, AppRouter, Template } from 'types';
 import { userService, User } from 'resources/user';
+import { accountConstants } from 'resources/account';
 
 const schema = z.object({
- email: z.string().min(1, 'Please enter email').email('Email format is incorrect.'),
+ email: z.string().regex(accountConstants.emailRegex, 'Email format is incorrect.'),
 });
 
 interface ValidatedData extends z.infer<typeof schema> {

template/apps/api/src/resources/account/actions/resend-email.ts

@@ -6,9 +6,10 @@ import { emailService } from 'services';
 import { validateMiddleware } from 'middlewares';
 import { AppKoaContext, Next, AppRouter, Template } from 'types';
 import { userService, User } from 'resources/user';
+import { accountConstants } from 'resources/account';
 
 const schema = z.object({
- email: z.string().min(1, 'Please enter email').email('Email format is incorrect.'),
+ email: z.string().regex(accountConstants.emailRegex, 'Email format is incorrect.'),
 });
 
 interface ValidatedData extends z.infer<typeof schema> {

template/apps/api/src/resources/account/actions/reset-password.ts

@@ -4,13 +4,11 @@ import { securityUtil } from 'utils';
 import { validateMiddleware } from 'middlewares';
 import { AppKoaContext, Next, AppRouter } from 'types';
 import { userService, User } from 'resources/user';
+import { accountConstants } from 'resources/account';
 
 const schema = z.object({
  token: z.string().min(1, 'Token is required'),
- password: z.string().regex(
- /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d\W]{6,}$/g,
- 'The password must contain 6 or more characters with at least one letter (a-z) and one number (0-9).',
- ),
+ password: z.string().regex(accountConstants.passwordRegex, 'The password must contain 6 or more characters with at least one letter (a-z) and one number (0-9).'),
 });
 
 interface ValidatedData extends z.infer<typeof schema> {

template/apps/api/src/resources/account/actions/sign-in.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 
 import { User, userService } from 'resources/user';
+import { accountConstants } from 'resources/account';
 
 import { rateLimitMiddleware, validateMiddleware } from 'middlewares';
 import { securityUtil } from 'utils';
@@ -9,8 +10,8 @@ import { authService } from 'services';
 import { AppKoaContext, AppRouter, Next } from 'types';
 
 const schema = z.object({
- email: z.string().min(1, 'Please enter email').email('Email format is incorrect.'),
- password: z.string().min(1, 'Please enter password'),
+ email: z.string().regex(accountConstants.emailRegex, 'Email format is incorrect.'),
+ password: z.string().regex(accountConstants.passwordRegex, 'The password must contain 6 or more characters with at least one letter (a-z) and one number (0-9).'),
 });
 
 interface ValidatedData extends z.infer<typeof schema> {

template/apps/api/src/resources/account/actions/sign-up.ts

@@ -6,15 +6,13 @@ import { analyticsService, emailService } from 'services';
 import { validateMiddleware } from 'middlewares';
 import { AppKoaContext, Next, AppRouter, Template } from 'types';
 import { userService, User } from 'resources/user';
+import { accountConstants } from 'resources/account';
 
 const schema = z.object({
  firstName: z.string().min(1, 'Please enter First name').max(100),
  lastName: z.string().min(1, 'Please enter Last name').max(100),
- email: z.string().min(1, 'Please enter email').email('Email format is incorrect.'),
- password: z.string().regex(
- /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d\W]{6,}$/g,
- 'The password must contain 6 or more characters with at least one letter (a-z) and one number (0-9).',
- ),
+ email: z.string().regex(accountConstants.emailRegex, 'Email format is incorrect.'),
+ password: z.string().regex(accountConstants.passwordRegex, 'The password must contain 6 or more characters with at least one letter (a-z) and one number (0-9).'),
 });
 
 interface ValidatedData extends z.infer<typeof schema> {

template/apps/api/src/resources/account/actions/update.ts

@@ -4,14 +4,12 @@ import { AppKoaContext, Next, AppRouter } from 'types';
 import { securityUtil } from 'utils';
 import { validateMiddleware } from 'middlewares';
 import { userService } from 'resources/user';
+import { accountConstants } from 'resources/account';
 
 const schema = z.object({
  firstName: z.string().min(1, 'Please enter First name').max(100),
  lastName: z.string().min(1, 'Please enter Last name').max(100),
- password: z.string().regex(
- /^$|^(?=.*[a-z])(?=.*\d)[A-Za-z\d\W]{6,}$/g,
- 'The password must contain 6 or more characters with at least one letter (a-z) and one number (0-9).',
- ),
+ password: z.string().regex(accountConstants.passwordRegex, 'The password must contain 6 or more characters with at least one letter (a-z) and one number (0-9).'),
 });
 
 interface ValidatedData extends z.infer<typeof schema> {

template/apps/api/src/resources/account/actions/verify-reset-token.ts

@@ -4,9 +4,10 @@ import config from 'config';
 import { validateMiddleware } from 'middlewares';
 import { AppKoaContext, AppRouter } from 'types';
 import { User, userService } from 'resources/user';
+import { accountConstants } from 'resources/account';
 
 const schema = z.object({
- email: z.string().min(1, 'Please enter email').email('Email format is incorrect.'),
+ email: z.string().regex(accountConstants.emailRegex, 'Email format is incorrect.'),
  token: z.string().min(1, 'Token is required'),
 });
 

template/apps/api/src/resources/account/index.ts

@@ -1,5 +1,7 @@
 import accountRoutes from './account.routes';
+import * as accountConstants from './account.constants';
 
 export {
  accountRoutes,
+ accountConstants,
 };

template/apps/api/src/resources/user/actions/update.ts

@@ -3,11 +3,12 @@ import { z } from 'zod';
 import { AppKoaContext, Next, AppRouter } from 'types';
 import { validateMiddleware } from 'middlewares';
 import { userService } from 'resources/user';
+import { accountConstants } from 'resources/account';
 
 const schema = z.object({
  firstName: z.string().min(1, 'Please enter First name').max(100),
  lastName: z.string().min(1, 'Please enter Last name').max(100),
- email: z.string().min(1, 'Please enter email').email('Email format is incorrect.'),
+ email: z.string().regex(accountConstants.emailRegex, 'Email format is incorrect.'),
 });
 
 type ValidatedData = z.infer<typeof schema>;

template/apps/api/src/resources/user/user.schema.ts

@@ -6,7 +6,7 @@ const schema = z.object({
  firstName: z.string(),
  lastName: z.string(),
  fullName: z.string(),
- email: z.string().email(),
+ email: z.string(),
  passwordHash: z.string().nullable().optional(),
  signupToken: z.string().nullable().optional(),
  resetPasswordToken: z.string().nullable().optional(),

template/apps/web/src/pages/forgot-password/index.page.tsx

@@ -11,10 +11,10 @@ import { RoutePath } from 'routes';
 import { handleError } from 'utils';
 import { Link } from 'components';
 
-import { accountApi } from 'resources/account';
+import { accountApi, accountConstants } from 'resources/account';
 
 const schema = z.object({
- email: z.string().min(1, 'Please enter email').email('Email format is incorrect.'),
+ email: z.string().regex(accountConstants.emailRegex, 'Email format is incorrect.'),
 });
 
 type ForgotPasswordParams = {

template/apps/web/src/pages/sign-in/index.page.tsx

@@ -13,10 +13,10 @@ import { RoutePath } from 'routes';
 import { handleError } from 'utils';
 import { Link } from 'components';
 
-import { accountApi } from 'resources/account';
+import { accountApi, accountConstants } from 'resources/account';
 
 const schema = z.object({
- email: z.string().min(1, 'Please enter email').email('Email format is incorrect.'),
+ email: z.string().regex(accountConstants.emailRegex, 'Email format is incorrect.'),
  password: z.string().min(1, 'Please enter password'),
 });
 

template/apps/web/src/pages/sign-up/index.page.tsx

@@ -24,16 +24,13 @@ import { RoutePath } from 'routes';
 import { handleError } from 'utils';
 import { Link } from 'components';
 
-import { accountApi } from 'resources/account';
+import { accountApi, accountConstants } from 'resources/account';
 
 const schema = z.object({
  firstName: z.string().min(1, 'Please enter First name').max(100),
  lastName: z.string().min(1, 'Please enter Last name').max(100),
- email: z.string().min(1, 'Please enter email').email('Email format is incorrect.'),
- password: z.string().regex(
- /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d\W]{6,}$/g,
- 'The password must contain 6 or more characters with at least one letter (a-z) and one number (0-9).',
- ),
+ email: z.string().regex(accountConstants.emailRegex, 'Email format is incorrect.'),
+ password: z.string().regex(accountConstants.passwordRegex, 'The password must contain 6 or more characters with at least one letter (a-z) and one number (0-9).'),
 });
 
 type SignUpParams = z.infer<typeof schema>;

template/apps/web/src/resources/account/account.constants.ts

@@ -0,0 +1,2 @@
+export const emailRegex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+export const passwordRegex = /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d\W]{6,}$/g;

template/apps/web/src/resources/account/index.ts

@@ -1,5 +1,7 @@
 import * as accountApi from './account.api';
+import * as accountConstants from './account.constants';
 
 export {
  accountApi,
+ accountConstants,
 };