[HUMAN App] refactor: reset password services (#3180)

mpblocky · web-flow · commit 54b688c72483 · 2025-03-12T12:42:24.000+03:00
diff --git a/packages/apps/human-app/frontend/src/modules/worker/reset-password/hooks/index.ts b/packages/apps/human-app/frontend/src/modules/worker/reset-password/hooks/index.ts
@@ -0,0 +1 @@
+export * from './reset-password';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/reset-password/hooks/reset-password.ts b/packages/apps/human-app/frontend/src/modules/worker/reset-password/hooks/reset-password.ts
diff --git a/packages/apps/human-app/frontend/src/modules/worker/reset-password/index.ts b/packages/apps/human-app/frontend/src/modules/worker/reset-password/index.ts
@@ -0,0 +1,2 @@
+export * from './reset-password-success.page';
+export * from './reset-password.page';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/reset-password/reset-password-success.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/reset-password/reset-password-success.page.tsx
diff --git a/packages/apps/human-app/frontend/src/modules/worker/reset-password/reset-password.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/reset-password/reset-password.page.tsx
@@ -10,16 +10,16 @@ import queryString from 'query-string';
 import { Button } from '@/shared/components/ui/button';
 import { Password } from '@/shared/components/data-entry/password/password';
 import { PageCard } from '@/shared/components/ui/page-card';
-import type { ResetPasswordDto } from '@/modules/worker/services/reset-password';
-import {
-  resetPasswordDtoSchema,
-  useResetPasswordMutation,
-} from '@/modules/worker/services/reset-password';
 import { Alert } from '@/shared/components/ui/alert';
 import { getErrorMessageForError } from '@/shared/errors';
 import { routerPaths } from '@/router/router-paths';
 import { HCaptchaForm } from '@/shared/components/hcaptcha';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
+import {
+  type ResetPasswordDto,
+  resetPasswordDtoSchema,
+  useResetPasswordMutation,
+} from './hooks';
 
 export function ResetPasswordWorkerPage() {
   const location = useLocation();
diff --git a/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/hooks/index.ts b/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/hooks/index.ts
@@ -0,0 +1 @@
+export * from './send-reset-link';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/hooks/send-reset-link.ts b/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/hooks/send-reset-link.ts
@@ -1,34 +1,10 @@
-/* eslint-disable camelcase -- ... */
 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 sendResetLinkEmailDtoSchema = z.object({
-  email: z
-    .string()
-    .min(1, t('worker.sendResetLinkForm.noEmailError'))
-    .email(t('worker.sendResetLinkForm.invalidEmailError')),
-});
-
-export type SendResetLinkEmail = z.infer<typeof sendResetLinkEmailDtoSchema>;
-
-export const sendResetLinkHcaptchaDtoSchema = z.object({
-  h_captcha_token: z.string().min(1, t('validation.captcha')).default('token'),
-});
-
-export type SendResetLinkHcaptcha = z.infer<
-  typeof sendResetLinkHcaptchaDtoSchema
->;
-
-export const sendResetLinkDtoSchema = sendResetLinkEmailDtoSchema.merge(
-  sendResetLinkHcaptchaDtoSchema
-);
-
-export type SendResetLinkDto = SendResetLinkEmail & SendResetLinkHcaptcha;
+import { type SendResetLinkDto } from '../schemas';
 
 const SendResetLinkSuccessResponseSchema = z.unknown();
 
diff --git a/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/index.ts b/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/index.ts
@@ -0,0 +1,2 @@
+export * from './send-reset-link-success.page';
+export * from './send-reset-link.page';
diff --git a/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/schemas.ts b/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/schemas.ts
@@ -0,0 +1,26 @@
+import { t } from 'i18next';
+import { z } from 'zod';
+
+const sendResetLinkEmailDtoSchema = z.object({
+  email: z
+    .string()
+    .min(1, t('worker.sendResetLinkForm.noEmailError'))
+    .email(t('worker.sendResetLinkForm.invalidEmailError')),
+});
+
+type SendResetLinkEmail = z.infer<typeof sendResetLinkEmailDtoSchema>;
+
+export const sendResetLinkHcaptchaDtoSchema = z.object({
+  // eslint-disable-next-line camelcase
+  h_captcha_token: z.string().min(1, t('validation.captcha')).default('token'),
+});
+
+export type SendResetLinkHcaptcha = z.infer<
+  typeof sendResetLinkHcaptchaDtoSchema
+>;
+
+export const sendResetLinkDtoSchema = sendResetLinkEmailDtoSchema.merge(
+  sendResetLinkHcaptchaDtoSchema
+);
+
+export type SendResetLinkDto = SendResetLinkEmail & SendResetLinkHcaptcha;
diff --git a/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/send-reset-link-success.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/send-reset-link-success.page.tsx
@@ -8,18 +8,18 @@ import { PageCard } from '@/shared/components/ui/page-card';
 import { Button } from '@/shared/components/ui/button';
 import { useLocationState } from '@/modules/worker/hooks/use-location-state';
 import { env } from '@/shared/env';
-import type { SendResetLinkHcaptcha } from '@/modules/worker/services/send-reset-link';
-import {
-  sendResetLinkHcaptchaDtoSchema,
-  useSendResetLinkMutation,
-} from '@/modules/worker/services/send-reset-link';
 import { Alert } from '@/shared/components/ui/alert';
 import { getErrorMessageForError } from '@/shared/errors';
 import { HCaptchaForm } from '@/shared/components/hcaptcha';
 import { MailTo } from '@/shared/components/ui/mail-to';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
 import { useColorMode } from '@/shared/contexts/color-mode';
 import { onlyDarkModeColor } from '@/shared/styles/dark-color-palette';
+import { useSendResetLinkMutation } from './hooks';
+import {
+  sendResetLinkHcaptchaDtoSchema,
+  type SendResetLinkHcaptcha,
+} from './schemas';
 
 export function SendResetLinkWorkerSuccessPage() {
   const { colorPalette, isDarkMode } = useColorMode();
diff --git a/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/send-reset-link.page.tsx b/packages/apps/human-app/frontend/src/modules/worker/send-reset-link/send-reset-link.page.tsx
@@ -6,17 +6,14 @@ import { useTranslation } from 'react-i18next';
 import { PageCard } from '@/shared/components/ui/page-card';
 import { Input } from '@/shared/components/data-entry/input';
 import { Button } from '@/shared/components/ui/button';
-import type { SendResetLinkDto } from '@/modules/worker/services/send-reset-link';
-import {
-  sendResetLinkDtoSchema,
-  useSendResetLinkMutation,
-} from '@/modules/worker/services/send-reset-link';
 import { Alert } from '@/shared/components/ui/alert';
 import { getErrorMessageForError } from '@/shared/errors';
 import { useAuth } from '@/modules/auth/hooks/use-auth';
 import { HCaptchaForm } from '@/shared/components/hcaptcha';
 import { routerPaths } from '@/router/router-paths';
 import { useResetMutationErrors } from '@/shared/hooks/use-reset-mutation-errors';
+import { useSendResetLinkMutation } from './hooks';
+import { type SendResetLinkDto, sendResetLinkDtoSchema } from './schemas';
 
 export function SendResetLinkWorkerPage() {
   const { t } = useTranslation();
diff --git a/packages/apps/human-app/frontend/src/router/routes.tsx b/packages/apps/human-app/frontend/src/router/routes.tsx
@@ -1,10 +1,6 @@
 import type { RouteProps } from 'react-router-dom';
 import { t } from 'i18next';
 import { routerPaths } from '@/router/router-paths';
-import { SendResetLinkWorkerSuccessPage } from '@/modules/worker/views/send-reset-link/send-reset-link-success.page';
-import { ResetPasswordWorkerPage } from '@/modules/worker/views/reset-password/reset-password.page';
-import { SendResetLinkWorkerPage } from '@/modules/worker/views/send-reset-link/send-reset-link.page';
-import { ResetPasswordWorkerSuccessPage } from '@/modules/worker/views/reset-password/reset-password-success.page';
 import { env } from '@/shared/env';
 import { RegistrationPage } from '@/modules/worker/oracle-registration';
 import {
@@ -36,6 +32,14 @@ import {
   SetUpOperatorPage,
 } from '@/modules/signup/operator';
 import { JobsPage } from '@/modules/worker/jobs';
+import {
+  ResetPasswordWorkerPage,
+  ResetPasswordWorkerSuccessPage,
+} from '@/modules/worker/reset-password';
+import {
+  SendResetLinkWorkerPage,
+  SendResetLinkWorkerSuccessPage,
+} from '@/modules/worker/send-reset-link';
 
 export const unprotectedRoutes: RouteProps[] = [
   {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export * from './reset-password-success.page';`
	`2`	`+export * from './reset-password.page';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export * from './send-reset-link-success.page';`
	`2`	`+export * from './send-reset-link.page';`