debug token handling

lenneTech · Sep 4, 2024 · 1b69961 · 1b69961
1 parent 2818df4
commit 1b69961
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/runtime/composables/gql-mutation.ts b/src/runtime/composables/gql-mutation.ts
@@ -125,19 +125,16 @@ export async function gqlMutation<T = any>(method: string, options: IGraphQLOpti
     console.debug('gqlMutation::documentNode ', documentNode);
   }
 
-  let accessToken;
   if (method !== 'refreshToken' || !config.disableTokenCheck) {
-    const tokens = await callWithNuxt(_nuxtApp, checkTokenAndRenew);
-    console.debug('gqlMutation::tokens ', tokens);
-    if (tokens) {
-      accessToken = tokens.token;
-    }
+    await callWithNuxt(_nuxtApp, checkTokenAndRenew);
   }
 
   const requestHeaders = {
-    authorization: `Bearer ${method === 'refreshToken' ? refreshTokenState.value : accessToken}`,
+    authorization: `Bearer ${method === 'refreshToken' ? refreshTokenState.value : accessTokenState.value}`,
   };
 
+  console.debug('make request with following token', requestHeaders.authorization);
+
   let data;
   let error;
   try {

diff --git a/src/runtime/composables/use-auth.ts b/src/runtime/composables/use-auth.ts
@@ -38,15 +38,15 @@ export function useAuth() {
     // Get and set new tokens
     const { data } = await gqlMutation('refreshToken', { disableTokenCheck: true, fields: ['token', 'refreshToken'] });
 
-    if (data.value?.refreshToken) {
-      setTokens(data.value.refreshToken.token, data.value.refreshToken.refreshToken);
+    if (data?.refreshToken) {
+      setTokens(data.refreshToken.token, data.refreshToken.refreshToken);
     } else {
       return null;
     }
 
     const result = {
-      refreshToken: data.value.refreshToken.refreshToken,
-      token: data.value.refreshToken.token,
+      refreshToken: data.refreshToken.refreshToken,
+      token: data.refreshToken.token,
     };
 
     // Allow further calls again and transfer the result to waiting processes