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

package/src/login/oidc/ClientRegistrar.spec.ts

@@ -36,7 +36,7 @@ describe("ClientRegistrar", () => {
     storage: StorageUtilityMock,
   };
   function getClientRegistrar(
-    mocks: Partial<typeof defaultMocks> = defaultMocks
+    mocks: Partial<typeof defaultMocks> = defaultMocks,
   ): ClientRegistrar {
     return new ClientRegistrar(mocks.storage ?? defaultMocks.storage);
   }
@@ -53,8 +53,8 @@ describe("ClientRegistrar", () => {
             client_secret: "1234",
             redirect_uris: ["https://example.com"],
             id_token_signed_response_alg: "RS256",
-          })
-        ) as unknown as Response
+          }),
+        ) as unknown as Response,
         /* eslint-enable camelcase */
       );
       global.fetch = mockFetch;
@@ -71,8 +71,8 @@ describe("ClientRegistrar", () => {
           {
             ...IssuerConfigFetcherFetchConfigResponse,
             registrationEndpoint: registrationUrl,
-          }
-        )
+          },
+        ),
       ).toMatchObject({
         clientId: "abcd",
         clientSecret: "1234",
@@ -102,8 +102,8 @@ describe("ClientRegistrar", () => {
           JSON.stringify({
             client_id: "abcd",
             redirect_uris: ["https://example.com"],
-          })
-        ) as unknown as Response
+          }),
+        ) as unknown as Response,
         /* eslint-enable camelcase */
       );
       global.fetch = mockFetch;
@@ -119,7 +119,7 @@ describe("ClientRegistrar", () => {
         {
           ...IssuerConfigFetcherFetchConfigResponse,
           registrationEndpoint: registrationUrl,
-        }
+        },
       );
       expect(registeredClient.clientSecret).toBeUndefined();
     });
@@ -134,10 +134,10 @@ describe("ClientRegistrar", () => {
             sessionId: "mySession",
             redirectUrl: "https://example.com",
           },
-          IssuerConfigFetcherFetchConfigResponse
-        )
+          IssuerConfigFetcherFetchConfigResponse,
+        ),
       ).rejects.toThrow(
-        "Dynamic Registration could not be completed because the issuer has no registration endpoint."
+        "Dynamic Registration could not be completed because the issuer has no registration endpoint.",
       );
     });
 
@@ -146,7 +146,7 @@ describe("ClientRegistrar", () => {
         /* eslint-disable camelcase */
         new NodeResponse('{"error":"bad stuff that\'s an error"}', {
           status: 400,
-        }) as unknown as Response
+        }) as unknown as Response,
         /* eslint-enable camelcase */
       );
       global.fetch = mockFetch;
@@ -163,10 +163,10 @@ describe("ClientRegistrar", () => {
           {
             ...IssuerConfigFetcherFetchConfigResponse,
             registrationEndpoint: registrationUrl,
-          }
-        )
+          },
+        ),
       ).rejects.toThrow(
-        "Client registration failed: [Error: Dynamic client registration failed: bad stuff that's an error - ]"
+        "Client registration failed: [Error: Dynamic client registration failed: bad stuff that's an error - ]",
       );
     });
 
@@ -179,7 +179,7 @@ describe("ClientRegistrar", () => {
               clientSecret: "a secret",
             },
           },
-          false
+          false,
         ),
       });
       const client = await clientRegistrar.getClient(
@@ -189,7 +189,7 @@ describe("ClientRegistrar", () => {
         },
         {
           ...IssuerConfigFetcherFetchConfigResponse,
-        }
+        },
       );
       expect(client.clientId).toBe("an id");
       expect(client.clientSecret).toBe("a secret");
@@ -203,8 +203,8 @@ describe("ClientRegistrar", () => {
             client_id: "some id",
             client_secret: "some secret",
             redirect_uris: ["https://example.com"],
-          })
-        ) as unknown as Response
+          }),
+        ) as unknown as Response,
         /* eslint-enable camelcase */
       );
       global.fetch = mockFetch;
@@ -222,14 +222,14 @@ describe("ClientRegistrar", () => {
         {
           ...IssuerConfigFetcherFetchConfigResponse,
           registrationEndpoint: registrationUrl,
-        }
+        },
       );
 
       await expect(
-        myStorage.getForUser("mySession", "clientId", { secure: false })
+        myStorage.getForUser("mySession", "clientId", { secure: false }),
       ).resolves.toBe("some id");
       await expect(
-        myStorage.getForUser("mySession", "clientSecret", { secure: false })
+        myStorage.getForUser("mySession", "clientSecret", { secure: false }),
       ).resolves.toBe("some secret");
     });
   });

package/src/login/oidc/ClientRegistrar.ts

@@ -37,11 +37,13 @@ import { registerClient } from "@inrupt/oidc-client-ext";
  * @hidden
  */
 export default class ClientRegistrar implements IClientRegistrar {
-  constructor(private storageUtility: IStorageUtility) {}
+  constructor(private storageUtility: IStorageUtility) {
+    this.storageUtility = storageUtility;
+  }
 
   async getClient(
     options: IClientRegistrarOptions,
-    issuerConfig: IIssuerConfig
+    issuerConfig: IIssuerConfig,
   ): Promise<IClient> {
     // If client secret and/or client id are stored in storage, use those.
     const [

package/src/login/oidc/IssuerConfigFetcher.spec.ts

@@ -27,7 +27,7 @@ import IssuerConfigFetcher from "./IssuerConfigFetcher";
 
 jest.mock("@inrupt/universal-fetch", () => {
   const fetchModule = jest.requireActual(
-    "@inrupt/universal-fetch"
+    "@inrupt/universal-fetch",
   ) as typeof UniversalFetch;
   return {
     ...fetchModule,
@@ -44,10 +44,10 @@ describe("IssuerConfigFetcher", () => {
   };
 
   function getIssuerConfigFetcher(
-    mocks: Partial<typeof defaultMocks> = defaultMocks
+    mocks: Partial<typeof defaultMocks> = defaultMocks,
   ): IssuerConfigFetcher {
     return new IssuerConfigFetcher(
-      mocks.storageUtility ?? defaultMocks.storageUtility
+      mocks.storageUtility ?? defaultMocks.storageUtility,
     );
   }
 
@@ -56,7 +56,7 @@ describe("IssuerConfigFetcher", () => {
       storageUtility: mockStorageUtility({}),
     });
     const { fetch: mockFetch } = jest.requireMock(
-      "@inrupt/universal-fetch"
+      "@inrupt/universal-fetch",
     ) as jest.Mocked<typeof UniversalFetch>;
     mockFetch.mockResolvedValueOnce(
       new NodeResponse(
@@ -66,37 +66,37 @@ describe("IssuerConfigFetcher", () => {
           claim_types_supported: "oidc",
           bleepBloop: "Meep Moop",
           end_session_endpoint: "https://example.com/endSessionEndpoint",
-        })
-      )
+        }),
+      ),
     );
     const fetchedConfig = await configFetcher.fetchConfig(
-      "https://arbitrary.url"
+      "https://arbitrary.url",
     );
     expect(fetchedConfig.issuer.startsWith("https:")).toBeTruthy();
     expect(fetchedConfig.issuer).toBe("https://example.com");
     expect((fetchedConfig as any).claim_types_supported).toBeUndefined();
     expect(fetchedConfig.claimTypesSupported).toBe("oidc");
     expect(fetchedConfig.endSessionEndpoint).toBe(
-      "https://example.com/endSessionEndpoint"
+      "https://example.com/endSessionEndpoint",
     );
     expect((fetchedConfig as any).bleepBloop).toBeUndefined();
   });
 
   it("should throw an error if the fetched config could not be converted to JSON", async () => {
     const { fetch: mockFetch } = jest.requireMock(
-      "@inrupt/universal-fetch"
+      "@inrupt/universal-fetch",
     ) as jest.Mocked<typeof UniversalFetch>;
     mockFetch.mockResolvedValueOnce(new NodeResponse("Not JSON."));
     const configFetcher = new IssuerConfigFetcher(mockStorageUtility({}));
 
     await expect(configFetcher.fetchConfig("https://some.url")).rejects.toThrow(
-      "[https://some.url] has an invalid configuration:"
+      "[https://some.url] has an invalid configuration:",
     );
   });
 
   it("should return a config including the support for solid-oidc if present in the discovery profile", async () => {
     const { fetch: mockFetch } = jest.requireMock(
-      "@inrupt/universal-fetch"
+      "@inrupt/universal-fetch",
     ) as jest.Mocked<typeof UniversalFetch>;
     mockFetch.mockResolvedValueOnce(
       new NodeResponse(
@@ -105,14 +105,14 @@ describe("IssuerConfigFetcher", () => {
           // eslint-disable-next-line camelcase
           claim_types_supported: "oidc",
           scopes_supported: ["openid", "offline_access", "webid"],
-        })
-      )
+        }),
+      ),
     );
     const configFetcher = getIssuerConfigFetcher({
       storageUtility: mockStorageUtility({}),
     });
     const fetchedConfig = await configFetcher.fetchConfig(
-      "https://arbitrary.url"
+      "https://arbitrary.url",
     );
     expect(fetchedConfig.scopesSupported).toContain("webid");
     expect(fetchedConfig.scopesSupported).toContain("openid");
@@ -121,7 +121,7 @@ describe("IssuerConfigFetcher", () => {
 
   it("should return a default value for the supported scopes if not advertized by the OpenID provider", async () => {
     const { fetch: mockFetch } = jest.requireMock(
-      "@inrupt/universal-fetch"
+      "@inrupt/universal-fetch",
     ) as jest.Mocked<typeof UniversalFetch>;
     mockFetch.mockResolvedValueOnce(
       new NodeResponse(
@@ -129,14 +129,14 @@ describe("IssuerConfigFetcher", () => {
           issuer: "https://example.com",
           // eslint-disable-next-line camelcase
           claim_types_supported: "oidc",
-        })
-      )
+        }),
+      ),
     );
     const configFetcher = getIssuerConfigFetcher({
       storageUtility: mockStorageUtility({}),
     });
     const fetchedConfig = await configFetcher.fetchConfig(
-      "https://arbitrary.url"
+      "https://arbitrary.url",
     );
     expect(fetchedConfig.scopesSupported).toContain("openid");
   });
@@ -144,7 +144,7 @@ describe("IssuerConfigFetcher", () => {
   it("should append the .well-known/openid-configuration path at the end of the issuer URL", async () => {
     // The response value is irrelevant to this test.
     const { fetch: mockFetch } = jest.requireMock(
-      "@inrupt/universal-fetch"
+      "@inrupt/universal-fetch",
     ) as jest.Mocked<typeof UniversalFetch>;
     mockFetch.mockImplementation(
       async () =>
@@ -154,8 +154,8 @@ describe("IssuerConfigFetcher", () => {
             // eslint-disable-next-line camelcase
             claim_types_supported: "oidc",
             scopes_supported: ["openid", "offline_access", "webid"],
-          })
-        )
+          }),
+        ),
     );
     const configFetcher = getIssuerConfigFetcher({
       storageUtility: mockStorageUtility({}),
@@ -163,22 +163,22 @@ describe("IssuerConfigFetcher", () => {
     // No trailing slash
     await configFetcher.fetchConfig("https://arbitrary.url");
     expect(mockFetch).toHaveBeenLastCalledWith(
-      "https://arbitrary.url/.well-known/openid-configuration"
+      "https://arbitrary.url/.well-known/openid-configuration",
     );
     // A trailing slash
     await configFetcher.fetchConfig("https://arbitrary.url/");
     expect(mockFetch).toHaveBeenLastCalledWith(
-      "https://arbitrary.url/.well-known/openid-configuration"
+      "https://arbitrary.url/.well-known/openid-configuration",
     );
     // A path without a trailing slash
     await configFetcher.fetchConfig("https://arbitrary.url/path");
     expect(mockFetch).toHaveBeenLastCalledWith(
-      "https://arbitrary.url/path/.well-known/openid-configuration"
+      "https://arbitrary.url/path/.well-known/openid-configuration",
     );
     // A path with a trailing slash
     await configFetcher.fetchConfig("https://arbitrary.url/path/");
     expect(mockFetch).toHaveBeenLastCalledWith(
-      "https://arbitrary.url/path/.well-known/openid-configuration"
+      "https://arbitrary.url/path/.well-known/openid-configuration",
     );
   });
 });

package/src/login/oidc/IssuerConfigFetcher.ts

@@ -33,7 +33,7 @@ import type {
   IStorageUtility,
 } from "@inrupt/solid-client-authn-core";
 import { ConfigurationError } from "@inrupt/solid-client-authn-core";
-import { fetch } from "@inrupt/universal-fetch";
+import { fetch as uniFetch } from "@inrupt/universal-fetch";
 
 export const WELL_KNOWN_OPENID_CONFIG = ".well-known/openid-configuration";
 
@@ -131,7 +131,7 @@ const issuerConfigKeyMap: Record<
 /* eslint-enable camelcase */
 
 function processConfig(
-  config: Record<string, string | string[]>
+  config: Record<string, string | string[]>,
 ): IIssuerConfig {
   const parsedConfig: Record<string, string | string[]> = {};
   Object.keys(config).forEach((key) => {
@@ -153,7 +153,9 @@ function processConfig(
  * @hidden
  */
 export default class IssuerConfigFetcher implements IIssuerConfigFetcher {
-  constructor(private storageUtility: IStorageUtility) {}
+  constructor(private storageUtility: IStorageUtility) {
+    this.storageUtility = storageUtility;
+  }
 
   // This method needs no state (so can be static), and can be exposed to allow
   // callers to know where this implementation puts state it needs.
@@ -168,9 +170,12 @@ export default class IssuerConfigFetcher implements IIssuerConfigFetcher {
       WELL_KNOWN_OPENID_CONFIG,
       // Make sure to append a slash at issuer URL, so that the .well-known URL
       // includes the full issuer path. See https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderConfig.
-      issuer.endsWith("/") ? issuer : `${issuer}/`
+      issuer.endsWith("/") ? issuer : `${issuer}/`,
     ).href;
-    const issuerConfigRequestBody = await fetch(openIdConfigUrl);
+    const issuerConfigRequestBody = await uniFetch.call(
+      globalThis,
+      openIdConfigUrl,
+    );
     // Check the validity of the fetched config
     try {
       issuerConfig = processConfig(await issuerConfigRequestBody.json());
@@ -178,14 +183,14 @@ export default class IssuerConfigFetcher implements IIssuerConfigFetcher {
       throw new ConfigurationError(
         `[${issuer.toString()}] has an invalid configuration: ${
           (err as { message: string }).message
-        }`
+        }`,
       );
     }
 
     // Update store with fetched config
     await this.storageUtility.set(
       IssuerConfigFetcher.getLocalStorageKey(issuer),
-      JSON.stringify(issuerConfig)
+      JSON.stringify(issuerConfig),
     );
 
     return issuerConfig;

package/src/login/oidc/OidcLoginHandler.spec.ts

@@ -47,13 +47,13 @@ describe("OidcLoginHandler", () => {
     clientRegistrar: mockDefaultClientRegistrar(),
   };
   function getInitialisedHandler(
-    mocks: Partial<typeof defaultMocks> = defaultMocks
+    mocks: Partial<typeof defaultMocks> = defaultMocks,
   ): OidcLoginHandler {
     return new OidcLoginHandler(
       mocks.storageUtility ?? defaultMocks.storageUtility,
       mocks.oidcHandler ?? defaultMocks.oidcHandler,
       mocks.issuerConfigFetcher ?? defaultMocks.issuerConfigFetcher,
-      mocks.clientRegistrar ?? defaultMocks.clientRegistrar
+      mocks.clientRegistrar ?? defaultMocks.clientRegistrar,
     );
   }
 
@@ -81,7 +81,7 @@ describe("OidcLoginHandler", () => {
           // This checks it gets passed through from storage to the handler.
           clientId: "some client ID",
         },
-      })
+      }),
     );
     const handler = getInitialisedHandler({
       oidcHandler: actualHandler,
@@ -111,7 +111,7 @@ describe("OidcLoginHandler", () => {
 
     const mockedEmptyStorage = new StorageUtility(
       mockStorage({}),
-      mockStorage({})
+      mockStorage({}),
     );
 
     const actualHandler = defaultMocks.oidcHandler;
@@ -140,7 +140,7 @@ describe("OidcLoginHandler", () => {
 
     const mockedEmptyStorage = new StorageUtility(
       mockStorage({}),
-      mockStorage({})
+      mockStorage({}),
     );
 
     const actualHandler = defaultMocks.oidcHandler;
@@ -183,7 +183,7 @@ describe("OidcLoginHandler", () => {
 
     const storedClientId = await actualStorage.getForUser(
       "mySession",
-      "clientId"
+      "clientId",
     );
     expect(storedClientId).toEqual(inputClientId);
   });
@@ -215,7 +215,7 @@ describe("OidcLoginHandler", () => {
 
     const storedClientId = await mockedStorage.getForUser(
       "mySession",
-      "clientId"
+      "clientId",
     );
     expect(storedClientId).toBe("https://my.app/registration#app");
   });
@@ -241,15 +241,15 @@ describe("OidcLoginHandler", () => {
     });
 
     expect(await actualStorage.getForUser("mySession", "clientId")).toEqual(
-      inputClientId
+      inputClientId,
     );
 
     expect(await actualStorage.getForUser("mySession", "clientSecret")).toEqual(
-      inputClientSecret
+      inputClientSecret,
     );
 
     expect(await actualStorage.getForUser("mySession", "clientName")).toEqual(
-      inputClientName
+      inputClientName,
     );
   });
 
@@ -259,7 +259,7 @@ describe("OidcLoginHandler", () => {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     await expect(handler.handle({})).rejects.toThrow(
-      "OidcLoginHandler requires an OIDC issuer"
+      "OidcLoginHandler requires an OIDC issuer",
     );
   });
 
@@ -270,7 +270,7 @@ describe("OidcLoginHandler", () => {
         sessionId: "doesn't matter",
         tokenType: "DPoP",
         oidcIssuer: "https://whatever.com",
-      })
+      }),
     ).rejects.toThrow("OidcLoginHandler requires a redirect URL");
   });
 
@@ -284,7 +284,7 @@ describe("OidcLoginHandler", () => {
         redirectUrl: "https://app.com/redirect",
         clientId: "coolApp",
         tokenType: "DPoP",
-      })
+      }),
     ).resolves.toBe(true);
   });
 
@@ -299,7 +299,7 @@ describe("OidcLoginHandler", () => {
     issuerConfig.issuer = "https://some.issuer/";
     const handler = getInitialisedHandler({
       issuerConfigFetcher: mockIssuerConfigFetcher(
-        issuerConfig
+        issuerConfig,
       ) as jest.Mocked<IIssuerConfigFetcher>,
       oidcHandler: actualHandler,
     });
@@ -314,7 +314,7 @@ describe("OidcLoginHandler", () => {
     expect(actualHandler.handle).toHaveBeenCalledWith(
       expect.objectContaining({
         issuer: "https://some.issuer/",
-      })
+      }),
     );
   });
 });

package/src/login/oidc/OidcLoginHandler.ts

@@ -45,13 +45,13 @@ import {
 } from "@inrupt/solid-client-authn-core";
 
 function hasIssuer(
-  options: ILoginOptions
+  options: ILoginOptions,
 ): options is ILoginOptions & { oidcIssuer: string } {
   return typeof options.oidcIssuer === "string";
 }
 
 function hasRedirectUrl(
-  options: ILoginOptions
+  options: ILoginOptions,
 ): options is ILoginOptions & { redirectUrl: string } {
   return typeof options.redirectUrl === "string";
 }
@@ -64,8 +64,13 @@ export default class OidcLoginHandler implements ILoginHandler {
     private storageUtility: IStorageUtility,
     private oidcHandler: IOidcHandler,
     private issuerConfigFetcher: IIssuerConfigFetcher,
-    private clientRegistrar: IClientRegistrar
-  ) {}
+    private clientRegistrar: IClientRegistrar,
+  ) {
+    this.storageUtility = storageUtility;
+    this.oidcHandler = oidcHandler;
+    this.issuerConfigFetcher = issuerConfigFetcher;
+    this.clientRegistrar = clientRegistrar;
+  }
 
   async canHandle(options: ILoginOptions): Promise<boolean> {
     return hasIssuer(options) && hasRedirectUrl(options);
@@ -75,15 +80,15 @@ export default class OidcLoginHandler implements ILoginHandler {
     if (!hasIssuer(options)) {
       throw new ConfigurationError(
         `OidcLoginHandler requires an OIDC issuer: missing property 'oidcIssuer' in ${JSON.stringify(
-          options
-        )}`
+          options,
+        )}`,
       );
     }
     if (!hasRedirectUrl(options)) {
       throw new ConfigurationError(
         `OidcLoginHandler requires a redirect URL: missing property 'redirectUrl' in ${JSON.stringify(
-          options
-        )}`
+          options,
+        )}`,
       );
     }
 
@@ -95,7 +100,7 @@ export default class OidcLoginHandler implements ILoginHandler {
       options,
       issuerConfig,
       this.storageUtility,
-      this.clientRegistrar
+      this.clientRegistrar,
     );
 
     // Construct OIDC Options

package/src/login/oidc/Redirector.spec.ts

@@ -75,7 +75,7 @@ describe("Redirector", () => {
       expect(window.history.replaceState).toHaveBeenCalledWith(
         {},
         "",
-        "https://someUrl.com/redirect"
+        "https://someUrl.com/redirect",
       );
       expect(window.location.href).toBe("https://coolSite.com");
     });

package/src/login/oidc/__mocks__/ClientRegistrar.ts

@@ -41,7 +41,7 @@ export const PublicClientRegistrarResponse: IClient = {
 export const ClientRegistrarMock: jest.Mocked<IClientRegistrar> = {
   getClient: jest.fn(
     (_options: IClientRegistrarOptions, _issuerConfig: IIssuerConfig) =>
-      Promise.resolve(ClientRegistrarResponse)
+      Promise.resolve(ClientRegistrarResponse),
   ),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } as any;
@@ -49,7 +49,7 @@ export const ClientRegistrarMock: jest.Mocked<IClientRegistrar> = {
 export const PublicClientRegistrarMock: jest.Mocked<IClientRegistrar> = {
   getClient: jest.fn(
     (_options: IClientRegistrarOptions, _issuerConfig: IIssuerConfig) =>
-      Promise.resolve(PublicClientRegistrarResponse)
+      Promise.resolve(PublicClientRegistrarResponse),
   ),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } as any;
@@ -58,7 +58,7 @@ export const mockDefaultClientRegistrar = (): IClientRegistrar => {
   return {
     getClient: jest.fn(
       (_options: IClientRegistrarOptions, _issuerConfig: IIssuerConfig) =>
-        Promise.resolve(ClientRegistrarResponse)
+        Promise.resolve(ClientRegistrarResponse),
     ),
   };
 };

package/src/login/oidc/__mocks__/IssuerConfigFetcher.ts

@@ -40,7 +40,7 @@ export const IssuerConfigFetcherFetchConfigResponse: IIssuerConfig = {
 export const IssuerConfigFetcherMock: jest.Mocked<IIssuerConfigFetcher> = {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   fetchConfig: jest.fn((_issuer: string) =>
-    Promise.resolve(IssuerConfigFetcherFetchConfigResponse)
+    Promise.resolve(IssuerConfigFetcherFetchConfigResponse),
   ),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } as any;
@@ -49,14 +49,14 @@ export const mockDefaultIssuerConfigFetcher = (): IIssuerConfigFetcher => {
   return {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     fetchConfig: (jest.fn() as any).mockResolvedValue(
-      IssuerConfigFetcherFetchConfigResponse
+      IssuerConfigFetcherFetchConfigResponse,
     ),
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any;
 };
 
 export const mockIssuerConfigFetcher = (
-  config: IIssuerConfig
+  config: IIssuerConfig,
 ): IIssuerConfigFetcher => {
   return {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any