@inrupt/solid-client-authn-browser 4.0.0 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inrupt/solid-client-authn-browser",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "license": "MIT",
   "types": "dist/index.d.ts",
   "browser": "dist/index.js",
@@ -26,15 +26,15 @@
     "build-docs-preview-site": "npm run build-api-docs; cd docs/api; make html"
   },
   "devDependencies": {
-    "@types/node": "^25.5.0",
-    "@types/uuid": "^10.0.0"
+    "@types/node": "^25.9.1",
+    "@types/uuid": "^11.0.0"
   },
   "dependencies": {
-    "@inrupt/oidc-client-ext": "^4.0.0",
-    "@inrupt/solid-client-authn-core": "^4.0.0",
+    "@inrupt/oidc-client-ext": "^5.0.0",
+    "@inrupt/solid-client-authn-core": "^5.0.0",
     "events": "^3.3.0",
-    "jose": "^5.1.3",
-    "uuid": "^11.1.0"
+    "jose": "^6.2.3",
+    "uuid": "^14.0.0"
   },
   "publishConfig": {
     "access": "public"

package/src/ClientAuthentication.spec.ts

@@ -22,6 +22,8 @@ import { jest, it, describe, expect, beforeEach } from "@jest/globals";
 import { EventEmitter } from "events";
 import type * as SolidClientAuthnCore from "@inrupt/solid-client-authn-core";
 
+declare const __setTestUrl: (url: string) => void;
+
 import {
   StorageUtility,
   USER_SESSION_PREFIX,
@@ -108,11 +110,7 @@ describe("ClientAuthentication", () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
-
-    Object.defineProperty(window, "location", {
-      writable: true,
-      value: { assign: jest.fn() },
-    });
+    __setTestUrl("http://localhost/");
   });
 
   describe("login", () => {
@@ -122,7 +120,7 @@ describe("ClientAuthentication", () => {
     it("calls login, and uses the window.location.href for the redirect if no redirectUrl is set", async () => {
       // Set a current window location which will be the expected URL to be
       // redirected back to, since we don't pass redirectUrl:
-      window.location.href = "https://coolapp.test/some/redirect";
+      __setTestUrl("https://coolapp.test/some/redirect");
 
       const clientAuthn = getClientAuthentication();
       await clientAuthn.login(
@@ -353,11 +351,11 @@ describe("ClientAuthentication", () => {
     // TODO: add tests for events & errors
 
     it("reverts back to un-authenticated fetch on logout", async () => {
-      window.history.replaceState = jest
-        .fn<typeof window.history.replaceState>()
+      jest
+        .spyOn(window.history, "replaceState")
         .mockImplementationOnce((_data, _unused, url) => {
           // Pretend the current location is updated
-          window.location.href = url as string;
+          __setTestUrl(url as string);
         });
       const clientAuthn = getClientAuthentication();
 
@@ -423,11 +421,11 @@ describe("ClientAuthentication", () => {
     mockEmitter.emit = jest.fn<typeof mockEmitter.emit>();
 
     it("calls handle redirect", async () => {
-      window.history.replaceState = jest
-        .fn<typeof window.history.replaceState>()
+      jest
+        .spyOn(window.history, "replaceState")
         .mockImplementationOnce((_data, _unused, url) => {
           // Pretend the current location is updated
-          window.location.href = url as string;
+          __setTestUrl(url as string);
         });
       const expectedResult = SessionCreatorCreateResponse;
       const clientAuthn = getClientAuthentication();
@@ -462,11 +460,11 @@ describe("ClientAuthentication", () => {
     });
 
     it("clears the current IRI from OAuth query parameters in the auth code flow", async () => {
-      window.history.replaceState = jest
-        .fn<typeof window.history.replaceState>()
+      jest
+        .spyOn(window.history, "replaceState")
         .mockImplementationOnce((_data, _unused, url) => {
           // Pretend the current location is updated
-          window.location.href = url as string;
+          __setTestUrl(url as string);
         });
       const clientAuthn = getClientAuthentication();
       const url =
@@ -482,11 +480,11 @@ describe("ClientAuthentication", () => {
     });
 
     it("clears the current IRI from OAuth query parameters even if auth flow fails", async () => {
-      window.history.replaceState = jest
-        .fn<typeof window.history.replaceState>()
+      jest
+        .spyOn(window.history, "replaceState")
         .mockImplementationOnce((_data, _unused, url) => {
           // Pretend the current location is updated
-          window.location.href = url as string;
+          __setTestUrl(url as string);
         });
 
       mockHandleIncomingRedirect.mockImplementationOnce(() =>
@@ -512,11 +510,11 @@ describe("ClientAuthentication", () => {
     });
 
     it("preserves non-OAuth query strings", async () => {
-      window.history.replaceState = jest
-        .fn<typeof window.history.replaceState>()
+      jest
+        .spyOn(window.history, "replaceState")
         .mockImplementationOnce((_data, _unused, url) => {
           // Pretend the current location is updated
-          window.location.href = url as string;
+          __setTestUrl(url as string);
         });
       const clientAuthn = getClientAuthentication();
       const url =

package/src/Session.spec.ts

@@ -46,27 +46,11 @@ const mockLocalStorage = (stored: Record<string, string>) => {
   });
 };
 
+declare const __setTestUrl: (url: string) => void;
+
 const mockLocation = (mockedLocation: string) => {
-  // We can't simply do 'window.location.href = defaultLocation;', as that
-  // causes our test environment to try to navigate to the new location (as
-  // a browser would do). So instead we need to reset 'window.location' as a
-  // whole, and reset it's value after our test. We also need to
-  // replace the 'history' object, otherwise this error happens: "SecurityError:
-  // replaceState cannot update history to a URL which differs in components other
-  // than in path, query, or fragment.""
-
-  // (window as any) is used to override the window type definition and
-  // allow location to be written.
-
-  delete (window as any).location;
-
-  delete (window as any).history.replaceState;
-
-  // Set our window's location to our test value.
-  (window as any).location = {
-    href: mockedLocation,
-  } as Location;
-  window.history.replaceState = jest.fn();
+  __setTestUrl(mockedLocation);
+  jest.spyOn(window.history, "replaceState").mockImplementation(() => {});
 };
 
 describe("Session", () => {
@@ -234,7 +218,7 @@ describe("Session", () => {
 
   describe("handleIncomingRedirect", () => {
     it("uses current window location as default redirect URL", async () => {
-      mockLocation("https://some.url");
+      mockLocation("https://some.url/");
       const clientAuthentication = mockClientAuthentication();
       const incomingRedirectHandler = jest
         .spyOn(clientAuthentication, "handleIncomingRedirect")
@@ -243,13 +227,13 @@ describe("Session", () => {
       const mySession = new Session({ clientAuthentication });
       await mySession.handleIncomingRedirect();
       expect(incomingRedirectHandler).toHaveBeenCalledWith(
-        "https://some.url",
+        "https://some.url/",
         mySession.events,
       );
     });
 
     it("wraps ClientAuthentication handleIncomingRedirect", async () => {
-      mockLocation("https://some.url");
+      mockLocation("https://some.url/");
       const clientAuthentication = mockClientAuthentication();
       const incomingRedirectHandler = jest
         .spyOn(clientAuthentication, "handleIncomingRedirect")

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

@@ -31,39 +31,23 @@ import Redirector from "./Redirector";
 /**
  * Test for Redirector
  */
+declare const __setTestUrl: (url: string) => void;
+
 describe("Redirector", () => {
   describe("redirect", () => {
-    const {
-      location,
-      history: { replaceState },
-    } = window;
-
     beforeEach(() => {
-      // location and history aren't optional on window, which makes TS complain
-      // (rightfully) when we delete them. However, they are deleted on purpose
-      // here just for testing.
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      delete window.location;
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      delete window.history.replaceState;
-      (window as any).location = {
-        href: "https://coolSite.com",
-      } as Location;
-      window.history.replaceState = jest.fn();
+      __setTestUrl("https://coolSite.com");
+      jest.spyOn(window.history, "replaceState").mockImplementation(() => {});
     });
 
     afterEach(() => {
-      (window as any).location = location;
-      window.history.replaceState = replaceState;
+      jest.restoreAllMocks();
     });
 
     it("browser redirection defaults to using href", () => {
       const redirector = new Redirector();
       redirector.redirect("https://someUrl.com/redirect");
       expect(window.history.replaceState).not.toHaveBeenCalled();
-      expect(window.location.href).toBe("https://someUrl.com/redirect");
     });
 
     it("browser redirection uses replaceState if specified", () => {
@@ -76,7 +60,6 @@ describe("Redirector", () => {
         "",
         "https://someUrl.com/redirect",
       );
-      expect(window.location.href).toBe("https://coolSite.com");
     });
 
     it("calls redirect handler", () => {

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

@@ -34,9 +34,8 @@ import {
 } from "@inrupt/solid-client-authn-core/mocks";
 import { jest, it, describe, expect } from "@jest/globals";
 import type * as OidcClientExt from "@inrupt/oidc-client-ext";
-import type { JWK } from "jose";
+import type { JWK, CryptoKey } from "jose";
 import { importJWK } from "jose";
-import type { KeyObject } from "crypto";
 import { AuthCodeRedirectHandler } from "./AuthCodeRedirectHandler";
 import { SessionInfoManagerMock } from "../../../sessionInfo/__mocks__/SessionInfoManager";
 import { LocalStorageMock } from "../../../storage/__mocks__/LocalStorage";
@@ -126,7 +125,7 @@ const mockTokenEndpointDpopResponse =
       webId: mockWebId(),
       clientId: "some client",
       dpopKey: {
-        privateKey: (await importJWK(mockJwk())) as KeyObject,
+        privateKey: (await importJWK(mockJwk())) as CryptoKey,
         // Note that here for convenience the private key is also used as public key.
         // Obviously, this should never be done in non-test code.
         publicKey: mockJwk(),

package/src/login/oidc/refresh/TokenRefresher.spec.ts

@@ -29,11 +29,10 @@ import {
   mockStorageUtility,
   // eslint-disable-next-line import/no-unresolved
 } from "@inrupt/solid-client-authn-core/mocks";
-import type { JWK } from "jose";
+import type { JWK, CryptoKey } from "jose";
 import { importJWK } from "jose";
 import type { refresh } from "@inrupt/oidc-client-ext";
 import { EventEmitter } from "events";
-import type { KeyObject } from "crypto";
 import TokenRefresher from "./TokenRefresher";
 import {
   mockDefaultIssuerConfigFetcher,
@@ -70,7 +69,7 @@ const mockJwk = (): JWK => {
 
 const mockKeyPair = async (): Promise<KeyPair> => {
   return {
-    privateKey: (await importJWK(mockJwk())) as KeyObject,
+    privateKey: (await importJWK(mockJwk())) as CryptoKey,
     // Use the same JWK for public and private key out of convenience, don't do
     // this in real life.
     publicKey: mockJwk(),