feat: remove the refresh token, if it fails to refresh.

Intevel · May 1, 2023 · 336e3a9 · 336e3a9
1 parent 25efffd
commit 336e3a9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/runtime/composables/useDirectus.ts b/src/runtime/composables/useDirectus.ts
@@ -6,7 +6,7 @@ import { useDirectusToken } from './useDirectusToken'
 export const useDirectus = () => {
   const baseURL = useDirectusUrl()
   const config = useRuntimeConfig()
-  const { token, token_expired, refreshTokens } = useDirectusToken()
+  const { token, token_expired, refreshToken, refreshTokens } = useDirectusToken()
 
   return async <T>(
     url: string,
@@ -17,7 +17,11 @@ export const useDirectus = () => {
 
     if (config.public.directus.autoRefresh) {
       if (token_expired.value) {
-        await refreshTokens();
+        try {
+          await refreshTokens();
+        } catch (e) {
+          refreshToken.value = null;
+        }
       }
     }
 

diff --git a/src/runtime/plugin.ts b/src/runtime/plugin.ts
@@ -8,12 +8,18 @@ export default defineNuxtPlugin(async (nuxtApp) => {
 
   const config = useRuntimeConfig();
   const { fetchUser } = useDirectusAuth();
-  const { token, token_expired, refreshTokens } = useDirectusToken();
+  const { token, token_expired, refreshToken, refreshTokens } = useDirectusToken();
   const user = useDirectusUser();
 
   async function checkRefreshToken() {
     if (config.public.directus.autoRefresh) {
-      if (token_expired.value) await refreshTokens();
+      if (token_expired.value) {
+        try {
+          await refreshTokens();
+        } catch (e) {
+          refreshToken.value = null;
+        }
+      }
     }
   }