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

package/dist/storage/BrowserStorage.d.ts

@@ -1,7 +1,7 @@
-import { IStorage } from "@inrupt/solid-client-authn-core";
-export default class BrowserStorage implements IStorage {
-    get storage(): typeof window.localStorage;
-    get(key: string): Promise<string | undefined>;
-    set(key: string, value: string): Promise<void>;
-    delete(key: string): Promise<void>;
-}
+import { IStorage } from "@inrupt/solid-client-authn-core";
+export default class BrowserStorage implements IStorage {
+    get storage(): typeof window.localStorage;
+    get(key: string): Promise<string | undefined>;
+    set(key: string, value: string): Promise<void>;
+    delete(key: string): Promise<void>;
+}

package/dist/storage/StorageUtility.d.ts

@@ -1,4 +1,4 @@
-import { IStorage, StorageUtility } from "@inrupt/solid-client-authn-core";
-export default class StorageUtilityBrowser extends StorageUtility {
-    constructor(secureStorage: IStorage, insecureStorage: IStorage);
-}
+import { IStorage, StorageUtility } from "@inrupt/solid-client-authn-core";
+export default class StorageUtilityBrowser extends StorageUtility {
+    constructor(secureStorage: IStorage, insecureStorage: IStorage);
+}

package/dist/util/UuidGenerator.d.ts

@@ -1,6 +1,6 @@
-export interface IUuidGenerator {
-    v4(): string;
-}
-export default class UuidGenerator {
-    v4(): string;
-}
+export interface IUuidGenerator {
+    v4(): string;
+}
+export default class UuidGenerator {
+    v4(): string;
+}

package/dist/util/urlPath.d.ts

@@ -1 +1 @@
-export declare function appendToUrlPathname(url: string, append: string): string;
+export declare function appendToUrlPathname(url: string, append: string): string;

package/examples/demoClientApp/package-lock.json

@@ -9,6 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
+        "@inrupt/solid-client-authn-browser": "file:../..",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
         "regenerator-runtime": "^0.13.9"
@@ -26,6 +27,39 @@
         "webpack-dev-server": "^4.7.3"
       }
     },
+    "../..": {
+      "name": "@inrupt/solid-client-authn-browser",
+      "version": "1.11.7",
+      "license": "MIT",
+      "dependencies": {
+        "@inrupt/oidc-client-ext": "^1.11.7",
+        "@inrupt/solid-client-authn-core": "^1.11.7",
+        "@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"
+      },
+      "devDependencies": {
+        "@rollup/plugin-node-resolve": "^13.2.1",
+        "@types/jest": "^27.0.3",
+        "cross-fetch": "^3.0.6",
+        "eslint": "^7.16.0",
+        "jest": "^27.5.1",
+        "license-checker": "^25.0.1",
+        "rollup": "^2.38.4",
+        "rollup-plugin-polyfill-node": "^0.9.0",
+        "rollup-plugin-typescript2": "^0.31.1",
+        "ts-jest": "^27.0.7",
+        "ts-loader": "^9.1.1",
+        "tsc-watch": "^5.0.2",
+        "typedoc": "^0.22.4",
+        "typedoc-plugin-markdown": "^3.10.2",
+        "typescript": "^4.0.5"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
@@ -1691,6 +1725,10 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@inrupt/solid-client-authn-browser": {
+      "resolved": "../..",
+      "link": true
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2274,9 +2312,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 +4562,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 +4636,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"
@@ -7797,6 +7835,35 @@
       "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==",
       "dev": true
     },
+    "@inrupt/solid-client-authn-browser": {
+      "version": "file:../..",
+      "requires": {
+        "@inrupt/oidc-client-ext": "^1.11.7",
+        "@inrupt/solid-client-authn-core": "^1.11.7",
+        "@rollup/plugin-node-resolve": "^13.2.1",
+        "@types/jest": "^27.0.3",
+        "@types/lodash.clonedeep": "^4.5.6",
+        "@types/node": "^17.0.2",
+        "@types/uuid": "^8.3.0",
+        "cross-fetch": "^3.0.6",
+        "eslint": "^7.16.0",
+        "events": "^3.3.0",
+        "jest": "^27.5.1",
+        "jose": "^4.3.7",
+        "license-checker": "^25.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "rollup": "^2.38.4",
+        "rollup-plugin-polyfill-node": "^0.9.0",
+        "rollup-plugin-typescript2": "^0.31.1",
+        "ts-jest": "^27.0.7",
+        "ts-loader": "^9.1.1",
+        "tsc-watch": "^5.0.2",
+        "typedoc": "^0.22.4",
+        "typedoc-plugin-markdown": "^3.10.2",
+        "typescript": "^4.0.5",
+        "uuid": "^8.3.1"
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -8310,9 +8377,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 +10111,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 +10178,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/demoClientApp/package.json

@@ -31,6 +31,7 @@
   "dependencies": {
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "regenerator-runtime": "^0.13.9"
+    "regenerator-runtime": "^0.13.9",
+    "@inrupt/solid-client-authn-browser": "file:../.."
   }
 }

package/examples/demoClientApp/src/DemoClientApp.js

@@ -8,7 +8,7 @@ import "regenerator-runtime/runtime";
 import {
   Session,
   getClientAuthenticationWithDependencies,
-} from "../../../dist/index";
+} from "@inrupt/solid-client-authn-browser";
 
 const clientApplicationName = "S-C-A Browser Demo Client App";
 let snackBarTimeout = undefined;
@@ -298,6 +298,14 @@ class DemoClientApp extends Component {
 
     this.setState({ fetchLoading: true });
 
+    if (this.state.fetchRoute.startsWith("/")) {
+      this.setState({
+        fetchBody: "Error: please specify a full URL",
+        fetchLoading: false,
+      });
+      return;
+    }
+
     try {
       const session = getSession();
       const response = await (

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

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

package/package.json

@@ -1,60 +1,48 @@
 {
   "name": "@inrupt/solid-client-authn-browser",
-  "version": "1.11.7",
+  "version": "1.11.8-alpha.2",
   "license": "MIT",
   "types": "dist/index",
-  "browser": "dist/index.js",
+  "browser": "dist/solid-client-authn.bundle.js",
   "main": "dist/index.js",
+  "module": "dist/index.es.js",
   "bundle": "dist/solid-client-authn.bundle.js",
   "repository": {
     "url": "https://github.com/inrupt/solid-client-authn"
   },
   "scripts": {
     "prepublishOnly": "npm run build",
-    "clean": "npm run clean-module && npm run clean-browser && rimraf ./coverage",
-    "clean-module": "rimraf ./dist",
-    "clean-browser": "rimraf ./browserDist",
-    "build": "npm run build-module && npm run build-browser",
-    "build-module": "npm run clean-module && tsc -p tsconfig.json",
-    "build-browser": "npm run clean-browser && webpack --config webpack.browser.js",
+    "clean": "rimraf ./dist",
+    "build": "rollup --config rollup.config.js",
     "lint:fix": "npm run lint:eslint -- --fix && npm run lint:prettier -- --write",
     "lint:check": "npm run lint:eslint && npm run lint:prettier -- --check",
     "lint:eslint": "eslint --config .eslintrc.js \"src/\"",
     "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.2",
+    "@inrupt/solid-client-authn-core": "^1.11.8-alpha.2",
     "@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"
+  "devDependencies": {
+    "@rollup/plugin-node-resolve": "^13.2.1",
+    "jest-location-mock": "^1.0.9",
+    "rollup-plugin-polyfill-node": "^0.9.0",
+    "rollup-plugin-sourcemaps": "^0.6.3"
+  },
+  "gitHead": "189b55888fa242a04f54da33dca36f0aca3b7969"
 }

package/rollup.config.js

@@ -0,0 +1,57 @@
+import pkg from "./package.json";
+import typescript from "rollup-plugin-typescript2";
+import nodeResolve from "@rollup/plugin-node-resolve";
+import nodePolyfills from "rollup-plugin-polyfill-node";
+import sourcemaps from "rollup-plugin-sourcemaps";
+
+export default {
+  input: "./src/index.ts",
+  output: [
+    {
+      file: pkg.main,
+      format: "cjs",
+    },
+    {
+      file: pkg.module,
+      format: "esm",
+    },
+    {
+      file: pkg.bundle,
+      format: "umd",
+      name: "solidClientAuthentication",
+      globals: {
+        // FIXME: inline oidc-client:
+        "@inrupt/oidc-client": "oidcClient",
+        "@inrupt/solid-client-authn-core": "solidClientAuthnCore",
+      },
+    },
+  ],
+  plugins: [
+    nodePolyfills({
+      include: ["events"],
+    }),
+    sourcemaps(),
+    nodeResolve({
+      browser: true,
+      preferBuiltins: true,
+      resolveOnly: [
+        "uuid",
+        "@inrupt/solid-client-authn-core",
+        "@inrupt/oidc-client-ext",
+      ],
+    }),
+    typescript({
+      // Use our own version of TypeScript, rather than the one bundled with the plugin:
+      typescript: require("typescript"),
+      tsconfigOverride: {
+        compilerOptions: {
+          module: "esnext",
+        },
+      },
+    }),
+  ],
+  external: ["@inrupt/solid-client", "@inrupt/solid-client-authn-core"],
+  // external: ['crypto'],
+  // The following option is useful because symlinks are used in monorepos
+  preserveSymlinks: true,
+};

package/src/ClientAuthentication.spec.ts

@@ -19,17 +19,19 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { jest, it, describe, expect } from "@jest/globals";
+import { jest, it, describe, expect, beforeEach } from "@jest/globals";
 import {
   mockStorageUtility,
   StorageUtility,
   USER_SESSION_PREFIX,
   mockStorage,
+  EVENTS,
 } from "@inrupt/solid-client-authn-core";
 import * as SolidClientAuthnCore from "@inrupt/solid-client-authn-core";
 import { EventEmitter } from "events";
 import { LoginHandlerMock } from "./login/__mocks__/LoginHandler";
 import {
+  RedirectFailureHandlerMock,
   RedirectHandlerMock,
   RedirectHandlerResponse,
 } from "./login/oidc/redirectHandler/__mocks__/RedirectHandler";
@@ -97,8 +99,43 @@ describe("ClientAuthentication", () => {
     );
   }
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+    Object.defineProperty(window, "location", {
+      writable: true,
+      value: { assign: jest.fn() },
+    });
+  });
+
   describe("login", () => {
     const mockEmitter = new EventEmitter();
+    // TODO: add tests for events & errors
+
+    it("calls login, and uses the window.location.href for the redirect if no redirectUrl is set", async () => {
+      // Set a current window location which will be the expected URL to be
+      // redirected back to, since we don't pass redirectUrl:
+      window.location.href = "https://coolapp.test/some/redirect";
+
+      const clientAuthn = getClientAuthentication();
+      await clientAuthn.login(
+        {
+          sessionId: "mySession",
+          tokenType: "DPoP",
+          clientId: "coolApp",
+          oidcIssuer: "https://idp.com",
+        },
+        mockEmitter
+      );
+      expect(defaultMocks.loginHandler.handle).toHaveBeenCalledWith({
+        sessionId: "mySession",
+        clientId: "coolApp",
+        redirectUrl: "https://coolapp.test/some/redirect",
+        oidcIssuer: "https://idp.com",
+        clientName: "coolApp",
+        eventEmitter: mockEmitter,
+        tokenType: "DPoP",
+      });
+    });
 
     it("calls login, and defaults to a DPoP token", async () => {
       const clientAuthn = getClientAuthentication();
@@ -200,6 +237,7 @@ describe("ClientAuthentication", () => {
 
   describe("logout", () => {
     const mockEmitter = new EventEmitter();
+    // TODO: add tests for events & errors
 
     it("reverts back to un-authenticated fetch on logout", async () => {
       window.fetch = jest.fn();
@@ -267,6 +305,7 @@ describe("ClientAuthentication", () => {
 
   describe("handleIncomingRedirect", () => {
     const mockEmitter = new EventEmitter();
+    mockEmitter.emit = jest.fn();
 
     it("calls handle redirect", async () => {
       // eslint-disable-next-line no-restricted-globals
@@ -302,6 +341,7 @@ describe("ClientAuthentication", () => {
 
       // Calling the redirect handler should have updated the fetch.
       expect(clientAuthn.fetch).not.toBe(unauthFetch);
+      expect(mockEmitter.emit).not.toHaveBeenCalled();
     });
 
     it("clears the current IRI from OAuth query parameters in the auth code flow", async () => {
@@ -317,6 +357,32 @@ describe("ClientAuthentication", () => {
         "",
         "https://coolapp.com/redirect"
       );
+      expect(mockEmitter.emit).not.toHaveBeenCalled();
+    });
+
+    it("clears the current IRI from OAuth query parameters even if auth flow fails", async () => {
+      // eslint-disable-next-line no-restricted-globals
+      history.replaceState = jest.fn();
+      const clientAuthn = getClientAuthentication({
+        ...defaultMocks,
+        redirectHandler: RedirectFailureHandlerMock,
+      });
+
+      const url =
+        "https://coolapp.com/redirect?state=someState&code=someAuthCode";
+      await clientAuthn.handleIncomingRedirect(url, mockEmitter);
+      // eslint-disable-next-line no-restricted-globals
+      expect(history.replaceState).toHaveBeenCalledWith(
+        null,
+        "",
+        "https://coolapp.com/redirect"
+      );
+
+      expect(mockEmitter.emit).toHaveBeenCalledWith(
+        EVENTS.ERROR,
+        "redirect",
+        new Error("Something went wrong")
+      );
     });
 
     it("clears the current IRI from OAuth query parameters in the implicit flow", async () => {
@@ -332,6 +398,7 @@ describe("ClientAuthentication", () => {
         "",
         "https://coolapp.com/redirect"
       );
+      expect(mockEmitter.emit).not.toHaveBeenCalled();
     });
 
     it("preserves non-OAuth query strings", async () => {
@@ -347,6 +414,7 @@ describe("ClientAuthentication", () => {
         "",
         "https://coolapp.com/redirect?someQuery=someValue"
       );
+      expect(mockEmitter.emit).not.toHaveBeenCalled();
     });
   });