@inrupt/solid-client-authn-browser 1.13.2 → 1.13.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inrupt/solid-client-authn-browser",
-  "version": "1.13.2",
+  "version": "1.13.4",
   "license": "MIT",
   "types": "dist/index",
   "browser": "dist/index.js",
@@ -25,11 +25,11 @@
     "cross-fetch": "^3.1.5"
   },
   "dependencies": {
-    "@inrupt/oidc-client-ext": "^1.13.2",
-    "@inrupt/solid-client-authn-core": "^1.13.2",
+    "@inrupt/oidc-client-ext": "^1.13.4",
+    "@inrupt/solid-client-authn-core": "^1.13.4",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/node": "^18.0.3",
-    "@types/uuid": "^8.3.0",
+    "@types/uuid": "^9.0.1",
     "events": "^3.3.0",
     "jose": "^4.3.7",
     "lodash.clonedeep": "^4.5.0",
@@ -41,5 +41,5 @@
   "engines": {
     "node": "^14.0.0 || ^16.0.0"
   },
-  "gitHead": "76a536b31ba87632891d726b5179bfde9afed7be"
+  "gitHead": "ab437bbfb613f4f64b82b17e3a38177998a1762a"
 }

package/src/Session.spec.ts

@@ -32,6 +32,7 @@ import { Session } from "./Session";
 import { LocalStorageMock } from "./storage/__mocks__/LocalStorage";
 import { mockSessionInfoManager } from "./sessionInfo/__mocks__/SessionInfoManager";
 import { KEY_CURRENT_SESSION, KEY_CURRENT_URL } from "./constant";
+import type ClientAuthentication from "./ClientAuthentication";
 
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 
@@ -264,21 +265,21 @@ describe("Session", () => {
 
     it("updates the session's info if relevant", async () => {
       const clientAuthentication = mockClientAuthentication();
-      clientAuthentication.handleIncomingRedirect = jest.fn(
-        async (_url: string) => {
-          return {
-            isLoggedIn: true,
-            sessionId: "a session ID",
-            webId: "https://some.webid#them",
-          };
-        }
-      );
+      clientAuthentication.handleIncomingRedirect = jest
+        .fn<ClientAuthentication["handleIncomingRedirect"]>()
+        .mockResolvedValueOnce({
+          isLoggedIn: true,
+          sessionId: "a session ID",
+          webId: "https://some.webid#them",
+          expirationDate: Date.now() + 3600,
+        });
       const mySession = new Session({ clientAuthentication });
       expect(mySession.info.isLoggedIn).toBe(false);
       await mySession.handleIncomingRedirect("https://some.url");
       expect(mySession.info.isLoggedIn).toBe(true);
       expect(mySession.info.sessionId).toBe("a session ID");
       expect(mySession.info.webId).toBe("https://some.webid#them");
+      expect(mySession.info.expirationDate).toBeGreaterThan(Date.now());
     });
 
     it("updates the localStorage if the login is completed", async () => {

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

@@ -119,4 +119,42 @@ describe("IssuerConfigFetcher", () => {
     );
     expect(fetchedConfig.scopesSupported).toContain("openid");
   });
+
+  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 mockFetch = jest.fn<typeof fetch>().mockImplementation(
+      async () =>
+        new NodeResponse(
+          JSON.stringify({
+            issuer: "https://example.com",
+            // eslint-disable-next-line camelcase
+            claim_types_supported: "oidc",
+          })
+        )
+    );
+    window.fetch = mockFetch as typeof window.fetch;
+    const configFetcher = getIssuerConfigFetcher({
+      storageUtility: mockStorageUtility({}),
+    });
+    // No trailing slash
+    await configFetcher.fetchConfig("https://arbitrary.url");
+    expect(mockFetch).toHaveBeenLastCalledWith(
+      "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"
+    );
+    // A path without a trailing slash
+    await configFetcher.fetchConfig("https://arbitrary.url/path");
+    expect(mockFetch).toHaveBeenLastCalledWith(
+      "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"
+    );
+  });
 });

package/src/login/oidc/IssuerConfigFetcher.ts

@@ -159,7 +159,12 @@ export default class IssuerConfigFetcher implements IIssuerConfigFetcher {
   async fetchConfig(issuer: string): Promise<IIssuerConfig> {
     let issuerConfig: IIssuerConfig;
 
-    const openIdConfigUrl = new URL(WELL_KNOWN_OPENID_CONFIG, issuer).href;
+    const openIdConfigUrl = new URL(
+      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}/`
+    ).href;
     const issuerConfigRequestBody = await window.fetch(openIdConfigUrl);
     // Check the validity of the fetched config
     try {

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

@@ -35,7 +35,7 @@ import type * as SolidClientAuthnCore from "@inrupt/solid-client-authn-core";
 import { jest, it, describe, expect } from "@jest/globals";
 import { CodeExchangeResult, getBearerToken } from "@inrupt/oidc-client-ext";
 import type * as OidcClientExt from "@inrupt/oidc-client-ext";
-import { Response } from "cross-fetch";
+import { Response, Headers } from "cross-fetch";
 import { JWK, importJWK } from "jose";
 import { KeyObject } from "crypto";
 import { AuthCodeRedirectHandler } from "./AuthCodeRedirectHandler";
@@ -470,11 +470,6 @@ describe("AuthCodeRedirectHandler", () => {
         storageUtility: mockedStorage,
       });
       await authCodeRedirectHandler.handle(mockRedirectUrl());
-      await expect(
-        mockedStorage.getForUser("mySession", "redirectUrl", {
-          secure: false,
-        })
-      ).resolves.toBe("https://some.redirect.uri/?state=oauth2StateValue");
 
       // The ID token should not have been stored
       await expect(
@@ -484,7 +479,7 @@ describe("AuthCodeRedirectHandler", () => {
       ).resolves.toBeUndefined();
     });
 
-    it("preserves any query strings from the redirect URI", async () => {
+    it("does not override the previously stored redirect URL", async () => {
       mockOidcClient();
 
       window.fetch = (jest.fn() as any).mockReturnValue(
@@ -509,9 +504,8 @@ describe("AuthCodeRedirectHandler", () => {
         mockedStorage.getForUser("mySession", "redirectUrl", {
           secure: false,
         })
-      ).resolves.toBe(
-        "https://some.redirect.uri/?state=oauth2StateValue&someKey=someValue"
-      );
+        // The redirect URL already in storage shouldn't be overriden on redirect.
+      ).resolves.toBe(DEFAULT_REDIRECT_URL);
     });
 
     it("returns the expiration time normalised to the current time", async () => {

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

@@ -175,19 +175,6 @@ export class AuthCodeRedirectHandler implements IIncomingRedirectHandler {
       },
       { secure: true }
     );
-    // Clear the code query param from the redirect URL before storing it, but
-    // preserve any state that my have been provided by the client and returned
-    // by the IdP.
-    url.searchParams.delete("code");
-    await this.storageUtility.setForUser(
-      storedSessionId,
-      {
-        redirectUrl: url.toString(),
-      },
-      {
-        secure: false,
-      }
-    );
 
     const sessionInfo = await this.sessionInfoManager.get(storedSessionId);
     if (!sessionInfo) {

package/tsconfig.json

@@ -9,7 +9,8 @@
   "typedocOptions": {
     "out": "website/docs/api/browser",
     "entryPoints": ["./src/index.ts"],
-    "entryDocument": "index.md"
+    "entryDocument": "index.md",
+    "hideInPageTOC": true,
   },
 
   "include": ["src/**/*"],