fix(oidc): lint (alpha)

AxaFrance · Jul 19, 2024 · f1d9da4 · f1d9da4
1 parent e4f4d97
commit f1d9da4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/packages/oidc-client-service-worker/src/jwt.ts b/packages/oidc-client-service-worker/src/jwt.ts
@@ -74,9 +74,9 @@ export const defaultDemonstratingProofOfPossessionConfiguration: DemonstratingPr
 const sign =
   (w: any) =>
   async (
-    jwk,
-    headers,
-    claims,
+    jwk: any,
+    headers: any,
+    claims: any,
     demonstratingProofOfPossessionConfiguration: DemonstratingProofOfPossessionConfiguration,
     jwtHeaderType = 'dpop+jwt',
   ) => {

diff --git a/packages/oidc-client/src/fetch.ts b/packages/oidc-client/src/fetch.ts
@@ -1,11 +1,12 @@
-import { getValidTokenAsync } from './parseTokens';
-import { Fetch } from './types';
+import Oidc from './oidc';
+import {getValidTokenAsync, OidcToken, Tokens} from './parseTokens';
+import {Fetch, StringMap, TokenAutomaticRenewMode} from './types';
 
 // @ts-ignore
 export const fetchWithTokens =
   (
     fetch: Fetch,
-    oidcClient: Oidc | null,
+    oidc: Oidc | null,
     demonstrating_proof_of_possession: boolean = false,
   ): Fetch =>
   async (...params: Parameters<Fetch>): Promise<Response> => {
@@ -17,10 +18,15 @@ export const fetchWithTokens =
         ? new Headers(optionTmp.headers)
         : optionTmp.headers;
     }
-    const oidc = oidcClient;
+
+    const oidcToken : OidcToken = {
+      tokens: oidc.tokens,
+      configuration: { token_automatic_renew_mode: oidc.configuration.token_automatic_renew_mode },
+      renewTokensAsync: oidc.renewTokensAsync,
+    }
 
     // @ts-ignore
-    const getValidToken = await getValidTokenAsync(oidc);
+    const getValidToken = await getValidTokenAsync(oidcToken);
     const accessToken = getValidToken?.tokens?.accessToken;
     if (!headers.has('Accept')) {
       headers.set('Accept', 'application/json');

diff --git a/packages/oidc-client/src/oidcClient.ts b/packages/oidc-client/src/oidcClient.ts
@@ -97,7 +97,7 @@ export class OidcClient {
   }
 
   fetchWithTokens(fetch: Fetch, demonstrating_proof_of_possession: boolean = false): Fetch {
-    return fetchWithTokens(fetch, this, demonstrating_proof_of_possession);
+    return fetchWithTokens(fetch, this._oidc, demonstrating_proof_of_possession);
   }
 
   async userInfoAsync<T extends OidcUserInfo = OidcUserInfo>(