@inrupt/solid-client-authn-browser 3.1.1 → 4.0.1

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -32,9 +31,8 @@ export const OidcHandlerHandleResponse: ISessionInfo =
   SessionCreatorGetSessionResponse;
 
 export const OidcHandlerMock: jest.Mocked<IOidcHandler> = {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   canHandle: jest.fn((_options: IOidcOptions) => Promise.resolve(true)),
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   handle: jest.fn(async (_options: IOidcOptions) => Promise.resolve(undefined)),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 } as any;

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -38,7 +37,6 @@ 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),
   ),

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -31,6 +30,7 @@ import { USER_SESSION_PREFIX } from "@inrupt/solid-client-authn-core";
 import {
   StorageUtilityMock,
   mockStorageUtility,
+  // eslint-disable-next-line import/no-unresolved
 } from "@inrupt/solid-client-authn-core/mocks";
 import { jest, it, describe, expect } from "@jest/globals";
 import type * as OidcClientExt from "@inrupt/oidc-client-ext";

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -42,7 +41,6 @@ import { getUnauthenticatedSession } from "../../../sessionInfo/SessionInfoManag
 export class ErrorOidcHandler implements IIncomingRedirectHandler {
   async canHandle(redirectUrl: string): Promise<boolean> {
     try {
-      // eslint-disable-next-line no-new
       return new URL(redirectUrl).searchParams.has("error");
     } catch (e) {
       throw new Error(

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -41,7 +40,7 @@ export class FallbackRedirectHandler implements IIncomingRedirectHandler {
   async canHandle(redirectUrl: string): Promise<boolean> {
     try {
       // The next URL object is built for validating it.
-      // eslint-disable-next-line no-new
+
       new URL(redirectUrl);
       return true;
     } catch (e) {

package/src/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.spec.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -33,6 +32,7 @@ import { StorageUtility } from "@inrupt/solid-client-authn-core";
 import {
   StorageUtilityMock,
   mockStorage,
+  // eslint-disable-next-line import/no-unresolved
 } from "@inrupt/solid-client-authn-core/mocks";
 
 import AuthorizationCodeWithPkceOidcHandler from "./AuthorizationCodeWithPkceOidcHandler";
@@ -53,7 +53,6 @@ const mockOidcModule = (
   url: string = expectedSigninRedirectUrl,
   state = "test state",
 ) => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const oidcModule = jest.requireMock("@inrupt/oidc-client-ext") as any;
   oidcModule.OidcClient.mockReturnValue({
     createSigninRequest: jest
@@ -91,7 +90,6 @@ describe("AuthorizationCodeWithPkceOidcHandler", () => {
       getAuthorizationCodeWithPkceOidcHandler();
     canHandleTests.authorizationCodeWithPkceOidcHandler.forEach(
       (testConfig) => {
-        // eslint-disable-next-line jest/valid-title
         it(testConfig.message, async () => {
           const value = await authorizationCodeWithPkceOidcHandler.canHandle(
             testConfig.oidcOptions,
@@ -138,7 +136,6 @@ describe("AuthorizationCodeWithPkceOidcHandler", () => {
       // pretty nasty due to an Error instance being logged without being
       // converted to a string:
 
-      // eslint-disable-next-line no-console
       expect(console.error).toHaveBeenCalledTimes(1);
       expect(
         (console as jest.Mocked<Console>).error.mock.calls[0][0].toString(),

package/src/login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -35,6 +34,9 @@ import type {
 import { AuthorizationCodeWithPkceOidcHandlerBase } from "@inrupt/solid-client-authn-core";
 import { OidcClient } from "@inrupt/oidc-client-ext";
 
+// Camelcase identifiers are required in the OIDC specification.
+/* eslint-disable camelcase*/
+
 /**
  * @hidden
  * Authorization code flow spec: https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth
@@ -45,12 +47,12 @@ export default class AuthorizationCodeWithPkceOidcHandler
   implements IOidcHandler
 {
   async handle(oidcLoginOptions: IOidcOptions): Promise<LoginResult> {
-    /* eslint-disable camelcase */
+    const redirectUri = oidcLoginOptions.redirectUrl ?? "";
     const oidcOptions = {
       authority: oidcLoginOptions.issuer.toString(),
       client_id: oidcLoginOptions.client.clientId,
       client_secret: oidcLoginOptions.client.clientSecret,
-      redirect_uri: oidcLoginOptions.redirectUrl,
+      redirect_uri: redirectUri,
       response_type: "code",
       scope: oidcLoginOptions.scopes.join(" "),
       filterProtocolClaims: true,
@@ -58,26 +60,23 @@ export default class AuthorizationCodeWithPkceOidcHandler
       // Note that in Solid, information should be retrieved from the
       // profile referenced by the WebId.
       loadUserInfo: false,
-      code_verifier: true,
       prompt: oidcLoginOptions.prompt ?? "consent",
     };
-    /* eslint-enable camelcase */
 
     const oidcClientLibrary = new OidcClient(oidcOptions);
 
     try {
-      const signingRequest = await oidcClientLibrary.createSigninRequest();
+      const signingRequest = await oidcClientLibrary.createSigninRequest({});
       // Make sure to await the promise before returning so that the error is caught.
       return await this.setupRedirectHandler({
         oidcLoginOptions,
-        // eslint-disable-next-line no-underscore-dangle
-        state: signingRequest.state._id,
-        // eslint-disable-next-line no-underscore-dangle
-        codeVerifier: signingRequest.state._code_verifier,
+
+        state: signingRequest.state.id,
+
+        codeVerifier: signingRequest.state.code_verifier ?? "",
         targetUrl: signingRequest.url.toString(),
       });
     } catch (err: unknown) {
-      // eslint-disable-next-line no-console
       console.error(err);
     }
 

package/src/login/oidc/oidcHandlers/OidcHandlerCanHandleTest.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -28,6 +27,7 @@ import { EVENTS } from "@inrupt/solid-client-authn-core";
 import {
   StorageUtilityMock,
   mockStorageUtility,
+  // eslint-disable-next-line import/no-unresolved
 } from "@inrupt/solid-client-authn-core/mocks";
 import type { JWK } from "jose";
 import { importJWK } from "jose";

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -42,7 +41,6 @@ import type { EventEmitter } from "events";
 
 // Some identifiers are not in camelcase on purpose, as they are named using the
 // official names from the OIDC/OAuth2 specifications.
-/* eslint-disable camelcase */
 
 /**
  * @hidden

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

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,7 +25,6 @@ import type {
 } from "@inrupt/solid-client-authn-core";
 
 // Some identifiers are in camelcase on purpose.
-/* eslint-disable camelcase */
 
 export const mockTokenRefresher = (
   tokenSet: TokenEndpointResponse,

package/src/logout/buildRpInitiatedLogout.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,6 +17,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
+
 import type {
   IEndSessionOptions,
   IRpLogoutOptions,

package/src/sessionInfo/SessionInfoManager.spec.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,6 +23,7 @@ import {
   StorageUtility,
   mockStorage,
 } from "@inrupt/solid-client-authn-core";
+// eslint-disable-next-line import/no-unresolved
 import { mockLogoutHandler } from "@inrupt/solid-client-authn-core/mocks";
 import { jest, it, describe, expect } from "@jest/globals";
 
@@ -130,6 +130,7 @@ describe("SessionInfoManager", () => {
         refreshToken: "some refresh token",
         redirectUrl: "https://some.redirect/url",
         tokenType: "DPoP",
+        clientExpiresAt: undefined,
       });
     });
 
@@ -158,6 +159,7 @@ describe("SessionInfoManager", () => {
         refreshToken: undefined,
         redirectUrl: undefined,
         tokenType: "DPoP",
+        clientExpiresAt: undefined,
       });
     });
 
@@ -219,6 +221,65 @@ describe("SessionInfoManager", () => {
       );
     });
 
+    it("returns clientExpiresAt when expiresAt is in storage", async () => {
+      const sessionId = "commanderCool";
+      const expiresAt = 1700000000;
+
+      const storageMock = new StorageUtility(
+        mockStorage({
+          [`solidClientAuthenticationUser:${sessionId}`]: {
+            isLoggedIn: "true",
+          },
+        }),
+        mockStorage({
+          [`solidClientAuthenticationUser:${sessionId}`]: {
+            clientId: "https://some.app/registration",
+            clientSecret: "some client secret",
+            issuer: "https://some.issuer",
+            expiresAt: String(expiresAt),
+          },
+        }),
+      );
+
+      const sessionManager = getSessionInfoManager({
+        storageUtility: storageMock,
+      });
+      const session = await sessionManager.get(sessionId);
+      expect(session).toStrictEqual(
+        expect.objectContaining({
+          clientExpiresAt: expiresAt,
+        }),
+      );
+    });
+
+    it("returns undefined clientExpiresAt when expiresAt is not in storage", async () => {
+      const sessionId = "commanderCool";
+
+      const storageMock = new StorageUtility(
+        mockStorage({
+          [`solidClientAuthenticationUser:${sessionId}`]: {
+            isLoggedIn: "true",
+          },
+        }),
+        mockStorage({
+          [`solidClientAuthenticationUser:${sessionId}`]: {
+            clientId: "https://some.app/registration",
+            issuer: "https://some.issuer",
+          },
+        }),
+      );
+
+      const sessionManager = getSessionInfoManager({
+        storageUtility: storageMock,
+      });
+      const session = await sessionManager.get(sessionId);
+      expect(session).toStrictEqual(
+        expect.objectContaining({
+          clientExpiresAt: undefined,
+        }),
+      );
+    });
+
     it("throws if the stored token type isn't supported", async () => {
       const sessionId = "commanderCool";
 

package/src/sessionInfo/SessionInfoManager.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -72,6 +71,7 @@ export class SessionInfoManager
       refreshToken,
       issuer,
       tokenType,
+      expiresAt,
     ] = await Promise.all([
       this.storageUtility.getForUser(sessionId, "isLoggedIn", {
         secure: true,
@@ -97,6 +97,9 @@ export class SessionInfoManager
       this.storageUtility.getForUser(sessionId, "tokenType", {
         secure: false,
       }),
+      this.storageUtility.getForUser(sessionId, "expiresAt", {
+        secure: false,
+      }),
     ]);
 
     if (typeof redirectUrl === "string" && !isValidRedirectUrl(redirectUrl)) {
@@ -134,6 +137,8 @@ export class SessionInfoManager
       clientAppSecret: clientSecret,
       // Default the token type to DPoP if unspecified.
       tokenType: tokenType ?? "DPoP",
+      clientExpiresAt:
+        expiresAt !== undefined ? Number.parseInt(expiresAt, 10) : undefined,
     };
   }
 

package/src/sessionInfo/__mocks__/SessionInfoManager.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -46,7 +45,7 @@ export const SessionInfoManagerMock: jest.Mocked<ISessionInfoManager> = {
     Promise.resolve(SessionCreatorCreateResponse),
   ),
   getAll: jest.fn(async () => Promise.resolve([SessionCreatorCreateResponse])),
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   clear: jest.fn(async (_sessionId: string) => Promise.resolve()),
   register: jest.fn(async (_sessionId: string) => Promise.resolve()),
   clearAll: jest.fn(async () => Promise.resolve()),

package/src/storage/BrowserStorage.spec.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

package/src/storage/BrowserStorage.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

package/src/storage/StorageUtility.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

package/src/storage/__mocks__/LocalStorage.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

package/src/util/UUIDGenerator.spec.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

package/src/util/UuidGenerator.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40,7 +39,6 @@ export interface IUuidGenerator {
  * @hidden
  */
 export default class UuidGenerator {
-  // eslint-disable-next-line class-methods-use-this
   v4(): string {
     return v4();
   }

package/src/util/__mocks__/UuidGenerator.ts

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

package/typedoc.config.mjs

@@ -1,4 +1,3 @@
-//
 // Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy