Adjust node mocks

packages/browser/src/login/oidc/__mocks__/ClientRegistrar.ts

@@ -31,7 +31,7 @@ export const ClientRegistrarResponse: IClient = {
   clientId: "abcde",
   clientSecret: "12345",
   clientType: "dynamic",
-  // This date is set 3000 years from now, so it expiring unexpectedly should not be a problem for us.
+  // 5000-01-07
   expiresAt: 95618140501,
 };
 

packages/node/src/login/oidc/ClientRegistrar.ts

@@ -30,6 +30,7 @@ import type {
   IIssuerConfig,
   IClient,
   IClientRegistrarOptions,
+  IOpenIdDynamicClient,
 } from "@inrupt/solid-client-authn-core";
 import {
   ConfigurationError,
@@ -142,28 +143,33 @@ export default class ClientRegistrar implements IClientRegistrar {
       grant_types: ["authorization_code", "refresh_token"],
     });
 
-    const persistedClientMetadata: Record<string, string> = {
+    let persistedClientMetadata: IOpenIdDynamicClient = {
       clientId: registeredClient.metadata.client_id,
       idTokenSignedResponseAlg:
         registeredClient.metadata.id_token_signed_response_alg ?? signingAlg,
       clientType: "dynamic",
     };
-    if (registeredClient.metadata.client_secret !== undefined) {
-      persistedClientMetadata.clientSecret =
-        registeredClient.metadata.client_secret;
-    }
-
     await this.storageUtility.setForUser(
-      options.sessionId,
-      persistedClientMetadata,
+      options.sessionId, {
+        clientId: persistedClientMetadata.clientId,
+        idTokenSignedResponseAlg: persistedClientMetadata.idTokenSignedResponseAlg!,
+        clientType: "dynamic",
+      }
     );
-    return {
-      clientId: persistedClientMetadata.clientId,
-      clientSecret: persistedClientMetadata.clientSecret,
-      idTokenSignedResponseAlg:
-        persistedClientMetadata.idTokenSignedResponseAlg,
-      clientName: registeredClient.metadata.client_name as string | undefined,
-      clientType: "dynamic",
-    };
+    if (registeredClient.metadata.client_secret !== undefined) {
+      persistedClientMetadata = {
+        ...persistedClientMetadata,
+        clientSecret: registeredClient.metadata.client_secret,
+        // If a client secret is present, it has an expiration date.
+        expiresAt: registeredClient.metadata.client_secret_expires_at as number
+      }
+      await this.storageUtility.setForUser(
+        options.sessionId, {
+          clientSecret: persistedClientMetadata.clientSecret,
+          expiresAt: String(persistedClientMetadata.expiresAt),
+        }
+      );
+    }
+    return persistedClientMetadata;
   }
 }

packages/node/src/login/oidc/__mocks__/ClientRegistrar.ts

@@ -28,12 +28,18 @@ import type {
 import { jest } from "@jest/globals";
 import type { ClientMetadata } from "openid-client";
 
-export const ClientRegistrarResponse: IClient = {
-  clientId: "abcde",
-  clientSecret: "12345",
-  clientType: "dynamic",
+export const mockDefaultClient = (): IClient => {
+  return {
+    clientId: "a client id",
+    clientSecret: "a client secret",
+    clientType: "dynamic",
+    // 5000-01-07
+    expiresAt: 95618140501,
+  };
 };
 
+export const ClientRegistrarResponse: IClient = mockDefaultClient();
+
 export const PublicClientRegistrarResponse: IClient = {
   clientId: "abcde",
   clientType: "dynamic",
@@ -76,14 +82,6 @@ export const mockClientConfig = (
   };
 };
 
-export const mockDefaultClient = (): IClient => {
-  return {
-    clientId: "a client id",
-    clientSecret: "a client secret",
-    clientType: "dynamic",
-  };
-};
-
 export const mockDefaultClientRegistrar = (): IClientRegistrar => {
   return {
     getClient: async () => mockDefaultClient(),

packages/node/src/login/oidc/oidcHandlers/ClientCredentialsOidcHandler.spec.ts

@@ -32,6 +32,7 @@ import { standardOidcOptions } from "../__mocks__/IOidcOptions";
 import ClientCredentialsOidcHandler from "./ClientCredentialsOidcHandler";
 
 import { mockDefaultIssuerConfig } from "../__mocks__/IssuerConfigFetcher";
+import { mockDefaultClient } from "../__mocks__/ClientRegistrar";
 
 jest.mock("openid-client");
 
@@ -198,11 +199,7 @@ describe("ClientCredentialsOidcHandler", () => {
       await expect(
         clientCredentialsOidcHandler.canHandle({
           ...standardOidcOptions,
-          client: {
-            clientId: randomUUID(),
-            clientSecret: randomUUID(),
-            clientType: "dynamic",
-          },
+          client: mockDefaultClient(),
         }),
       ).resolves.toBe(false);
     });

packages/node/src/login/oidc/oidcHandlers/RefreshTokenOidcHandler.spec.ts

@@ -38,6 +38,9 @@ import {
   mockDefaultOidcOptions,
   mockOidcOptions,
 } from "../__mocks__/IOidcOptions";
+import {
+  mockDefaultClient
+} from "../__mocks__/ClientRegistrar";
 import RefreshTokenOidcHandler from "./RefreshTokenOidcHandler";
 import {
   mockDefaultTokenRefresher,
@@ -79,11 +82,7 @@ describe("RefreshTokenOidcHandler", () => {
         refreshTokenOidcHandler.canHandle(
           mockOidcOptions({
             refreshToken: undefined,
-            client: {
-              clientId: randomUUID(),
-              clientSecret: randomUUID(),
-              clientType: "dynamic",
-            },
+            client: mockDefaultClient(),
           }),
         ),
       ).resolves.toBe(false);
@@ -122,11 +121,7 @@ describe("RefreshTokenOidcHandler", () => {
         refreshTokenOidcHandler.handle(
           mockOidcOptions({
             refreshToken: undefined,
-            client: {
-              clientId: randomUUID(),
-              clientSecret: randomUUID(),
-              clientType: "dynamic",
-            },
+            client: mockDefaultClient(),
           }),
         ),
       ).rejects.toThrow("missing one of 'refreshToken', 'clientId'");
@@ -144,11 +139,7 @@ describe("RefreshTokenOidcHandler", () => {
       const result = await refreshTokenOidcHandler.handle(
         mockOidcOptions({
           refreshToken: "some refresh token",
-          client: {
-            clientId: randomUUID(),
-            clientSecret: randomUUID(),
-            clientType: "dynamic",
-          },
+          client: mockDefaultClient(),
         }),
       );
       expect(result?.webId).toBe("https://my.webid/");
@@ -173,11 +164,7 @@ describe("RefreshTokenOidcHandler", () => {
       const result = (await refreshTokenOidcHandler.handle(
         mockOidcOptions({
           refreshToken: "some refresh token",
-          client: {
-            clientId: randomUUID(),
-            clientSecret: randomUUID(),
-            clientType: "dynamic",
-          },
+          client: mockDefaultClient(),
         }),
       )) as SolidClientAuthnCore.LoginResult;
       expect(result).toBeDefined();
@@ -213,11 +200,7 @@ describe("RefreshTokenOidcHandler", () => {
       const result = await refreshTokenOidcHandler.handle(
         mockOidcOptions({
           refreshToken: "some refresh token",
-          client: {
-            clientId: randomUUID(),
-            clientSecret: randomUUID(),
-            clientType: "dynamic",
-          },
+          client: mockDefaultClient(),
         }),
       );
 
@@ -245,11 +228,7 @@ describe("RefreshTokenOidcHandler", () => {
       const result = await refreshTokenOidcHandler.handle(
         mockOidcOptions({
           refreshToken: "some refresh token",
-          client: {
-            clientId: randomUUID(),
-            clientSecret: randomUUID(),
-            clientType: "dynamic",
-          },
+          client: mockDefaultClient(),
           dpop: false,
         }),
       );
@@ -268,7 +247,9 @@ describe("RefreshTokenOidcHandler", () => {
     });
 
     it("stores OIDC context in storage so that refreshing the token succeeds later", async () => {
-      const exampleClientSecret = randomUUID();
+      const mockedClient = mockDefaultClient();
+      mockedClient.clientId = EXAMPLE_CLIENT_ID;
+      mockedClient.clientName = "some client name";
 
       const mockedStorage = mockStorageUtility({});
       const refreshTokenOidcHandler = new RefreshTokenOidcHandler(
@@ -278,12 +259,7 @@ describe("RefreshTokenOidcHandler", () => {
       await refreshTokenOidcHandler.handle(
         mockOidcOptions({
           refreshToken: "some refresh token",
-          client: {
-            clientId: EXAMPLE_CLIENT_ID,
-            clientSecret: exampleClientSecret,
-            clientName: "some client name",
-            clientType: "dynamic",
-          },
+          client: mockedClient,
         }),
       );
       await expect(
@@ -297,7 +273,7 @@ describe("RefreshTokenOidcHandler", () => {
           mockDefaultOidcOptions().sessionId,
           "clientSecret",
         ),
-      ).resolves.toBe(exampleClientSecret);
+      ).resolves.toBe(mockedClient.clientSecret);
       await expect(
         mockedStorage.getForUser(
           mockDefaultOidcOptions().sessionId,
@@ -340,11 +316,7 @@ describe("RefreshTokenOidcHandler", () => {
     const result = refreshTokenOidcHandler.handle(
       mockOidcOptions({
         refreshToken: "some refresh token",
-        client: {
-          clientId: randomUUID(),
-          clientSecret: randomUUID(),
-          clientType: "dynamic",
-        },
+        client: mockDefaultClient(),
       }),
     );
     await expect(result).rejects.toThrow(
@@ -372,11 +344,7 @@ describe("RefreshTokenOidcHandler", () => {
     const result = await refreshTokenOidcHandler.handle(
       mockOidcOptions({
         refreshToken: "some refresh token",
-        client: {
-          clientId: EXAMPLE_CLIENT_ID,
-          clientSecret: randomUUID(),
-          clientType: "dynamic",
-        },
+        client: mockDefaultClient(),
       }),
     );
     expect(result?.webId).toBe("https://my.webid/");
@@ -408,11 +376,7 @@ describe("RefreshTokenOidcHandler", () => {
     await refreshTokenOidcHandler.handle(
       mockOidcOptions({
         refreshToken: "some refresh token",
-        client: {
-          clientId: randomUUID(),
-          clientSecret: randomUUID(),
-          clientType: "dynamic",
-        },
+        client: mockDefaultClient(),
         eventEmitter: mockEmitter,
       }),
     );
@@ -438,11 +402,7 @@ describe("RefreshTokenOidcHandler", () => {
     const result = refreshTokenOidcHandler.handle(
       mockOidcOptions({
         refreshToken: "some refresh token",
-        client: {
-          clientId: randomUUID(),
-          clientSecret: randomUUID(),
-          clientType: "dynamic",
-        },
+        client: mockDefaultClient(),
       }),
     );
     await expect(result).rejects.toThrow("Invalid credentials");