@inrupt/solid-client-authn-browser 1.11.7 → 1.11.8-alpha.0

package/examples/demoClientApp/package-lock.json

@@ -2274,9 +2274,9 @@
       }
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "dependencies": {
         "lodash": "^4.17.14"
@@ -4524,9 +4524,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/mkdirp": {
@@ -4598,9 +4598,9 @@
       "dev": true
     },
     "node_modules/node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
+      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==",
       "dev": true,
       "engines": {
         "node": ">= 6.13.0"
@@ -8310,9 +8310,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
@@ -10044,9 +10044,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mkdirp": {
@@ -10111,9 +10111,9 @@
       }
     },
     "node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
+      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==",
       "dev": true
     },
     "node-releases": {

package/examples/single/bundle/package-lock.json

@@ -2266,9 +2266,9 @@
       }
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "dependencies": {
         "lodash": "^4.17.14"
@@ -4461,9 +4461,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/mkdirp": {
@@ -4529,9 +4529,9 @@
       }
     },
     "node_modules/node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
+      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==",
       "dev": true,
       "engines": {
         "node": ">= 6.13.0"
@@ -8059,9 +8059,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
@@ -9735,9 +9735,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "mkdirp": {
@@ -9794,9 +9794,9 @@
       }
     },
     "node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
+      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==",
       "dev": true
     },
     "node-releases": {

package/jest.config.js

@@ -2,4 +2,8 @@ module.exports = {
   ...require("../../jest.config"),
   // Allows running tests from packages/browser/
   testEnvironment: "<rootDir>/../../tests/environment/customEnvironment.js",
+
+  // Enable injectGlobals here to support jest-mock-console
+  // https://github.com/bpedersen/jest-mock-console/issues/32
+  injectGlobals: true,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inrupt/solid-client-authn-browser",
-  "version": "1.11.7",
+  "version": "1.11.8-alpha.0",
   "license": "MIT",
   "types": "dist/index",
   "browser": "dist/index.js",
@@ -23,38 +23,23 @@
     "lint:prettier": "prettier \"src/*.{ts,tsx,js,jsx,css}\" \"**/*.{md,mdx,yml}\"",
     "licenses:check": "license-checker --production --out license.csv --failOn \"AGPL-1.0-only; AGPL-1.0-or-later; AGPL-3.0-only; AGPL-3.0-or-later; Beerware; CC-BY-NC-1.0; CC-BY-NC-2.0; CC-BY-NC-2.5; CC-BY-NC-3.0; CC-BY-NC-4.0; CC-BY-NC-ND-1.0; CC-BY-NC-ND-2.0; CC-BY-NC-ND-2.5; CC-BY-NC-ND-3.0; CC-BY-NC-ND-4.0; CC-BY-NC-SA-1.0; CC-BY-NC-SA-2.0; CC-BY-NC-SA-2.5; CC-BY-NC-SA-3.0; CC-BY-NC-SA-4.0; CPAL-1.0; EUPL-1.0; EUPL-1.1; EUPL-1.1;  GPL-1.0-only; GPL-1.0-or-later; GPL-2.0-only;  GPL-2.0-or-later; GPL-3.0; GPL-3.0-only; GPL-3.0-or-later; SISSL;  SISSL-1.2; WTFPL\"",
     "test": "jest --coverage --verbose",
-    "build-api-docs": "npx typedoc --out docs/api/source/api --readme none",
+    "test:debug": "node --inspect-brk ../../node_modules/.bin/jest -i",
+    "build-api-docs": "typedoc --out docs/api/source/api --readme none",
     "build-docs-preview-site": "npm run build-api-docs; cd docs/api; make html"
   },
-  "devDependencies": {
-    "@types/jest": "^27.0.3",
-    "cross-fetch": "^3.0.6",
-    "eslint": "^7.16.0",
-    "jest": "^27.5.1",
-    "license-checker": "^25.0.1",
-    "ts-jest": "^27.0.7",
-    "ts-loader": "^9.1.1",
-    "tsc-watch": "^4.2.9",
-    "typedoc": "^0.22.4",
-    "typedoc-plugin-markdown": "^3.10.2",
-    "typescript": "^4.0.5",
-    "webpack": "^5.11.0",
-    "webpack-cli": "^4.2.0",
-    "webpack-merge": "^5.7.2"
-  },
   "dependencies": {
-    "@inrupt/oidc-client-ext": "^1.11.7",
-    "@inrupt/solid-client-authn-core": "^1.11.7",
+    "@inrupt/oidc-client-ext": "^1.11.8-alpha.0",
+    "@inrupt/solid-client-authn-core": "^1.11.8-alpha.0",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/node": "^17.0.2",
     "@types/uuid": "^8.3.0",
     "events": "^3.3.0",
     "jose": "^4.3.7",
     "lodash.clonedeep": "^4.5.0",
-    "uuid": "^8.3.1"
+    "uuid": "^8.3.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f35bf21111f4ab2a43966345e8cd276cc2b929ef"
+  "gitHead": "b0642458b3781d66655807781cf53f53a6aa70a9"
 }

package/src/Session.spec.ts

@@ -395,230 +395,6 @@ describe("Session", () => {
       expect(incomingRedirectHandler).toHaveBeenCalled();
     });
 
-    // This workaround will be removed after we've settled on an API that allows us to silently
-    // re-activate the user's session after a refresh:
-    describe("(using the temporary workaround for losing a session after refresh)", () => {
-      it("does not report the user to be logged in when the workaround cookie is not present, and just executes the redirect", async () => {
-        const clientAuthentication = mockClientAuthentication();
-        clientAuthentication.handleIncomingRedirect = jest.fn(
-          async (_url: string) => undefined
-        );
-        const mySession = new Session({ clientAuthentication });
-        await mySession.handleIncomingRedirect({
-          url: "https://some.url",
-          useEssSession: true,
-        });
-        expect(mySession.info.isLoggedIn).toBe(false);
-        expect(mySession.info.webId).toBeUndefined();
-        expect(
-          clientAuthentication.handleIncomingRedirect
-        ).toHaveBeenCalledTimes(1);
-        // The workaround should be enabled by default
-        expect(
-          window.localStorage.getItem("tmp-resource-server-session-enabled")
-        ).toBe("true");
-      });
-
-      it("re-initialises the user's WebID without redirection if the proper cookie is set", async () => {
-        mockLocalStorage({
-          "tmp-resource-server-session-info": JSON.stringify({
-            webId: "https://my.pod/profile#me",
-            sessions: {
-              "https://my.pod/": { expiration: 9000000000000 },
-            },
-          }),
-        });
-        const clientAuthentication = mockClientAuthentication();
-        clientAuthentication.handleIncomingRedirect = jest.fn();
-        const mySession = new Session({ clientAuthentication });
-        await mySession.handleIncomingRedirect({
-          url: "https://some.url",
-          useEssSession: true,
-        });
-        expect(mySession.info.isLoggedIn).toBe(true);
-        expect(mySession.info.webId).toBe("https://my.pod/profile#me");
-        expect(
-          clientAuthentication.handleIncomingRedirect
-        ).toHaveBeenCalledTimes(0);
-        // The workaround should be enabled by default
-        expect(
-          window.localStorage.getItem("tmp-resource-server-session-enabled")
-        ).toBe("true");
-      });
-
-      it("does not attempt to use the workaround if the long-term solution (silent refresh) is enabled", async () => {
-        mockLocalStorage({
-          "tmp-resource-server-session-info": JSON.stringify({
-            webId: "https://my.pod/profile#me",
-            sessions: {
-              "https://my.pod/": { expiration: 9000000000000 },
-            },
-          }),
-        });
-        const clientAuthentication = mockClientAuthentication();
-        clientAuthentication.handleIncomingRedirect = jest.fn();
-        const mySession = new Session({ clientAuthentication });
-        await mySession.handleIncomingRedirect({
-          url: "https://some.url",
-          restorePreviousSession: true,
-        });
-        expect(mySession.info.isLoggedIn).toBe(false);
-        expect(mySession.info.webId).toBeUndefined();
-        expect(
-          clientAuthentication.handleIncomingRedirect
-        ).toHaveBeenCalledTimes(1);
-        expect(
-          window.localStorage.getItem("tmp-resource-server-session-enabled")
-        ).toBe("false");
-      });
-
-      it("overrides the workaround if both silent refresh and the ESS session are enabled", async () => {
-        mockLocalStorage({
-          "tmp-resource-server-session-info": JSON.stringify({
-            webId: "https://my.pod/profile#me",
-            sessions: {
-              "https://my.pod/": { expiration: 9000000000000 },
-            },
-          }),
-        });
-        const clientAuthentication = mockClientAuthentication();
-        clientAuthentication.handleIncomingRedirect = jest.fn();
-        const mySession = new Session({ clientAuthentication });
-        await mySession.handleIncomingRedirect({
-          url: "https://some.url",
-          restorePreviousSession: true,
-          useEssSession: true,
-        });
-        expect(mySession.info.isLoggedIn).toBe(false);
-        expect(mySession.info.webId).toBeUndefined();
-        expect(
-          clientAuthentication.handleIncomingRedirect
-        ).toHaveBeenCalledTimes(1);
-        expect(
-          window.localStorage.getItem("tmp-resource-server-session-enabled")
-        ).toBe("false");
-      });
-
-      it("does not attempt to use the workaround if it is not explicitly enabled", async () => {
-        mockLocalStorage({
-          "tmp-resource-server-session-info": JSON.stringify({
-            webId: "https://my.pod/profile#me",
-            sessions: {
-              "https://my.pod/": { expiration: 9000000000000 },
-            },
-          }),
-        });
-        const clientAuthentication = mockClientAuthentication();
-        clientAuthentication.handleIncomingRedirect = jest.fn();
-        const mySession = new Session({ clientAuthentication });
-        await mySession.handleIncomingRedirect({
-          url: "https://some.url",
-        });
-        expect(mySession.info.isLoggedIn).toBe(false);
-        expect(mySession.info.webId).toBeUndefined();
-        expect(
-          clientAuthentication.handleIncomingRedirect
-        ).toHaveBeenCalledTimes(1);
-        expect(
-          window.localStorage.getItem("tmp-resource-server-session-enabled")
-        ).toBe("false");
-      });
-
-      it("does not attempt to use the workaround if it is explicitly disabled", async () => {
-        mockLocalStorage({
-          "tmp-resource-server-session-info": JSON.stringify({
-            webId: "https://my.pod/profile#me",
-            sessions: {
-              "https://my.pod/": { expiration: 9000000000000 },
-            },
-          }),
-        });
-        const clientAuthentication = mockClientAuthentication();
-        clientAuthentication.handleIncomingRedirect = jest.fn();
-        const mySession = new Session({ clientAuthentication });
-        await mySession.handleIncomingRedirect({
-          url: "https://some.url",
-          useEssSession: false,
-        });
-        expect(mySession.info.isLoggedIn).toBe(false);
-        expect(mySession.info.webId).toBeUndefined();
-        expect(
-          clientAuthentication.handleIncomingRedirect
-        ).toHaveBeenCalledTimes(1);
-        expect(
-          window.localStorage.getItem("tmp-resource-server-session-enabled")
-        ).toBe("false");
-      });
-
-      it("does not mark an almost-expired session as logged in", async () => {
-        mockLocalStorage({
-          "tmp-resource-server-session-info": JSON.stringify({
-            webId: "https://my.pod/profile#me",
-            sessions: {
-              "https://my.pod/": { expiration: Date.now() + 10000 },
-            },
-          }),
-        });
-
-        const clientAuthentication = mockClientAuthentication();
-        clientAuthentication.handleIncomingRedirect = jest.fn();
-        const mySession = new Session({ clientAuthentication });
-        await mySession.handleIncomingRedirect({
-          url: "https://some.url",
-          useEssSession: true,
-        });
-        expect(mySession.info.isLoggedIn).toBe(false);
-        expect(mySession.info.webId).toBeUndefined();
-        expect(
-          clientAuthentication.handleIncomingRedirect
-        ).toHaveBeenCalledTimes(1);
-      });
-
-      it("logs you in even if your Solid Identity Provider is not your Resource server", async () => {
-        mockLocalStorage({
-          "tmp-resource-server-session-info": JSON.stringify({
-            webId: "https://my.pod/profile#me",
-            sessions: {
-              "https://not.my.pod/": { expiration: 9000000000000 },
-            },
-          }),
-        });
-        const clientAuthentication = mockClientAuthentication();
-        clientAuthentication.handleIncomingRedirect = jest.fn();
-        const mySession = new Session({ clientAuthentication });
-        await mySession.handleIncomingRedirect({
-          url: "https://some.url",
-          useEssSession: true,
-        });
-        expect(mySession.info.isLoggedIn).toBe(true);
-        expect(mySession.info.webId).toBe("https://my.pod/profile#me");
-        expect(
-          clientAuthentication.handleIncomingRedirect
-        ).toHaveBeenCalledTimes(0);
-      });
-
-      it("does not log the user in if the data in the storage was invalid", async () => {
-        mockLocalStorage({
-          "tmp-resource-server-session-info": JSON.stringify({
-            webId: "https://my.pod/profile#me",
-            // `sessions` key is intentionally missing
-          }),
-        });
-        const clientAuthentication = mockClientAuthentication();
-        clientAuthentication.handleIncomingRedirect = jest.fn();
-        const mySession = new Session({ clientAuthentication });
-        await mySession.handleIncomingRedirect({
-          url: "https://some.url",
-          useEssSession: true,
-        });
-        expect(mySession.info.isLoggedIn).toBe(false);
-        expect(mySession.info.webId).toBeUndefined();
-        expect(
-          clientAuthentication.handleIncomingRedirect
-        ).toHaveBeenCalledTimes(1);
-      });
-    });
-
     it("posts the redirect IRI to the parent if in an iframe", async () => {
       // Pretend we are in an iframe.
       const frameElement = jest.spyOn(window, "frameElement", "get");

package/src/Session.ts

@@ -28,7 +28,6 @@ import {
   ILoginInputOptions,
   ISessionInfo,
   IStorage,
-  ResourceServerSession,
 } from "@inrupt/solid-client-authn-core";
 import { v4 } from "uuid";
 import ClientAuthentication from "./ClientAuthentication";
@@ -83,6 +82,8 @@ export interface IHandleIncomingRedirectOptions {
    * `useEssSession` defaults to false and will be removed in the future; to
    * preserve sessions across page reloads, use of `restorePreviousSession` is
    * recommended.
+   *
+   * @deprecated unreleased
    */
   useEssSession?: boolean;
   /**
@@ -148,9 +149,6 @@ export class Session extends EventEmitter {
 
   private tokenRequestInProgress = false;
 
-  // Remove this when removing the `useEssSession` workaround:
-  private tmpFetchWithCookies = false;
-
   /**
    * Session object constructor. Typically called as follows:
    *
@@ -237,6 +235,11 @@ export class Session extends EventEmitter {
     this.on(EVENTS.SESSION_EXPIRED, () => this.internalLogout(false));
 
     this.on(EVENTS.ERROR, () => this.internalLogout(false));
+
+    // @deprecated: Remove this when removing all support for the useEssSession parameter.
+    // This intends at cleaning up local storage of applications from data related
+    // to the resource server session workaround.
+    window.localStorage.removeItem("tmp-resource-server-session-enabled");
   }
 
   /**
@@ -271,14 +274,7 @@ export class Session extends EventEmitter {
    * @param init Optional parameters customizing the request, by specifying an HTTP method, headers, a body, etc. Follows the [WHATWG Fetch Standard](https://fetch.spec.whatwg.org/).
    */
   fetch = async (url: RequestInfo, init?: RequestInit): Promise<Response> => {
-    return this.clientAuthentication.fetch(url, {
-      ...init,
-      credentials: this.tmpFetchWithCookies
-        ? /* istanbul ignore next Simulating a cookie-enabled session in tests is too much work for a temporary, disabled-by-default workaround: */
-          "include"
-        : /* istanbul ignore next Simulating a cookie-enabled session in tests is too much work for a temporary, disabled-by-default workaround: */
-          init?.credentials,
-    });
+    return this.clientAuthentication.fetch(url, init);
   };
 
   /**
@@ -295,7 +291,6 @@ export class Session extends EventEmitter {
     window.localStorage.removeItem(KEY_CURRENT_SESSION);
     await this.clientAuthentication.logout(this.info.sessionId);
     this.info.isLoggedIn = false;
-    this.tmpFetchWithCookies = false;
     if (emitSignal) {
       this.emit(EVENTS.LOGOUT);
     }
@@ -333,81 +328,6 @@ export class Session extends EventEmitter {
       return undefined;
     }
 
-    // Unfortunately, regular sessions are lost when the user refreshes the page or opens a new tab.
-    // While we're figuring out the API for a longer-term solution, as a temporary workaround some
-    // *resource* servers set a cookie that keeps the user logged in after authenticated requests,
-    // and expose the fact that they set it on a special endpoint.
-    // After login, we store that fact in LocalStorage. This means that we can now look for that
-    // data, and if present, indicate that the user is already logged in.
-    // Note that there are a lot of edge cases that won't work well with this approach, so it willl
-    // be removed in due time, and is disabled by default.
-    if (
-      options.useEssSession !== true ||
-      options.restorePreviousSession === true
-    ) {
-      window.localStorage.setItem(
-        "tmp-resource-server-session-enabled",
-        "false"
-      );
-    } else {
-      window.localStorage.setItem(
-        "tmp-resource-server-session-enabled",
-        "true"
-      );
-    }
-    const storedSessionCookieReference = window.localStorage.getItem(
-      "tmp-resource-server-session-info"
-    );
-    if (
-      typeof storedSessionCookieReference === "string" &&
-      options.restorePreviousSession !== true &&
-      options.useEssSession === true
-    ) {
-      // TOOD: Re-use the type used when writing this data:
-      // https://github.com/inrupt/solid-client-authn-js/pull/920/files#diff-659ac87dfd3711f4cfcea3c7bf6970980f4740fd59df45f04c7977bffaa23e98R118
-      // To keep temporary code together
-      // eslint-disable-next-line no-inner-declarations
-      function isValidSessionCookieReference(
-        reference: Record<string, unknown>
-      ): reference is ResourceServerSession {
-        const resourceServers = Object.keys(
-          (reference as ResourceServerSession).sessions ?? {}
-        );
-        return (
-          typeof (reference as ResourceServerSession).webId === "string" &&
-          resourceServers.length > 0 &&
-          typeof (reference as ResourceServerSession).sessions[
-            resourceServers[0]
-          ].expiration === "number"
-        );
-      }
-      const reference = JSON.parse(storedSessionCookieReference);
-      if (isValidSessionCookieReference(reference)) {
-        const resourceServers = Object.keys(reference.sessions);
-        const webIdOrigin = new URL(reference.webId).hostname;
-        const ownResourceServer = resourceServers.find((resourceServer) => {
-          return new URL(resourceServer).hostname === webIdOrigin;
-        });
-        // Usually the user's WebID is also a Resource server for them,
-        // so we pick the expiration time for that. If it doesn't exist,
-        // we just pick the first (and probably only) one:
-        const relevantServer = ownResourceServer ?? resourceServers[0];
-        // If the cookie is valid for fewer than five minutes,
-        // pretend it's not valid anymore already, to avoid small misalignments
-        // resulting in invalid states:
-        if (
-          reference.sessions[relevantServer].expiration - Date.now() >
-          5 * 60 * 1000
-        ) {
-          this.info.isLoggedIn = true;
-          this.info.webId = reference.webId;
-          this.tmpFetchWithCookies = true;
-          return this.info;
-        }
-      }
-    }
-    // end of temporary workaround.
-
     this.tokenRequestInProgress = true;
     const sessionInfo = await this.clientAuthentication.handleIncomingRedirect(
       url,

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

@@ -25,12 +25,12 @@ import {
 } from "@inrupt/solid-client-authn-core";
 import { jest } from "@jest/globals";
 
-export const RedirectorMock: jest.Mocked<IRedirector> = {
-  redirect: jest.fn(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    (redirectUrl: string, redirectOptions: IRedirectorOptions) => {
-      /* void */
-    }
-  ),
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-} as any;
+export const mockedRedirect = jest.fn<
+  void,
+  [redirectUrl: string, redirectOptions: IRedirectorOptions]
+>();
+export const mockRedirector = (): IRedirector => {
+  return {
+    redirect: mockedRedirect,
+  };
+};