fix(client): logout

Signed-off-by: Noa Virellia <noa@requiem.garden>

client/cms/src/lib/client.ts

@@ -1,13 +1,12 @@
 import { isEmpty, isNil } from 'lodash-es';
 import { client } from '@/client/client.gen';
-import { router } from './router';
 import {
-  clearTokens,
   doRefreshToken,
+  getAccessToken,
   getRefreshToken,
-  getToken,
+  logout,
+  setAccessToken,
   setRefreshToken,
-  setToken,
 } from './token';
 
 export function configInternalApiClient() {
@@ -19,8 +18,8 @@ export function configInternalApiClient() {
   });
 
   client.interceptors.request.use((request) => {
-    const token = getToken();
-    if (token) {
+    const token = getAccessToken();
+    if (!isNil(token) && !isEmpty(token)) {
       request.headers.set('Authorization', `Bearer ${token}`);
     }
     return request;
@@ -28,14 +27,21 @@ export function configInternalApiClient() {
 
   client.interceptors.response.use(async (response, request, options) => {
     if (response.status === 401) {
-      const refreshToken = getRefreshToken();
       // Avoid infinite loop if the refresh token request itself fails
-      if (!request.url.includes('/auth/refresh') && !isNil(refreshToken)) {
-        try {
-          const refreshResponse = await doRefreshToken();
+      if (request.url.includes('/auth/refresh')) {
+        // Refresh token failed, clear tokens and redirect to login page
+        logout('Session expired');
+      }
+      else {
+        const refreshToken = getRefreshToken();
+        if (isNil(refreshToken) || isEmpty(refreshToken)) {
+          logout('You are not logged in');
+        }
+        else {
+          const refreshResponse = await doRefreshToken(refreshToken);
           if (!isEmpty(refreshResponse)) {
             const { access_token, refresh_token } = refreshResponse;
-            setToken(access_token!);
+            setAccessToken(access_token!);
             setRefreshToken(refresh_token!);
 
             const fetchFn = options.fetch ?? globalThis.fetch;
@@ -50,11 +56,6 @@ export function configInternalApiClient() {
             });
           }
         }
-        catch (e) {
-          clearTokens();
-          await router.navigate({ to: '/authorize' });
-          return response;
-        }
       }
     }
     return response;