Upgrade jose to v6

jest.config.ts

@@ -25,6 +25,7 @@ import {
   createJsWithTsPreset,
   type JestConfigWithTsJest,
 } from "ts-jest";
+import { join } from "node:path";
 
 // Jest 30 loads .ts config files as ESM via Node's native TypeScript support,
 // so `require` is not available. Use createRequire for require.resolve calls.
@@ -40,11 +41,20 @@ const baseConfig: ArrayElement<NonNullable<Config["projects"]>> = {
   ...defaultPreset,
   roots: ["<rootDir>"],
   testMatch: ["**/*.spec.ts"],
-  modulePathIgnorePatterns: ["dist/", "<rootDir>/examples/"],
+  modulePathIgnorePatterns: ["dist", join("<rootDir>", "examples")],
   coveragePathIgnorePatterns: [".*.spec.ts", "dist/"],
   clearMocks: true,
   injectGlobals: false,
-  setupFilesAfterEnv: ["<rootDir>/jest.setup.ts"],
+  setupFilesAfterEnv: [join("<rootDir>", "jest.setup.ts")],
+  transform: {
+    ...defaultPreset.transform,
+    // [\\\\/] expands to [\\/], which makes the regex Windows-compatible.
+    "node_modules[\\\\/]jose.+\\.js$": [
+      "ts-jest",
+      { tsconfig: { allowJs: true } },
+    ],
+  },
+  transformIgnorePatterns: ["node_modules[\\\\/](?!jose)"],
   moduleNameMapper: {
     "^jose": esmRequire.resolve("jose"),
   },

packages/browser/package.json

@@ -33,7 +33,7 @@
     "@inrupt/oidc-client-ext": "^4.0.0",
     "@inrupt/solid-client-authn-core": "^4.0.0",
     "events": "^3.3.0",
-    "jose": "^5.1.3",
+    "jose": "^6.2.3",
     "uuid": "^11.1.0"
   },
   "publishConfig": {

packages/browser/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(),

packages/browser/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(),

packages/core/package.json

@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "events": "^3.3.0",
-    "jose": "^5.1.3",
+    "jose": "^6.2.3",
     "uuid": "^11.1.0"
   },
   "publishConfig": {

packages/core/src/authenticatedFetch/dpopUtils.spec.ts

@@ -19,16 +19,16 @@
 //
 
 import { it, describe, expect } from "@jest/globals";
-import type { KeyLike } from "jose";
+import type { CryptoKey } from "jose";
 import { generateKeyPair, exportJWK, jwtVerify } from "jose";
 import { createDpopHeader, generateDpopKeyPair } from "./dpopUtils";
 
-let publicKey: KeyLike | undefined;
-let privateKey: KeyLike | undefined;
+let publicKey: CryptoKey | undefined;
+let privateKey: CryptoKey | undefined;
 
 const mockJwk = async (): Promise<{
-  publicKey: KeyLike;
-  privateKey: KeyLike;
+  publicKey: CryptoKey;
+  privateKey: CryptoKey;
 }> => {
   if (typeof publicKey === "undefined" || typeof privateKey === "undefined") {
     const generatedPair = await generateKeyPair("ES256");

packages/core/src/authenticatedFetch/dpopUtils.ts

@@ -18,7 +18,7 @@
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import type { JWK, KeyLike } from "jose";
+import type { JWK, CryptoKey } from "jose";
 import { SignJWT, generateKeyPair, exportJWK } from "jose";
 import { v4 } from "uuid";
 import { PREFERRED_SIGNING_ALG } from "../constant";
@@ -36,7 +36,7 @@ function normalizeHTU(audience: string): string {
 }
 
 export type KeyPair = {
-  privateKey: KeyLike;
+  privateKey: CryptoKey;
   publicKey: JWK;
 };
 

packages/core/src/authenticatedFetch/fetchFactory.spec.ts

@@ -22,7 +22,7 @@
 /* eslint-disable no-shadow */
 
 import { jest, it, describe, expect, afterEach } from "@jest/globals";
-import type { KeyLike } from "jose";
+import type { CryptoKey } from "jose";
 import { jwtVerify, generateKeyPair, exportJWK } from "jose";
 import { EventEmitter } from "events";
 import {
@@ -55,15 +55,17 @@ const mockNotRedirectedResponse = () => {
   return mockedResponse;
 };
 
-let publicKey: KeyLike | undefined;
-let privateKey: KeyLike | undefined;
+let publicKey: CryptoKey | undefined;
+let privateKey: CryptoKey | undefined;
 
 const mockJwk = async (): Promise<{
-  publicKey: KeyLike;
-  privateKey: KeyLike;
+  publicKey: CryptoKey;
+  privateKey: CryptoKey;
 }> => {
   if (typeof publicKey === "undefined" || typeof privateKey === "undefined") {
-    const generatedPair = await generateKeyPair("ES256");
+    const generatedPair = await generateKeyPair("ES256", {
+      extractable: true,
+    });
     publicKey = generatedPair.publicKey;
     privateKey = generatedPair.privateKey;
   }
@@ -159,7 +161,7 @@ describe("buildAuthenticatedFetch", () => {
     const headers = new Headers(mockedFetch.mock.calls[0][1]?.headers);
     const { payload } = await jwtVerify(
       headers.get("DPoP") as string,
-      (await mockKeyPair()).privateKey,
+      (await mockJwk()).publicKey,
     );
     expect(payload.htu).toBe("http://some.url/");
     expect(payload.htm).toBe("POST");
@@ -198,7 +200,7 @@ describe("buildAuthenticatedFetch", () => {
     const headers = new Headers(mockedFetch.mock.calls[1][1]?.headers);
     const { payload } = await jwtVerify(
       headers.get("DPoP") as string,
-      (await mockKeyPair()).privateKey,
+      (await mockJwk()).publicKey,
     );
     expect(payload.htu).toBe("https://my.pod/container/");
   });

packages/core/src/storage/StorageUtility.spec.ts

@@ -18,7 +18,7 @@
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import type { KeyLike } from "jose";
+import type { CryptoKey } from "jose";
 import { exportJWK, generateKeyPair } from "jose";
 import { jest, describe, it, expect } from "@jest/globals";
 import { mockIssuerConfig } from "../login/oidc/__mocks__/IssuerConfig";
@@ -531,15 +531,17 @@ describe("saveSessionInfoToStorage", () => {
     ).resolves.toBe("true");
   });
 
-  let publicKey: KeyLike | undefined;
-  let privateKey: KeyLike | undefined;
+  let publicKey: CryptoKey | undefined;
+  let privateKey: CryptoKey | undefined;
 
   const mockJwk = async (): Promise<{
-    publicKey: KeyLike;
-    privateKey: KeyLike;
+    publicKey: CryptoKey;
+    privateKey: CryptoKey;
   }> => {
     if (typeof publicKey === "undefined" || typeof privateKey === "undefined") {
-      const generatedPair = await generateKeyPair("ES256");
+      const generatedPair = await generateKeyPair("ES256", {
+        extractable: true,
+      });
       publicKey = generatedPair.publicKey;
       privateKey = generatedPair.privateKey;
     }