@inrupt/solid-client-authn-browser 1.17.0 → 1.17.2

package/src/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.spec.ts

@@ -50,7 +50,7 @@ import {
 
 jest.mock("@inrupt/universal-fetch", () => {
   const fetchModule = jest.requireActual(
-    "@inrupt/universal-fetch"
+    "@inrupt/universal-fetch",
   ) as typeof UniversalFetch;
   return {
     ...fetchModule,
@@ -162,7 +162,7 @@ jest.useFakeTimers();
 
 function mockOidcClient(): typeof OidcClientExt {
   const mockedOidcClient = jest.requireMock<typeof OidcClientExt>(
-    "@inrupt/oidc-client-ext"
+    "@inrupt/oidc-client-ext",
   );
   mockedOidcClient.getDpopToken = jest
     .fn<typeof mockedOidcClient.getDpopToken>()
@@ -196,14 +196,14 @@ function mockClientRegistrar(client: IClient): IClientRegistrar {
   return {
     getClient: async (
       _options: IClientRegistrarOptions,
-      _issuer: IIssuerConfig
+      _issuer: IIssuerConfig,
     ): Promise<IClient> => client,
   };
 }
 
 const mockFetch = (response: Response) => {
   const { fetch: mockedFetch } = jest.requireMock(
-    "@inrupt/universal-fetch"
+    "@inrupt/universal-fetch",
   ) as jest.Mocked<typeof UniversalFetch>;
   mockedFetch.mockResolvedValueOnce(response);
   return mockedFetch;
@@ -218,14 +218,14 @@ const defaultMocks = {
 };
 
 function getAuthCodeRedirectHandler(
-  mocks: Partial<typeof defaultMocks> = defaultMocks
+  mocks: Partial<typeof defaultMocks> = defaultMocks,
 ): AuthCodeRedirectHandler {
   return new AuthCodeRedirectHandler(
     mocks.storageUtility ?? defaultMocks.storageUtility,
     mocks.sessionInfoManager ?? defaultMocks.sessionInfoManager,
     mocks.issuerConfigFetcher ?? defaultMocks.issuerConfigFetcher,
     mocks.clientRegistrar ?? defaultMocks.clientRegistrar,
-    mocks.tokenRefresher ?? defaultMocks.tokenRefresher
+    mocks.tokenRefresher ?? defaultMocks.tokenRefresher,
   );
 }
 
@@ -246,7 +246,7 @@ const mockDefaultStorageUtility = (
     dpop: true,
     codeVerifier: DEFAULT_CODE_VERIFIER,
     redirectUrl: DEFAULT_REDIRECT_URL,
-  }
+  },
 ) =>
   mockStorageUtility({
     [`${USER_SESSION_PREFIX}:${DEFAULT_OAUTH_STATE}`]: {
@@ -265,16 +265,16 @@ describe("AuthCodeRedirectHandler", () => {
     it("Accepts a valid url with the correct query", async () => {
       const authCodeRedirectHandler = getAuthCodeRedirectHandler();
       expect(await authCodeRedirectHandler.canHandle(mockRedirectUrl())).toBe(
-        true
+        true,
       );
     });
 
     it("throws on invalid url", async () => {
       const authCodeRedirectHandler = getAuthCodeRedirectHandler();
       await expect(() =>
-        authCodeRedirectHandler.canHandle("beep boop I am a robot")
+        authCodeRedirectHandler.canHandle("beep boop I am a robot"),
       ).rejects.toThrow(
-        "[beep boop I am a robot] is not a valid URL, and cannot be used as a redirect URL: TypeError: Invalid URL: beep boop I am a robot"
+        "[beep boop I am a robot] is not a valid URL, and cannot be used as a redirect URL: TypeError: Invalid URL: beep boop I am a robot",
       );
     });
 
@@ -282,8 +282,8 @@ describe("AuthCodeRedirectHandler", () => {
       const authCodeRedirectHandler = getAuthCodeRedirectHandler();
       expect(
         await authCodeRedirectHandler.canHandle(
-          "https://coolparty.com/?meep=mop"
-        )
+          "https://coolparty.com/?meep=mop",
+        ),
       ).toBe(false);
     });
 
@@ -291,8 +291,8 @@ describe("AuthCodeRedirectHandler", () => {
       const authCodeRedirectHandler = getAuthCodeRedirectHandler();
       expect(
         await authCodeRedirectHandler.canHandle(
-          "https://coolparty.com/?state=someState"
-        )
+          "https://coolparty.com/?state=someState",
+        ),
       ).toBe(false);
     });
 
@@ -300,8 +300,8 @@ describe("AuthCodeRedirectHandler", () => {
       const authCodeRedirectHandler = getAuthCodeRedirectHandler();
       expect(
         await authCodeRedirectHandler.canHandle(
-          "https://coolparty.com/?code=someCode"
-        )
+          "https://coolparty.com/?code=someCode",
+        ),
       ).toBe(false);
     });
   });
@@ -310,9 +310,9 @@ describe("AuthCodeRedirectHandler", () => {
     it("throws on non-redirect URL", async () => {
       const authCodeRedirectHandler = getAuthCodeRedirectHandler();
       await expect(
-        authCodeRedirectHandler.handle("https://my.app")
+        authCodeRedirectHandler.handle("https://my.app"),
       ).rejects.toThrow(
-        "AuthCodeRedirectHandler cannot handle [https://my.app]: it is missing one of [code, state]."
+        "AuthCodeRedirectHandler cannot handle [https://my.app]: it is missing one of [code, state].",
       );
     });
 
@@ -321,7 +321,7 @@ describe("AuthCodeRedirectHandler", () => {
       mockFetch(
         new Response("", {
           status: 200,
-        })
+        }),
       );
       const storage = mockDefaultStorageUtility();
 
@@ -337,7 +337,7 @@ describe("AuthCodeRedirectHandler", () => {
         expect.objectContaining({
           codeVerifier: DEFAULT_CODE_VERIFIER,
           redirectUrl: DEFAULT_REDIRECT_URL,
-        })
+        }),
       );
     });
 
@@ -346,7 +346,7 @@ describe("AuthCodeRedirectHandler", () => {
       mockFetch(
         new Response("", {
           status: 200,
-        })
+        }),
       );
       const storageUtility = mockDefaultStorageUtility();
       await storageUtility.deleteForUser("mySession", "codeVerifier");
@@ -355,7 +355,7 @@ describe("AuthCodeRedirectHandler", () => {
       });
 
       await expect(
-        authCodeRedirectHandler.handle(mockRedirectUrl())
+        authCodeRedirectHandler.handle(mockRedirectUrl()),
       ).rejects.toThrow();
     });
 
@@ -364,7 +364,7 @@ describe("AuthCodeRedirectHandler", () => {
       mockFetch(
         new Response("", {
           status: 200,
-        })
+        }),
       );
       const storageUtility = mockDefaultStorageUtility();
       await storageUtility.deleteForUser("mySession", "redirectUrl");
@@ -373,7 +373,7 @@ describe("AuthCodeRedirectHandler", () => {
       });
 
       await expect(
-        authCodeRedirectHandler.handle(mockRedirectUrl())
+        authCodeRedirectHandler.handle(mockRedirectUrl()),
       ).rejects.toThrow();
     });
 
@@ -382,13 +382,13 @@ describe("AuthCodeRedirectHandler", () => {
       mockFetch(
         new Response("", {
           status: 200,
-        })
+        }),
       );
       defaultMocks.sessionInfoManager.get.mockResolvedValueOnce(undefined);
 
       const authCodeRedirectHandler = getAuthCodeRedirectHandler();
       await expect(
-        authCodeRedirectHandler.handle(mockRedirectUrl())
+        authCodeRedirectHandler.handle(mockRedirectUrl()),
       ).rejects.toThrow("Could not retrieve session");
     });
 
@@ -402,7 +402,7 @@ describe("AuthCodeRedirectHandler", () => {
       mockFetch(
         new Response("", {
           status: 200,
-        })
+        }),
       );
       const storageUtility = mockDefaultStorageUtility();
       const authCodeRedirectHandler = getAuthCodeRedirectHandler({
@@ -410,7 +410,7 @@ describe("AuthCodeRedirectHandler", () => {
       });
 
       await expect(
-        authCodeRedirectHandler.handle(redirectUrl.href)
+        authCodeRedirectHandler.handle(redirectUrl.href),
       ).rejects.toThrow();
     });
 
@@ -420,7 +420,7 @@ describe("AuthCodeRedirectHandler", () => {
       mockedFetch.mockResolvedValueOnce(
         new Response("", {
           status: 200,
-        })
+        }),
       );
 
       const authCodeRedirectHandler = getAuthCodeRedirectHandler({
@@ -428,7 +428,7 @@ describe("AuthCodeRedirectHandler", () => {
       });
 
       const redirectInfo = await authCodeRedirectHandler.handle(
-        mockRedirectUrl()
+        mockRedirectUrl(),
       );
 
       // This will call the oidc-client-ext module, which is mocked at
@@ -448,14 +448,14 @@ describe("AuthCodeRedirectHandler", () => {
       mockedFetch.mockResolvedValueOnce(
         new Response("", {
           status: 200,
-        })
+        }),
       );
 
       const authCodeRedirectHandler = getAuthCodeRedirectHandler({
         storageUtility: mockDefaultStorageUtility({ dpop: true }),
       });
       const redirectInfo = await authCodeRedirectHandler.handle(
-        mockRedirectUrl()
+        mockRedirectUrl(),
       );
       await redirectInfo.fetch("https://some.other.url");
 
@@ -468,7 +468,7 @@ describe("AuthCodeRedirectHandler", () => {
       mockFetch(
         new Response("", {
           status: 200,
-        })
+        }),
       );
 
       const mockedStorage = mockDefaultStorageUtility();
@@ -482,7 +482,7 @@ describe("AuthCodeRedirectHandler", () => {
       await expect(
         mockedStorage.getForUser("mySession", "idToken", {
           secure: false,
-        })
+        }),
       ).resolves.toBeUndefined();
     });
 
@@ -492,7 +492,7 @@ describe("AuthCodeRedirectHandler", () => {
       mockFetch(
         new Response("", {
           status: 200,
-        })
+        }),
       );
 
       const mockedStorage = mockDefaultStorageUtility();
@@ -506,7 +506,7 @@ describe("AuthCodeRedirectHandler", () => {
       await expect(
         mockedStorage.getForUser("mySession", "redirectUrl", {
           secure: false,
-        })
+        }),
         // The redirect URL already in storage shouldn't be overriden on redirect.
       ).resolves.toBe(DEFAULT_REDIRECT_URL);
     });
@@ -526,11 +526,11 @@ describe("AuthCodeRedirectHandler", () => {
       });
 
       const sessionInfo = await authCodeRedirectHandler.handle(
-        mockRedirectUrl()
+        mockRedirectUrl(),
       );
 
       expect(sessionInfo.expirationDate).toBe(
-        MOCK_TIMESTAMP + MOCK_EXPIRE_TIME * 1000
+        MOCK_TIMESTAMP + MOCK_EXPIRE_TIME * 1000,
       );
     });
 
@@ -553,7 +553,7 @@ describe("AuthCodeRedirectHandler", () => {
       });
 
       const sessionInfo = await authCodeRedirectHandler.handle(
-        mockRedirectUrl()
+        mockRedirectUrl(),
       );
 
       expect(sessionInfo.expirationDate).toBeUndefined();
@@ -583,11 +583,11 @@ describe("AuthCodeRedirectHandler", () => {
     }>("@inrupt/solid-client-authn-core");
     const mockAuthenticatedFetchBuild = jest.spyOn(
       coreModule,
-      "buildAuthenticatedFetch"
+      "buildAuthenticatedFetch",
     );
 
     const tokenRefresher = mockTokenRefresher(
-      await mockTokenEndpointDpopResponse()
+      await mockTokenEndpointDpopResponse(),
     );
     // Run the test
     const authCodeRedirectHandler = getAuthCodeRedirectHandler({
@@ -607,7 +607,7 @@ describe("AuthCodeRedirectHandler", () => {
           tokenRefresher,
         },
         expiresIn: 1337,
-      })
+      }),
     );
   });
 });

package/src/login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler.ts

@@ -27,7 +27,7 @@
 // being unauthenticated. This should be looked into when migrating to universal-fetch.
 // import { fetch } from "cross-fetch";
 
-import { fetch } from "@inrupt/universal-fetch";
+import { fetch as uniFetch } from "@inrupt/universal-fetch";
 
 import type {
   IClient,
@@ -49,6 +49,9 @@ import type { CodeExchangeResult } from "@inrupt/oidc-client-ext";
 import { getDpopToken, getBearerToken } from "@inrupt/oidc-client-ext";
 import type { EventEmitter } from "events";
 
+const globalFetch: typeof uniFetch = (...args) =>
+  uniFetch.call(globalThis, ...args);
+
 /**
  * @hidden
  */
@@ -58,8 +61,14 @@ export class AuthCodeRedirectHandler implements IIncomingRedirectHandler {
     private sessionInfoManager: ISessionInfoManager,
     private issuerConfigFetcher: IIssuerConfigFetcher,
     private clientRegistrar: IClientRegistrar,
-    private tokerRefresher: ITokenRefresher
-  ) {}
+    private tokerRefresher: ITokenRefresher,
+  ) {
+    this.storageUtility = storageUtility;
+    this.sessionInfoManager = sessionInfoManager;
+    this.issuerConfigFetcher = issuerConfigFetcher;
+    this.clientRegistrar = clientRegistrar;
+    this.tokerRefresher = tokerRefresher;
+  }
 
   async canHandle(redirectUrl: string): Promise<boolean> {
     try {
@@ -70,18 +79,18 @@ export class AuthCodeRedirectHandler implements IIncomingRedirectHandler {
       );
     } catch (e) {
       throw new Error(
-        `[${redirectUrl}] is not a valid URL, and cannot be used as a redirect URL: ${e}`
+        `[${redirectUrl}] is not a valid URL, and cannot be used as a redirect URL: ${e}`,
       );
     }
   }
 
   async handle(
     redirectUrl: string,
-    eventEmitter?: EventEmitter
+    eventEmitter?: EventEmitter,
   ): Promise<IncomingRedirectResult> {
     if (!(await this.canHandle(redirectUrl))) {
       throw new Error(
-        `AuthCodeRedirectHandler cannot handle [${redirectUrl}]: it is missing one of [code, state].`
+        `AuthCodeRedirectHandler cannot handle [${redirectUrl}]: it is missing one of [code, state].`,
       );
     }
 
@@ -93,7 +102,7 @@ export class AuthCodeRedirectHandler implements IIncomingRedirectHandler {
       "sessionId",
       {
         errorIfNull: true,
-      }
+      },
     )) as string;
 
     const {
@@ -104,32 +113,32 @@ export class AuthCodeRedirectHandler implements IIncomingRedirectHandler {
     } = await loadOidcContextFromStorage(
       storedSessionId,
       this.storageUtility,
-      this.issuerConfigFetcher
+      this.issuerConfigFetcher,
     );
 
     const iss = url.searchParams.get("iss");
 
     if (typeof iss === "string" && iss !== issuerConfig.issuer) {
       throw new Error(
-        `The value of the iss parameter (${iss}) does not match the issuer identifier of the authorization server (${issuerConfig.issuer}). See [rfc9207](https://www.rfc-editor.org/rfc/rfc9207.html#section-2.3-3.1.1)`
+        `The value of the iss parameter (${iss}) does not match the issuer identifier of the authorization server (${issuerConfig.issuer}). See [rfc9207](https://www.rfc-editor.org/rfc/rfc9207.html#section-2.3-3.1.1)`,
       );
     }
 
     if (codeVerifier === undefined) {
       throw new Error(
-        `The code verifier for session ${storedSessionId} is missing from storage.`
+        `The code verifier for session ${storedSessionId} is missing from storage.`,
       );
     }
 
     if (storedRedirectIri === undefined) {
       throw new Error(
-        `The redirect URL for session ${storedSessionId} is missing from storage.`
+        `The redirect URL for session ${storedSessionId} is missing from storage.`,
       );
     }
 
     const client: IClient = await this.clientRegistrar.getClient(
       { sessionId: storedSessionId },
-      issuerConfig
+      issuerConfig,
     );
 
     let tokens: CodeExchangeResult;
@@ -162,12 +171,16 @@ export class AuthCodeRedirectHandler implements IIncomingRedirectHandler {
       };
     }
 
-    const authFetch = await buildAuthenticatedFetch(fetch, tokens.accessToken, {
-      dpopKey: tokens.dpopKey,
-      refreshOptions,
-      eventEmitter,
-      expiresIn: tokens.expiresIn,
-    });
+    const authFetch = await buildAuthenticatedFetch(
+      globalFetch,
+      tokens.accessToken,
+      {
+        dpopKey: tokens.dpopKey,
+        refreshOptions,
+        eventEmitter,
+        expiresIn: tokens.expiresIn,
+      },
+    );
 
     await this.storageUtility.setForUser(
       storedSessionId,
@@ -175,7 +188,7 @@ export class AuthCodeRedirectHandler implements IIncomingRedirectHandler {
         webId: tokens.webId,
         isLoggedIn: "true",
       },
-      { secure: true }
+      { secure: true },
     );
 
     const sessionInfo = await this.sessionInfoManager.get(storedSessionId);

package/src/login/oidc/incomingRedirectHandler/ErrorOidcHandler.spec.ts

@@ -27,7 +27,7 @@ import { ErrorOidcHandler } from "./ErrorOidcHandler";
 
 jest.mock("@inrupt/universal-fetch", () => {
   const fetchModule = jest.requireActual(
-    "@inrupt/universal-fetch"
+    "@inrupt/universal-fetch",
   ) as typeof UniversalFetch;
   return {
     ...fetchModule,
@@ -41,14 +41,14 @@ describe("ErrorOidcHandler", () => {
       const redirectHandler = new ErrorOidcHandler();
       expect(
         await redirectHandler.canHandle(
-          "https://coolparty.com/?code=someCode&state=oauth2_state_value"
-        )
+          "https://coolparty.com/?code=someCode&state=oauth2_state_value",
+        ),
       ).toBe(false);
       expect(await redirectHandler.canHandle("https://coolparty.com/")).toBe(
-        false
+        false,
       );
       expect(
-        await redirectHandler.canHandle("https://coolparty.com/?test=test")
+        await redirectHandler.canHandle("https://coolparty.com/?test=test"),
       ).toBe(false);
     });
 
@@ -56,17 +56,17 @@ describe("ErrorOidcHandler", () => {
       const redirectHandler = new ErrorOidcHandler();
       expect(
         await redirectHandler.canHandle(
-          "https://coolparty.com/?error=some_error"
-        )
+          "https://coolparty.com/?error=some_error",
+        ),
       ).toBe(true);
     });
 
     it("throws on invalid url", async () => {
       const redirectHandler = new ErrorOidcHandler();
       await expect(
-        redirectHandler.canHandle("beep boop I am a robot")
+        redirectHandler.canHandle("beep boop I am a robot"),
       ).rejects.toThrow(
-        "[beep boop I am a robot] is not a valid URL, and cannot be used as a redirect URL: TypeError: Invalid URL: beep boop I am a robot"
+        "[beep boop I am a robot] is not a valid URL, and cannot be used as a redirect URL: TypeError: Invalid URL: beep boop I am a robot",
       );
     });
   });
@@ -87,14 +87,14 @@ describe("ErrorOidcHandler", () => {
       const redirectHandler = new ErrorOidcHandler();
       const mySession = await redirectHandler.handle(
         "https://coolparty.com/?error=error&error_description=unable_to_fetch",
-        mockEmitter
+        mockEmitter,
       );
       expect(mySession.isLoggedIn).toBe(false);
       expect(mySession.webId).toBeUndefined();
       expect(mockEmit).toHaveBeenCalledWith(
         EVENTS.ERROR,
         "error",
-        "unable_to_fetch"
+        "unable_to_fetch",
       );
     });
 
@@ -107,7 +107,7 @@ describe("ErrorOidcHandler", () => {
       const redirectHandler = new ErrorOidcHandler();
       const mySession = await redirectHandler.handle(
         "https://coolparty.com/?error=error",
-        mockEmitter
+        mockEmitter,
       );
       expect(mySession.isLoggedIn).toBe(false);
       expect(mySession.webId).toBeUndefined();

package/src/login/oidc/incomingRedirectHandler/ErrorOidcHandler.ts

@@ -46,14 +46,14 @@ export class ErrorOidcHandler implements IIncomingRedirectHandler {
       return new URL(redirectUrl).searchParams.has("error");
     } catch (e) {
       throw new Error(
-        `[${redirectUrl}] is not a valid URL, and cannot be used as a redirect URL: ${e}`
+        `[${redirectUrl}] is not a valid URL, and cannot be used as a redirect URL: ${e}`,
       );
     }
   }
 
   async handle(
     redirectUrl: string,
-    eventEmitter?: EventEmitter
+    eventEmitter?: EventEmitter,
   ): Promise<ISessionInfo & { fetch: typeof fetch }> {
     if (eventEmitter !== undefined) {
       const url = new URL(redirectUrl);

package/src/login/oidc/incomingRedirectHandler/FallbackRedirectHandler.spec.ts

@@ -25,7 +25,7 @@ import { FallbackRedirectHandler } from "./FallbackRedirectHandler";
 
 jest.mock("@inrupt/universal-fetch", () => {
   const fetchModule = jest.requireActual(
-    "@inrupt/universal-fetch"
+    "@inrupt/universal-fetch",
   ) as typeof UniversalFetch;
   return {
     ...fetchModule,
@@ -39,23 +39,23 @@ describe("FallbackRedirectHandler", () => {
       const redirectHandler = new FallbackRedirectHandler();
       expect(
         await redirectHandler.canHandle(
-          "https://coolparty.com/?code=someCode&state=oauth2_state_value"
-        )
+          "https://coolparty.com/?code=someCode&state=oauth2_state_value",
+        ),
       ).toBe(true);
       expect(await redirectHandler.canHandle("https://coolparty.com/")).toBe(
-        true
+        true,
       );
       expect(
-        await redirectHandler.canHandle("https://coolparty.com/?test=test")
+        await redirectHandler.canHandle("https://coolparty.com/?test=test"),
       ).toBe(true);
     });
 
     it("throws on invalid url", async () => {
       const redirectHandler = new FallbackRedirectHandler();
       await expect(
-        redirectHandler.canHandle("beep boop I am a robot")
+        redirectHandler.canHandle("beep boop I am a robot"),
       ).rejects.toThrow(
-        "[beep boop I am a robot] is not a valid URL, and cannot be used as a redirect URL: TypeError: Invalid URL: beep boop I am a robot"
+        "[beep boop I am a robot] is not a valid URL, and cannot be used as a redirect URL: TypeError: Invalid URL: beep boop I am a robot",
       );
     });
   });

package/src/login/oidc/incomingRedirectHandler/FallbackRedirectHandler.ts

@@ -46,14 +46,14 @@ export class FallbackRedirectHandler implements IIncomingRedirectHandler {
       return true;
     } catch (e) {
       throw new Error(
-        `[${redirectUrl}] is not a valid URL, and cannot be used as a redirect URL: ${e}`
+        `[${redirectUrl}] is not a valid URL, and cannot be used as a redirect URL: ${e}`,
       );
     }
   }
 
   async handle(
     // The argument is ignored, but must be present to implement the interface
-    _redirectUrl: string
+    _redirectUrl: string,
   ): Promise<ISessionInfo & { fetch: typeof fetch }> {
     return getUnauthenticatedSession();
   }