fix refresh logic

moiskillnadne · Oct 16, 2024 · a000e79 · a000e79
1 parent e0eb386
commit a000e79
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
@@ -213,23 +213,45 @@ route.post(
       });
 
       if (typeof decoded === 'string') {
-        throw new UnauthorizedError(
-          'Decoded refreshToken is string for some reason',
-        );
+        res.clearCookie(Cookies.accessToken);
+        res.clearCookie(Cookies.refreshToken);
+
+        return res.status(404).json({
+          type: 'TOKEN_EXPIRED',
+          statusCode: 404,
+          message: 'Token expired',
+          isError: true,
+        });
       }
 
       const emailFromToken: string | null = decoded['email'] ?? null;
 
       if (!emailFromToken) {
-        throw new UnauthorizedError('Email is undefined');
+        res.clearCookie(Cookies.accessToken);
+        res.clearCookie(Cookies.refreshToken);
+
+        return res.status(404).json({
+          type: 'TOKEN_EXPIRED',
+          statusCode: 404,
+          message: 'Token expired',
+          isError: true,
+        });
       }
 
       const refreshTokenFromRedis = await redis.get(
         mapToRefreshTokenKey(emailFromToken),
       );
 
       if (!refreshTokenFromRedis) {
-        throw new UnauthorizedError('Refresh token is expired');
+        res.clearCookie(Cookies.accessToken);
+        res.clearCookie(Cookies.refreshToken);
+
+        return res.status(404).json({
+          type: 'TOKEN_EXPIRED',
+          statusCode: 404,
+          message: 'Token expired',
+          isError: true,
+        });
       }
 
       const accessToken = jwtService.generateToken({

diff --git a/src/core/middleware/exceptions/index.ts b/src/core/middleware/exceptions/index.ts
@@ -1,7 +1,6 @@
 import * as Sentry from '@sentry/node';
 import { NextFunction, Request, Response } from 'express';
 
-import { Cookies } from '../../constants';
 import { logger } from '../../logger';
 
 import {
@@ -26,21 +25,11 @@ export const exceptionsHandlerMiddleware = (
 
   logger.error(`[Error ${traceId}] ${JSON.stringify(err)}`);
 
-  if (err instanceof UnauthorizedError) {
-    res.clearCookie(Cookies.accessToken);
-    res.clearCookie(Cookies.refreshToken);
-
-    return res.status(err.statusCode).json({
-      isError: true,
-      type: err.type,
-      message: err.message,
-    });
-  }
-
   const isAppCustomErrors =
     err instanceof BadRequestError ||
     err instanceof UnprocessableEntityError ||
-    err instanceof NotFoundError;
+    err instanceof NotFoundError ||
+    err instanceof UnauthorizedError;
 
   if (isAppCustomErrors) {
     return res.status(err.statusCode).json({