[HUMAN App] refactor: service sign up (#3184)

mpblocky · web-flow · commit 2d3adb68266d · 2025-03-13T11:57:32.000+03:00
diff --git a/packages/apps/human-app/frontend/src/api/fetch-refresh-token.ts b/packages/apps/human-app/frontend/src/api/fetch-refresh-token.ts
@@ -1,6 +1,6 @@
 import { apiPaths } from '@/api/api-paths';
 import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
-import { signInSuccessResponseSchema } from '@/modules/worker/services/sign-in/schema';
+import { authTokensSuccessResponseSchema } from '@/shared/schemas';
 
 export const fetchTokenRefresh = async (baseUrl: string) => {
   const response = await fetch(
@@ -23,7 +23,7 @@ export const fetchTokenRefresh = async (baseUrl: string) => {
 
   const data: unknown = await response.json();
 
-  const refetchAccessTokenSuccess = signInSuccessResponseSchema.parse(data);
+  const refetchAccessTokenSuccess = authTokensSuccessResponseSchema.parse(data);
 
   return refetchAccessTokenSuccess;
 };
diff --git a/packages/apps/human-app/frontend/src/api/fetcher.ts b/packages/apps/human-app/frontend/src/api/fetcher.ts
@@ -3,8 +3,8 @@ import { ZodError, type ZodType, type ZodTypeDef } from 'zod';
 import type { ResponseError } from '@/shared/types/global.type';
 import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
 import { env } from '@/shared/env';
-import { type SignInSuccessResponse } from '@/modules/worker/services/sign-in/types';
 import { normalizeBaseUrl } from '@/shared/helpers/url';
+import { type AuthTokensSuccessResponse } from '@/shared/schemas';
 import { fetchTokenRefresh } from './fetch-refresh-token';
 
 const appendHeader = (
@@ -66,7 +66,7 @@ export type FetcherOptions<SuccessInput, SuccessOutput> =
 
 export type FetcherUrl = string | URL;
 
-let refreshPromise: Promise<SignInSuccessResponse | null> | null = null;
+let refreshPromise: Promise<AuthTokensSuccessResponse | null> | null = null;
 
 export async function refreshToken(): Promise<{
   access_token: string;
diff --git a/packages/apps/human-app/frontend/src/modules/auth-web3/context/web3-auth-context.tsx b/packages/apps/human-app/frontend/src/modules/auth-web3/context/web3-auth-context.tsx
@@ -3,12 +3,12 @@ import { useState, createContext, useEffect } from 'react';
 import { jwtDecode } from 'jwt-decode';
 import { z } from 'zod';
 import { useQueryClient } from '@tanstack/react-query';
-import type { SignInSuccessResponse } from '@/modules/worker/services/sign-in/types';
 import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
 import {
   ModalType,
   useModalStore,
 } from '@/shared/components/ui/modal/modal.store';
+import { type AuthTokensSuccessResponse } from '@/shared/schemas';
 
 const web3userDataSchema = z.object({
   userId: z.number(),
@@ -25,15 +25,15 @@ export interface Web3AuthenticatedUserContextType {
   user: Web3UserData;
   status: AuthStatus;
   signOut: (throwExpirationModal?: boolean) => void;
-  signIn: (singIsSuccess: SignInSuccessResponse) => void;
+  signIn: (singIsSuccess: AuthTokensSuccessResponse) => void;
   updateUserData: (updateUserDataPayload: Partial<Web3UserData>) => void;
 }
 
 interface Web3UnauthenticatedUserContextType {
   user: null;
   status: AuthStatus;
   signOut: (throwExpirationModal?: boolean) => void;
-  signIn: (singIsSuccess: SignInSuccessResponse) => void;
+  signIn: (singIsSuccess: AuthTokensSuccessResponse) => void;
 }
 
 export const Web3AuthContext = createContext<
@@ -97,7 +97,7 @@ export function Web3AuthProvider({ children }: { children: React.ReactNode }) {
     }
   };
 
-  const signIn = (singIsSuccess: SignInSuccessResponse) => {
+  const signIn = (singIsSuccess: AuthTokensSuccessResponse) => {
     browserAuthProvider.signIn(singIsSuccess, 'web3');
     handleSignIn();
   };
diff --git a/packages/apps/human-app/frontend/src/modules/auth/context/auth-context.tsx b/packages/apps/human-app/frontend/src/modules/auth/context/auth-context.tsx
@@ -3,12 +3,12 @@ import { useState, createContext, useEffect } from 'react';
 import { jwtDecode } from 'jwt-decode';
 import { z } from 'zod';
 import { useQueryClient } from '@tanstack/react-query';
-import type { SignInSuccessResponse } from '@/modules/worker/services/sign-in/types';
 import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
 import {
   ModalType,
   useModalStore,
 } from '@/shared/components/ui/modal/modal.store';
+import { type AuthTokensSuccessResponse } from '@/shared/schemas';
 
 const extendableUserDataSchema = z.object({
   site_key: z.string().optional().nullable(),
@@ -35,15 +35,15 @@ export interface AuthenticatedUserContextType {
   user: UserData;
   status: AuthStatus;
   signOut: (throwExpirationModal?: boolean) => void;
-  signIn: (singIsSuccess: SignInSuccessResponse) => void;
+  signIn: (singIsSuccess: AuthTokensSuccessResponse) => void;
   updateUserData: (updateUserDataPayload: UpdateUserDataPayload) => void;
 }
 
 interface UnauthenticatedUserContextType {
   user: null;
   status: AuthStatus;
   signOut: (throwExpirationModal?: boolean) => void;
-  signIn: (singIsSuccess: SignInSuccessResponse) => void;
+  signIn: (singIsSuccess: AuthTokensSuccessResponse) => void;
 }
 
 export const AuthContext = createContext<
@@ -112,7 +112,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
     }
   };
 
-  const signIn = (singIsSuccess: SignInSuccessResponse) => {
+  const signIn = (singIsSuccess: AuthTokensSuccessResponse) => {
     browserAuthProvider.signIn(singIsSuccess, 'web2');
     handleSignIn();
   };
diff --git a/packages/apps/human-app/frontend/src/modules/signin/worker/schemas.ts b/packages/apps/human-app/frontend/src/modules/signin/worker/schemas.ts
@@ -11,9 +11,4 @@ export const signInDtoSchema = z.object({
   h_captcha_token: z.string().min(1, t('validation.captcha')).default('token'),
 });
 
-export const signInSuccessResponseSchema = z.object({
-  // eslint-disable-next-line camelcase -- data from api
-  access_token: z.string(),
-  // eslint-disable-next-line camelcase -- data from api
-  refresh_token: z.string(),
-});
+export type SignInDto = z.infer<typeof signInDtoSchema>;
diff --git a/packages/apps/human-app/frontend/src/modules/signin/worker/sign-in-form.tsx b/packages/apps/human-app/frontend/src/modules/signin/worker/sign-in-form.tsx
@@ -8,10 +8,9 @@ import { Input } from '@/shared/components/data-entry/input';
 import { Button } from '@/shared/components/ui/button';
 import { Password } from '@/shared/components/data-entry/password/password';
 import { routerPaths } from '@/router/router-paths';
-import { type SignInDto } from '@/modules/worker/services/sign-in/types';
-import { signInDtoSchema } from '@/modules/worker/services/sign-in/schema';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
 import { HCaptchaForm } from '@/shared/components/hcaptcha';
+import { type SignInDto, signInDtoSchema } from './schemas';
 
 interface SignInFormProps {
   onSubmit: (data: SignInDto) => void;
diff --git a/packages/apps/human-app/frontend/src/modules/signin/worker/use-sign-in-mutation.ts b/packages/apps/human-app/frontend/src/modules/signin/worker/use-sign-in-mutation.ts
@@ -4,12 +4,12 @@ import { apiClient } from '@/api/api-client';
 import { apiPaths } from '@/api/api-paths';
 import { routerPaths } from '@/router/router-paths';
 import { useAuth } from '@/modules/auth/hooks/use-auth';
-import { type SignInDto } from './types';
-import { signInSuccessResponseSchema } from './schema';
+import { authTokensSuccessResponseSchema } from '@/shared/schemas';
+import { type SignInDto } from './schemas';
 
 function signInMutationFn(data: SignInDto) {
   return apiClient(apiPaths.worker.signIn.path, {
-    successSchema: signInSuccessResponseSchema,
+    successSchema: authTokensSuccessResponseSchema,
     options: {
       method: 'POST',
       body: JSON.stringify(data),
diff --git a/packages/apps/human-app/frontend/src/modules/signin/worker/use-sign-in.tsx b/packages/apps/human-app/frontend/src/modules/signin/worker/use-sign-in.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
-import { useSignInMutation } from '@/modules/worker/services/sign-in/sign-in';
 import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
-import { type SignInDto } from '@/modules/worker/services/sign-in/types';
+import { useSignInMutation } from './use-sign-in-mutation';
+import { type SignInDto } from './schemas';
 
 export function useSignIn() {
   const {
diff --git a/packages/apps/human-app/frontend/src/modules/signup/worker/hooks/use-sign-up-mutation.ts b/packages/apps/human-app/frontend/src/modules/signup/worker/hooks/use-sign-up-mutation.ts
@@ -1,39 +1,10 @@
 import { z } from 'zod';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useNavigate } from 'react-router-dom';
-import { t } from 'i18next';
 import { apiClient } from '@/api/api-client';
 import { apiPaths } from '@/api/api-paths';
 import { routerPaths } from '@/router/router-paths';
-
-export const signUpDtoSchema = z
-  .object({
-    email: z.string().email(t('validation.invalidEmail')),
-    // eslint-disable-next-line camelcase -- export vite config
-    h_captcha_token: z
-      .string()
-      .min(1, t('validation.captcha'))
-      .default('token'),
-  })
-  .and(
-    z
-      .object({
-        password: z
-          .string()
-          .min(8, t('validation.min'))
-          .max(50, t('validation.max', { count: 50 })),
-        confirmPassword: z
-          .string()
-          .min(1, t('validation.required'))
-          .max(50, t('validation.max', { count: 50 })),
-      })
-      .refine(({ password, confirmPassword }) => confirmPassword === password, {
-        message: t('validation.passwordMismatch'),
-        path: ['confirmPassword'],
-      })
-  );
-
-export type SignUpDto = z.infer<typeof signUpDtoSchema>;
+import { type SignUpDto } from '../schema';
 
 const signUpSuccessResponseSchema = z.unknown();
 
diff --git a/packages/apps/human-app/frontend/src/modules/signup/worker/hooks/use-sign-up-worker.tsx b/packages/apps/human-app/frontend/src/modules/signup/worker/hooks/use-sign-up-worker.tsx
@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
 import omit from 'lodash/omit';
 import { browserAuthProvider } from '@/shared/contexts/browser-auth-provider';
-import type { SignUpDto } from '@/modules/worker/services/sign-up';
-import { useSignUpMutation } from '@/modules/worker/services/sign-up';
+import { type SignUpDto } from '../schema';
+import { useSignUpMutation } from './use-sign-up-mutation';
 
 export function useSignUpWorker() {
   const {
diff --git a/packages/apps/human-app/frontend/src/modules/signup/worker/schema.ts b/packages/apps/human-app/frontend/src/modules/signup/worker/schema.ts
@@ -0,0 +1,28 @@
+import { t } from 'i18next';
+import { z } from 'zod';
+
+export const signUpDtoSchema = z
+  .object({
+    email: z.string().email(t('validation.invalidEmail')),
+    // eslint-disable-next-line camelcase -- export vite config
+    h_captcha_token: z
+      .string()
+      .min(1, t('validation.captcha'))
+      .default('token'),
+  })
+  .and(
+    z
+      .object({
+        password: z
+          .string()
+          .min(8, t('validation.min'))
+          .max(50, t('validation.max', { count: 50 })),
+        confirmPassword: z.string().min(1, t('validation.required')),
+      })
+      .refine(({ password, confirmPassword }) => confirmPassword === password, {
+        message: t('validation.passwordMismatch'),
+        path: ['confirmPassword'],
+      })
+  );
+
+export type SignUpDto = z.infer<typeof signUpDtoSchema>;
diff --git a/packages/apps/human-app/frontend/src/modules/signup/worker/views/sign-up-worker.page.tsx b/packages/apps/human-app/frontend/src/modules/signup/worker/views/sign-up-worker.page.tsx
@@ -4,8 +4,6 @@ import Grid from '@mui/material/Grid';
 import Typography from '@mui/material/Typography';
 import Link from '@mui/material/Link';
 import { useTranslation, Trans } from 'react-i18next';
-import type { SignUpDto } from '@/modules/worker/services/sign-up';
-import { signUpDtoSchema } from '@/modules/worker/services/sign-up';
 import { Button } from '@/shared/components/ui/button';
 import { Input } from '@/shared/components/data-entry/input';
 import { Password } from '@/shared/components/data-entry/password/password';
@@ -17,6 +15,7 @@ import { HCaptchaForm } from '@/shared/components/hcaptcha';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
 import { FetchError } from '@/api/fetcher';
 import { useSignUpWorker } from '@/modules/signup/worker/hooks/use-sign-up-worker';
+import { signUpDtoSchema, type SignUpDto } from '../schema';
 
 export function SignUpWorkerPage() {
   const { t } = useTranslation();
diff --git a/packages/apps/human-app/frontend/src/modules/worker/services/sign-in/types.ts b/packages/apps/human-app/frontend/src/modules/worker/services/sign-in/types.ts
diff --git a/packages/apps/human-app/frontend/src/shared/contexts/browser-auth-provider.ts b/packages/apps/human-app/frontend/src/shared/contexts/browser-auth-provider.ts
@@ -1,6 +1,6 @@
 /* eslint-disable camelcase -- ...*/
-import { type SignInSuccessResponse } from '@/modules/worker/services/sign-in/types';
 import type { BrowserAuthProvider } from '@/shared/types/browser-auth-provider';
+import { type AuthTokensSuccessResponse } from '../schemas';
 
 const accessTokenKey = btoa('access_token');
 const refreshTokenKey = btoa('refresh_token');
@@ -11,7 +11,7 @@ const browserAuthProvider: BrowserAuthProvider = {
   isAuthenticated: false,
   authType: 'web2',
   signIn(
-    { access_token, refresh_token }: SignInSuccessResponse,
+    { access_token, refresh_token }: AuthTokensSuccessResponse,
     authType,
     signOutSubscription
   ) {
diff --git a/packages/apps/human-app/frontend/src/shared/schemas/auth-tokens-schema.ts b/packages/apps/human-app/frontend/src/shared/schemas/auth-tokens-schema.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod';
+
+export const authTokensSuccessResponseSchema = z.object({
+  // eslint-disable-next-line camelcase -- data from api
+  access_token: z.string(),
+  // eslint-disable-next-line camelcase -- data from api
+  refresh_token: z.string(),
+});
+
+export type AuthTokensSuccessResponse = z.infer<
+  typeof authTokensSuccessResponseSchema
+>;
diff --git a/packages/apps/human-app/frontend/src/shared/schemas/index.ts b/packages/apps/human-app/frontend/src/shared/schemas/index.ts
@@ -1,2 +1,3 @@
 export * from './validate-address-schema';
 export * from './url-domain-schema';
+export * from './auth-tokens-schema';
diff --git a/packages/apps/human-app/frontend/src/shared/types/browser-auth-provider.ts b/packages/apps/human-app/frontend/src/shared/types/browser-auth-provider.ts
@@ -1,14 +1,14 @@
-import type { SignInSuccessResponse } from '@/modules/worker/services/sign-in/types';
 import type { Web3UserData } from '@/modules/auth-web3/context/web3-auth-context';
 import type { UserData } from '@/modules/auth/context/auth-context';
+import { type AuthTokensSuccessResponse } from '../schemas';
 
 export type AuthType = 'web2' | 'web3';
 type SubscriptionCallback = () => void;
 export interface BrowserAuthProvider {
   isAuthenticated: boolean;
   authType: AuthType;
   signIn: (
-    singInSuccessData: SignInSuccessResponse,
+    singInSuccessData: AuthTokensSuccessResponse,
     authType: AuthType,
     signOutSubscription?: SubscriptionCallback
   ) => void;
