diff --git a/src/front/Api/BaseApiService.ts b/src/front/Api/BaseApiService.ts index 45bf7642..330551a4 100644 --- a/src/front/Api/BaseApiService.ts +++ b/src/front/Api/BaseApiService.ts @@ -2,7 +2,6 @@ import { FrontendVariables } from "@Front/Config/VariablesFront"; import CookieService from "@Front/Services/CookieService/CookieService"; import jwt_decode from "jwt-decode"; import JwtService, { ICustomerJwtPayload, IUserJwtPayload } from "@Front/Services/JwtService/JwtService"; -import { NextResponse } from "next/server"; export enum ContentType { JSON = "application/json", @@ -142,28 +141,28 @@ export default abstract class BaseApiService { const userDecodedToken = jwt_decode(accessToken) as IUserJwtPayload; const customerDecodedToken = jwt_decode(accessToken) as ICustomerJwtPayload; - if (!userDecodedToken && !customerDecodedToken) return NextResponse.redirect(new URL("/login")); + if (!userDecodedToken && !customerDecodedToken) return; const now = Math.floor(Date.now() / 1000); if (userDecodedToken.userId && userDecodedToken.exp < now) { const refreshToken = CookieService.getInstance().getCookie("leCoffreRefreshToken"); if (!refreshToken) { - return NextResponse.redirect(new URL("/authorized-client")); + return; } const decodedRefreshToken = jwt_decode(refreshToken) as IUserJwtPayload | ICustomerJwtPayload; if (decodedRefreshToken.exp < now) { - return NextResponse.redirect(new URL("/authorized-client")); + return; } await JwtService.getInstance().refreshToken(refreshToken); } - if (userDecodedToken.userId && userDecodedToken.exp < now) { + if (customerDecodedToken.customerId && customerDecodedToken.exp < now) { const refreshToken = CookieService.getInstance().getCookie("leCoffreRefreshToken"); if (!refreshToken) { - return NextResponse.redirect(new URL("/id360/customer-callback")); + return; } const decodedRefreshToken = jwt_decode(refreshToken) as IUserJwtPayload | ICustomerJwtPayload; if (decodedRefreshToken.exp < now) { - return NextResponse.redirect(new URL("/id360/customer-callback")); + return; } await JwtService.getInstance().refreshToken(refreshToken); }