debug token handling

lenneTech · Sep 4, 2024 · e4d8fec · e4d8fec
1 parent cbbbdb8
commit e4d8fec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/runtime/composables/gql-mutation.ts b/src/runtime/composables/gql-mutation.ts
@@ -11,8 +11,8 @@ import { useAuth } from './use-auth';
 export async function gqlMutation<T = any>(method: string, options: IGraphQLOptions = {}): Promise<{ data: T; error: Error }> {
   const { $graphql, _meta } = useNuxtApp();
   const _nuxtApp = useNuxtApp();
-  const { accessTokenState, refreshTokenState } = useAuthState();
   const { checkTokenAndRenew } = useAuth();
+  const { accessTokenState, refreshTokenState } = useAuthState();
 
   // Check parameters
   if (!method) {
@@ -125,12 +125,17 @@ export async function gqlMutation<T = any>(method: string, options: IGraphQLOpti
     console.debug('gqlMutation::documentNode ', documentNode);
   }
 
+  let accessToken;
   if (method !== 'refreshToken' || !config.disableTokenCheck) {
-    await callWithNuxt(_nuxtApp, checkTokenAndRenew);
+    const tokens = await callWithNuxt(_nuxtApp, checkTokenAndRenew);
+    console.debug('gqlMutation::tokens ', tokens);
+    if (tokens) {
+      accessToken = tokens.token;
+    }
   }
 
   const requestHeaders = {
-    authorization: `Bearer ${method === 'refreshToken' ? refreshTokenState.value : accessTokenState.value}`,
+    authorization: `Bearer ${method === 'refreshToken' ? refreshTokenState.value : accessToken}`,
   };
 
   let data;

diff --git a/src/runtime/composables/use-auth.ts b/src/runtime/composables/use-auth.ts
@@ -56,12 +56,17 @@ export function useAuth() {
     return result;
   }
 
-  async function checkTokenAndRenew() {
+  async function checkTokenAndRenew(): Promise<{
+    refreshToken: string;
+    token: string;
+  } | null> {
     const { accessTokenState } = useAuthState();
 
     if (isTokenExpired(accessTokenState.value)) {
-      await requestNewToken();
+      return requestNewToken();
     }
+
+    return null;
   }
 
   function setTokens(newToken: string, newRefreshToken: string) {
@@ -112,6 +117,7 @@ export function useAuth() {
       const decoded = getDecodedAccessToken(token);
       return decoded?.exp < Date.now() / 1000;
     }
+
     return false;
   }