feat(auth): add sign-out and wire profile logout

src/pages/profile/ui/ProfilePage.tsx

@@ -8,6 +8,7 @@ import { ProfilePageSkeleton } from './ProfilePage.skeleton';
 import { ProfileIdentityCard } from './ProfileIdentityCard';
 import { ProfileSecurityCard } from './ProfileSecurityCard';
 import { ProfileNotificationsCard } from './ProfileNotificationsCard';
+import { SignOut } from './SignOut';
 
 interface ProfilePageProps {
   className?: string;
@@ -38,6 +39,7 @@ function ProfilePage({ className }: ProfilePageProps) {
   }
   return (
     <div className={cn('mx-auto w-full max-w-5xl space-y-6 pb-6', className)}>
+      <SignOut />
       <ProfileIdentityCard />
 
       <div className="grid items-start gap-4 lg:grid-cols-2">

src/pages/profile/ui/SignOut.tsx

@@ -0,0 +1,39 @@
+import { LogOut } from 'lucide-react';
+import { ComponentProps } from 'react';
+import { Button } from 'shared/ui';
+import { AccessToken, signout } from 'shared/api';
+import { routes } from 'shared/config';
+import { useRouter } from 'next/navigation';
+import { toast } from 'sonner';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { currentUserQueryKey } from '../model/queries/use-current-user';
+
+function SignOut(props: Omit<ComponentProps<typeof Button>, 'children'>) {
+  const router = useRouter();
+  const queryClient = useQueryClient();
+
+  const signoutMutation = useMutation({
+    mutationFn: signout,
+    onSuccess: (response) => {
+      AccessToken.clear();
+      queryClient.removeQueries({ queryKey: currentUserQueryKey });
+      router.replace(routes.auth.signin());
+      toast.success(response.message || 'Вы вышли из аккаунта');
+    },
+  });
+
+  return (
+    <Button
+      className="text-destructive"
+      variant="link"
+      onClick={() => signoutMutation.mutate()}
+      disabled={signoutMutation.isPending}
+      {...props}
+    >
+      Выйти
+      <LogOut className="size-4" />
+    </Button>
+  );
+}
+
+export { SignOut };

src/pages/signin/model/schemas/sign-in-form-schema.ts

@@ -0,0 +1,13 @@
+import { z } from 'zod';
+
+const MIN_PASS_LENGTH = 8;
+const MAX_PASS_LENGTH = 32;
+
+export const SigninFormSchema = z.object({
+  email: z.string().min(1, 'Обязательное поле').check(z.email('Неверный формат email')),
+  password: z
+    .string()
+    .min(1, 'Обязательное поле')
+    .min(MIN_PASS_LENGTH, `Минимум ${MIN_PASS_LENGTH} символов`)
+    .max(MAX_PASS_LENGTH, 'Слишком длинный пароль'),
+});

src/pages/signin/ui/SigninForm.tsx

@@ -2,7 +2,7 @@
 
 import { Controller, type FieldPath, useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { SigninBody, SigninFormSchema, SigninResponse } from '../model/schemas/login-schema';
+import { SigninFormSchema } from '../model/schemas/sign-in-form-schema';
 import {
   Button,
   Card,
@@ -23,8 +23,13 @@ import { cn } from 'shared/lib/utils';
 import { routes } from 'shared/config';
 import * as z from 'zod';
 import { useMutation } from '@tanstack/react-query';
-import { signin } from '../model/services/signin';
-import { extractValidationIssues, ValidationIssue } from 'shared/api';
+import {
+  extractValidationIssues,
+  signin,
+  SigninBody,
+  SigninResponse,
+  ValidationIssue,
+} from 'shared/api';
 
 type FSchema = z.infer<typeof SigninFormSchema>;
 type BSchema = z.infer<typeof SigninBody>;

src/pages/signup/model/schemas/confirm-form-schema.ts

@@ -0,0 +1,5 @@
+import { z } from 'zod';
+
+export const ConfirmFormSchema = z.object({
+  code: z.string().min(6, 'Обязательное поле'),
+});

src/pages/signup/model/schemas/signup-form-schema.ts

@@ -0,0 +1,25 @@
+import { z } from 'zod';
+
+const MIN_PASS_LENGTH = 8;
+const MAX_PASS_LENGTH = 32;
+
+export const SignupFormSchema = z
+  .object({
+    name: z
+      .string()
+      .trim()
+      .min(1, 'Обязательное поле')
+      .min(2, 'Слишком короткое имя')
+      .max(100, 'Слишком длинное имя'),
+    email: z.string().min(1, 'Обязательное поле').check(z.email('Неверный формат email')),
+    password: z
+      .string()
+      .min(1, 'Обязательное поле')
+      .min(MIN_PASS_LENGTH, `Минимум ${MIN_PASS_LENGTH} символов`)
+      .max(MAX_PASS_LENGTH, 'Слишком длинный пароль'),
+    confirmPassword: z.string().min(1, 'Обязательное поле'),
+  })
+  .refine((data) => data.password === data.confirmPassword, {
+    message: 'Пароли не совпадают',
+    path: ['confirmPassword'],
+  });

src/pages/signup/model/utils/field-name-mapper.ts

@@ -1,5 +1,6 @@
 import type { FieldPath } from 'react-hook-form';
-import { SignupBody, SignupFormSchema } from '../schemas/signup-schema';
+import { SignupBody } from 'shared/api';
+import { SignupFormSchema } from '../schemas/signup-form-schema';
 import { z } from 'zod';
 
 export const fieldNameMapper = (

src/pages/signup/ui/OTPForm.tsx

@@ -18,20 +18,26 @@ import {
   InputOTPSlot,
   Spinner,
 } from 'shared/ui';
-import { ConfirmBody, ConfirmFormSchema, ConfirmResponse } from '../model/schemas/confirm-schema';
+import { ConfirmFormSchema } from '../model/schemas/confirm-form-schema';
 import { cn } from 'shared/lib/utils';
 import { z } from 'zod';
 import { useMutation } from '@tanstack/react-query';
 import { isAxiosError } from 'axios';
-import { GlobalErrorResponseType, isAxiosValidationError } from 'shared/api';
-import { confirm } from '../model/services/confirm';
+import {
+  GlobalErrorResponseType,
+  isAxiosValidationError,
+  signupConfirm,
+  SignupConfirmBody,
+  SignupConfirmResponse,
+} from 'shared/api';
 import { REGEXP_ONLY_DIGITS } from 'input-otp';
+import { ComponentProps } from 'react';
 
 type FSchema = z.infer<typeof ConfirmFormSchema>;
-type BSchema = z.infer<typeof ConfirmBody>;
-type RSchema = z.infer<typeof ConfirmResponse>;
+type BSchema = z.infer<typeof SignupConfirmBody>;
+type RSchema = z.infer<typeof SignupConfirmResponse>;
 
-interface OTPFormProps extends Omit<React.ComponentProps<'form'>, 'children'> {
+interface OTPFormProps extends Omit<ComponentProps<'form'>, 'children'> {
   email: string;
   onSuccess?: (body: BSchema, res: RSchema) => void;
   autoFocusCode?: boolean;
@@ -46,7 +52,7 @@ export function OTPForm({
 }: OTPFormProps) {
   const sendConfirm = useMutation({
     mutationFn: (data: BSchema) => {
-      return confirm(data);
+      return signupConfirm(data);
     },
     meta: {
       skipGlobalValidationToast: true,

src/pages/signup/ui/SignupForm.tsx

@@ -21,16 +21,21 @@ import {
   Link,
   Spinner,
 } from 'shared/ui';
-import { SignupBody, SignupFormSchema, SignupResponse } from '../model/schemas/signup-schema';
+import { SignupFormSchema } from '../model/schemas/signup-form-schema';
 import { cn } from 'shared/lib/utils';
 import { routes } from 'shared/config';
 import { z } from 'zod';
 import { useState } from 'react';
 import { useMutation } from '@tanstack/react-query';
-import { signup } from '../model/services/signup';
 import { fieldNameMapper } from '../model/utils/field-name-mapper';
 import { prepareFullName } from '../model/utils/prepare-fullname';
-import { extractValidationIssues, ValidationIssue } from 'shared/api';
+import {
+  extractValidationIssues,
+  signup,
+  SignupBody,
+  SignupResponse,
+  ValidationIssue,
+} from 'shared/api';
 
 type FSchema = z.infer<typeof SignupFormSchema>;
 type BSchema = z.infer<typeof SignupBody>;

src/shared/api/auth/index.ts

@@ -0,0 +1,8 @@
+export { signin } from './services/sign-in';
+export { signup } from './services/sign-up';
+export { signupConfirm } from './services/sign-up-confirm';
+export { signout } from './services/sign-out';
+export { SigninBody, SigninResponse } from './schemas/sign-in-schema';
+export { SignoutResponse } from './schemas/sign-out-schema';
+export { SignupConfirmBody, SignupConfirmResponse } from './schemas/sign-up-confirm-schema';
+export { SignupBody, SignupResponse } from './schemas/sign-up-schema';

src/pages/signin/model/schemas/login-schema.ts → src/shared/api/auth/schemas/sign-in-schema.ts

@@ -1,8 +1,5 @@
 import { z } from 'zod';
 
-const MIN_PASS_LENGTH = 8;
-const MAX_PASS_LENGTH = 32;
-
 export const SigninBody = z
   .object({
     email: z.email().describe('Email пользователя'),
@@ -15,12 +12,3 @@ export const SigninResponse = z.object({
   token: z.string().describe('Новый access token (JWT)'),
   message: z.string().optional().describe('Дополнительное сообщение (опционально)'),
 });
-
-export const SigninFormSchema = z.object({
-  email: z.string().min(1, 'Обязательное поле').check(z.email('Неверный формат email')),
-  password: z
-    .string()
-    .min(1, 'Обязательное поле')
-    .min(MIN_PASS_LENGTH, `Минимум ${MIN_PASS_LENGTH} символов`)
-    .max(MAX_PASS_LENGTH, 'Слишком длинный пароль'),
-});

src/shared/api/auth/schemas/sign-out-schema.ts

@@ -0,0 +1,6 @@
+import { z } from 'zod';
+
+export const SignoutResponse = z.object({
+  success: z.boolean().describe('Статус операции'),
+  message: z.string().optional().describe('Сообщение для пользователя'),
+});

src/pages/signup/model/schemas/confirm-schema.ts → src/shared/api/auth/schemas/sign-up-confirm-schema.ts

@@ -1,18 +1,14 @@
 import { z } from 'zod';
 
-export const ConfirmBody = z
+export const SignupConfirmBody = z
   .object({
     email: z.email().describe('Email пользователя, на который был отправлен код'),
     code: z.string().min(6).max(6).describe('6-значный OTP код подтверждения'),
   })
   .describe('Схема верификации OTP кода');
 
-export const ConfirmResponse = z.object({
+export const SignupConfirmResponse = z.object({
   success: z.boolean().describe('Успешное подтверждение'),
   token: z.string().describe('Token (JWT)'),
   message: z.string().optional().describe('Дополнительное сообщение (опционально)'),
 });
-
-export const ConfirmFormSchema = z.object({
-  code: z.string().min(6, 'Обязательное поле'),
-});

src/pages/signup/model/schemas/signup-schema.ts → src/shared/api/auth/schemas/sign-up-schema.ts

@@ -37,24 +37,3 @@ export const SignupResponse = z.object({
   success: z.boolean().describe('Статус операции'),
   message: z.string().optional().describe('Сообщение для пользователя'),
 });
-
-export const SignupFormSchema = z
-  .object({
-    name: z
-      .string()
-      .trim()
-      .min(1, 'Обязательное поле')
-      .min(2, 'Слишком короткое имя')
-      .max(100, 'Слишком длинное имя'),
-    email: z.string().min(1, 'Обязательное поле').check(z.email('Неверный формат email')),
-    password: z
-      .string()
-      .min(1, 'Обязательное поле')
-      .min(MIN_PASS_LENGTH, `Минимум ${MIN_PASS_LENGTH} символов`)
-      .max(MAX_PASS_LENGTH, 'Слишком длинный пароль'),
-    confirmPassword: z.string().min(1, 'Обязательное поле'),
-  })
-  .refine((data) => data.password === data.confirmPassword, {
-    message: 'Пароли не совпадают',
-    path: ['confirmPassword'],
-  });

src/pages/signin/model/services/signin.ts → src/shared/api/auth/services/sign-in.ts

@@ -1,9 +1,9 @@
-import { api } from 'shared/api';
-import { SigninBody, SigninResponse } from '../schemas/login-schema';
 import { z } from 'zod';
+import { instance } from '../../instance';
+import { SigninBody, SigninResponse } from '../schemas/sign-in-schema';
 
 export function signin(data: z.infer<typeof SigninBody>): Promise<z.infer<typeof SigninResponse>> {
-  return api(
+  return instance(
     {
       url: '/auth/sign-in',
       method: 'POST',

src/shared/api/auth/services/sign-out.ts

@@ -0,0 +1,17 @@
+import { z } from 'zod';
+import { instance } from '../../instance';
+import { SignoutResponse } from '../schemas/sign-out-schema';
+
+export function signout(): Promise<z.infer<typeof SignoutResponse>> {
+  return instance(
+    {
+      url: '/auth/sign-out',
+      method: 'POST',
+    },
+    {
+      contracts: {
+        response: SignoutResponse,
+      },
+    }
+  );
+}

src/shared/api/auth/services/sign-up-confirm.ts

@@ -0,0 +1,22 @@
+import { z } from 'zod';
+import { SignupConfirmBody, SignupConfirmResponse } from '../schemas/sign-up-confirm-schema';
+import { api } from 'shared/api';
+
+export function signupConfirm(
+  data: z.infer<typeof SignupConfirmBody>
+): Promise<z.infer<typeof SignupConfirmResponse>> {
+  return api(
+    {
+      url: '/auth/sign-up/confirm',
+      method: 'POST',
+      data: data,
+      skipAuthRefresh: true,
+    },
+    {
+      contracts: {
+        body: SignupConfirmBody,
+        response: SignupConfirmResponse,
+      },
+    }
+  );
+}

src/pages/signup/model/services/signup.ts → src/shared/api/auth/services/sign-up.ts

@@ -1,9 +1,9 @@
-import { api } from 'shared/api';
-import { SignupBody, SignupResponse } from '../schemas/signup-schema';
 import { z } from 'zod';
+import { instance } from '../../instance';
+import { SignupBody, SignupResponse } from '../schemas/sign-up-schema';
 
 export function signup(data: z.infer<typeof SignupBody>): Promise<z.infer<typeof SignupResponse>> {
-  return api(
+  return instance(
     {
       url: '/auth/sign-up',
       method: 'POST',

src/shared/api/index.ts

@@ -12,3 +12,4 @@ export {
 export { type GlobalErrorResponseType } from './errors';
 export { AccessToken } from './token';
 export { queryClient } from './query-client';
+export * from './auth';

src/shared/api/token/refresh-interceptor.ts

@@ -3,6 +3,7 @@ import { z } from 'zod';
 import { RefreshTokenResponse } from './response-schema';
 import { AccessToken } from './access-token';
 import { GlobalErrorResponseType } from '../errors';
+import { signout } from '../auth';
 
 declare module 'axios' {
   export interface AxiosRequestConfig {
@@ -85,10 +86,7 @@ export const refreshInterceptor = (instance: AxiosInstance) => {
         } catch (refreshError) {
           processQueue(refreshError);
           try {
-            await instance.request({
-              url: '/auth/sign-out',
-              method: 'POST',
-            });
+            await signout();
           } catch (err) {
             return Promise.reject(err);
           }