@inrupt/solid-client-authn-browser 1.16.0 → 1.17.0

package/dist/storage/BrowserStorage.d.ts

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

package/dist/storage/StorageUtility.d.ts

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

package/package.json

@@ -1,43 +1,43 @@
 {
   "name": "@inrupt/solid-client-authn-browser",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "license": "MIT",
-  "types": "dist/index",
+  "types": "dist/index.d.ts",
   "browser": "dist/index.js",
   "main": "dist/index.js",
+  "module": "dist/index.mjs",
   "bundle": "dist/solid-client-authn.bundle.js",
   "repository": {
     "url": "https://github.com/inrupt/solid-client-authn"
   },
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "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",
+    "build": "rollup --config rollup.config.mjs",
     "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\"",
     "build-api-docs": "npx typedoc --out docs/api/source/api --readme none",
     "build-docs-preview-site": "npm run build-api-docs; cd docs/api; make html"
   },
   "devDependencies": {
-    "cross-fetch": "^3.1.5"
+    "@types/node": "^20.1.0",
+    "@types/uuid": "^9.0.1"
   },
   "dependencies": {
-    "@inrupt/oidc-client-ext": "^1.16.0",
-    "@inrupt/solid-client-authn-core": "^1.16.0",
-    "@inrupt/universal-fetch": "^1.0.1",
-    "@types/lodash.clonedeep": "^4.5.6",
-    "@types/node": "^20.1.0",
-    "@types/uuid": "^9.0.1",
+    "@inrupt/oidc-client-ext": "^1.17.0",
+    "@inrupt/solid-client-authn-core": "^1.17.0",
+    "@inrupt/universal-fetch": "^1.0.2",
     "events": "^3.3.0",
     "jose": "^4.3.7",
-    "lodash.clonedeep": "^4.5.0",
     "uuid": "^9.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e0354ece5caa8863eb0704525b9a4abb2d2a6cfc"
+  "gitHead": "0f5275fe71f0d4d868d9918f231e7af49640e509"
 }

package/rollup.config.mjs

@@ -0,0 +1,46 @@
+// The following is only possible from Node 18 onwards
+// import pkg from "./package.json" assert { type: "json" };
+
+// Until we only support Node 18+, this should be used instead
+// (see https://rollupjs.org/guide/en/#importing-packagejson)
+import { createRequire } from "node:module";
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import terser from '@rollup/plugin-terser';
+import createConfig, { createSharedConfig } from '../../rollup.common.mjs';
+
+const require = createRequire(import.meta.url);
+const pkg = require("./package.json");
+
+export default [
+  ...createConfig(pkg),
+  {
+    input: "./src/index.ts",
+    output: [
+      {
+        file: pkg.bundle,
+        format: "iife",
+        name: "solidClientAuthentication",
+        sourcemap: true,
+      },
+    ],
+    ...createSharedConfig(pkg),
+    external: [],
+    plugins: [
+      ...createSharedConfig(pkg).plugins,
+      // Locate modules using the Node resolution algorithm, for using third party modules in node_modules
+      // to bundle them into the browser build
+      nodeResolve({
+        // Use browser exports from dependencies where available
+        browser: true,
+        // Bundles in the events library from the node_modules
+        // rather than trying to use the node events library
+        preferBuiltins: false
+      }),
+      // Adds support for importing cjs libraries such as the 'events' library
+      commonjs(),
+      // Minifies the browser bundle
+      terser(),
+    ]
+  },
+];

package/src/ClientAuthentication.spec.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -21,7 +21,7 @@
 
 import { jest, it, describe, expect, beforeEach } from "@jest/globals";
 import { EventEmitter } from "events";
-import * as SolidClientAuthnCore from "@inrupt/solid-client-authn-core";
+import type * as SolidClientAuthnCore from "@inrupt/solid-client-authn-core";
 
 import {
   StorageUtility,
@@ -34,13 +34,13 @@ import {
   mockStorage,
   mockIncomingRedirectHandler,
   mockHandleIncomingRedirect,
+  mockLogoutHandler,
 } from "@inrupt/solid-client-authn-core/mocks";
 
 import { fetch } from "@inrupt/universal-fetch";
-import * as UniversalFetch from "@inrupt/universal-fetch";
+import type * as UniversalFetch from "@inrupt/universal-fetch";
 
 import { mockLoginHandler } from "./login/__mocks__/LoginHandler";
-import { mockLogoutHandler } from "./logout/__mocks__/LogoutHandler";
 import {
   mockSessionInfoManager,
   SessionCreatorCreateResponse,

package/src/ClientAuthentication.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -24,39 +24,23 @@
  * @packageDocumentation
  */
 
-import {
-  ILoginHandler,
-  ILogoutHandler,
-  IIncomingRedirectHandler,
+import type {
   ISessionInfo,
-  ISessionInfoManager,
-  IIssuerConfigFetcher,
   ISessionInternalInfo,
   ILoginOptions,
+} from "@inrupt/solid-client-authn-core";
+import {
   EVENTS,
   isValidRedirectUrl,
+  ClientAuthentication as ClientAuthenticationBase,
 } from "@inrupt/solid-client-authn-core";
-import { fetch } from "@inrupt/universal-fetch";
 import { removeOidcQueryParam } from "@inrupt/oidc-client-ext";
-import { EventEmitter } from "events";
-
-// By only referring to `window` at runtime, apps that do server-side rendering
-// won't run into errors when rendering code that instantiates a
-// ClientAuthentication:
-const globalFetch: typeof fetch = (request, init) => fetch(request, init);
+import type { EventEmitter } from "events";
 
 /**
  * @hidden
  */
-export default class ClientAuthentication {
-  constructor(
-    private loginHandler: ILoginHandler,
-    private redirectHandler: IIncomingRedirectHandler,
-    private logoutHandler: ILogoutHandler,
-    private sessionInfoManager: ISessionInfoManager,
-    private issuerConfigFetcher: IIssuerConfigFetcher
-  ) {}
-
+export default class ClientAuthentication extends ClientAuthenticationBase {
   // Define these functions as properties so that they don't get accidentally re-bound.
   // Isn't Javascript fun?
   login = async (
@@ -93,28 +77,6 @@ export default class ClientAuthentication {
     });
   };
 
-  // By default, our fetch() resolves to the environment fetch() function.
-  fetch = globalFetch;
-
-  logout = async (sessionId: string): Promise<void> => {
-    await this.logoutHandler.handle(sessionId);
-
-    // Restore our fetch() function back to the environment fetch(), effectively
-    // leaving us with un-authenticated fetches from now on.
-    this.fetch = globalFetch;
-  };
-
-  getSessionInfo = async (
-    sessionId: string
-  ): Promise<(ISessionInfo & ISessionInternalInfo) | undefined> => {
-    // TODO complete
-    return this.sessionInfoManager.get(sessionId);
-  };
-
-  getAllSessionInfo = async (): Promise<ISessionInfo[]> => {
-    return this.sessionInfoManager.getAll();
-  };
-
   // Collects session information from storage, and returns them. Returns null
   // if the expected information cannot be found.
   // Note that the ID token is not stored, which means the session information
@@ -144,6 +106,7 @@ export default class ClientAuthentication {
       // ClientAuthentication, to avoid the following error:
       // > 'fetch' called on an object that does not implement interface Window.
       this.fetch = redirectInfo.fetch.bind(window);
+      this.boundLogout = redirectInfo.getLogoutUrl;
 
       // Strip the oauth params:
       this.cleanUrlAfterRedirect(url);

package/src/Session.spec.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -20,21 +20,21 @@
 //
 
 import { jest, it, describe, expect } from "@jest/globals";
+import type { ISessionInfo } from "@inrupt/solid-client-authn-core";
 import {
   EVENTS,
-  ISessionInfo,
   StorageUtility,
   USER_SESSION_PREFIX,
 } from "@inrupt/solid-client-authn-core";
 import { mockStorage } from "@inrupt/solid-client-authn-core/mocks";
 import { fetch } from "@inrupt/universal-fetch";
-import * as UniversalFetch from "@inrupt/universal-fetch";
+import type * as UniversalFetch from "@inrupt/universal-fetch";
 import { mockClientAuthentication } from "./__mocks__/ClientAuthentication";
 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 ClientAuthentication from "./ClientAuthentication";
+import type ClientAuthentication from "./ClientAuthentication";
 
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 

package/src/Session.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -22,19 +22,19 @@
 /**
  * @hidden
  */
-import {
-  EVENTS,
+import type {
   ILoginInputOptions,
   ISessionInfo,
   IStorage,
   IHasSessionEventListener,
   ISessionEventListener,
-  buildProxyHandler,
+  ILogoutOptions,
 } from "@inrupt/solid-client-authn-core";
-import { fetch } from "@inrupt/universal-fetch";
+import { EVENTS, buildProxyHandler } from "@inrupt/solid-client-authn-core";
+import type { fetch } from "@inrupt/universal-fetch";
 import { v4 } from "uuid";
 import EventEmitter from "events";
-import ClientAuthentication from "./ClientAuthentication";
+import type ClientAuthentication from "./ClientAuthentication";
 import { getClientAuthenticationWithDependencies } from "./dependencies";
 import { KEY_CURRENT_SESSION, KEY_CURRENT_URL } from "./constant";
 
@@ -252,9 +252,8 @@ export class Session extends EventEmitter implements IHasSessionEventListener {
    * @param url The URL from which data should be fetched.
    * @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: typeof fetch = async (url, init) => {
-    return this.clientAuthentication.fetch(url, init);
-  };
+  fetch: typeof fetch = (url, init) =>
+    this.clientAuthentication.fetch(url, init);
 
   /**
    * An internal logout function, to control whether or not the logout signal
@@ -263,12 +262,15 @@ export class Session extends EventEmitter implements IHasSessionEventListener {
    *
    * @hidden
    */
-  private internalLogout = async (emitSignal: boolean): Promise<void> => {
+  private internalLogout = async (
+    emitSignal: boolean,
+    options?: ILogoutOptions
+  ): Promise<void> => {
     // Clearing this value means that silent refresh will no longer be attempted.
     // In particular, in the case of a silent authentication error it prevents
     // from getting stuck in an authentication retries loop.
     window.localStorage.removeItem(KEY_CURRENT_SESSION);
-    await this.clientAuthentication.logout(this.info.sessionId);
+    await this.clientAuthentication.logout(this.info.sessionId, options);
     this.info.isLoggedIn = false;
     if (emitSignal) {
       (this.events as EventEmitter).emit(EVENTS.LOGOUT);
@@ -276,9 +278,38 @@ export class Session extends EventEmitter implements IHasSessionEventListener {
   };
 
   /**
-   * Logs the user out of the application. This does not log the user out of their Solid identity provider, and should not redirect the user away.
+   * Logs the user out of the application.
+   *
+   * There are 2 types of logout supported by this library,
+   * `app` logout and `idp` logout.
+   *
+   * App logout will log the user out within the application
+   * by clearing any session data from the browser. It does
+   * not log the user out of their Solid identity provider,
+   * and should not redirect the user away.
+   * App logout can be performed as follows:
+   * ```typescript
+   * await session.logout({ logoutType: 'app' });
+   * ```
+   *
+   * IDP logout will log the user out of their Solid identity provider,
+   * and will redirect the user away from the application to do so.
+   * IDP logout can be performed as follows:
+   * ```typescript
+   * await session.logout({
+   *  logoutType: 'idp',
+   *  // An optional URL to redirect to after logout has completed;
+   *  // this MUST match a logout URL listed in the clientId of
+   *  // the application that is logged in.
+   *  postLogoutUrl: 'https://example.com/logout',
+   *  // An optional value to be included in the query parameters
+   *  // when the IDP provider redirects the user to the postLogoutRedirectUrl.
+   *  state: "my-state"
+   * });
+   * ```
    */
-  logout = async (): Promise<void> => this.internalLogout(true);
+  logout = async (options?: ILogoutOptions): Promise<void> =>
+    this.internalLogout(true, options);
 
   /**
    * Completes the login process by processing the information provided by the

package/src/__mocks__/ClientAuthentication.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -19,7 +19,7 @@
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import {
+import type {
   IIssuerConfigFetcher,
   ILoginHandler,
   ILogoutHandler,
@@ -30,12 +30,12 @@ import {
 import {
   mockStorageUtility,
   mockIncomingRedirectHandler,
+  mockLogoutHandler,
 } from "@inrupt/solid-client-authn-core/mocks";
 
 import ClientAuthentication from "../ClientAuthentication";
 import { IssuerConfigFetcherMock } from "../login/oidc/__mocks__/IssuerConfigFetcher";
 import { mockLoginHandler } from "../login/__mocks__/LoginHandler";
-import { mockLogoutHandler } from "../logout/__mocks__/LogoutHandler";
 import { mockSessionInfoManager } from "../sessionInfo/__mocks__/SessionInfoManager";
 
 type ClientAuthnDependencies = {

package/src/constant.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in

package/src/defaultSession.spec.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in

package/src/defaultSession.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -67,8 +67,10 @@ export const login: Session["login"] = (...args) => {
 };
 
 /**
- * Logs the user out of the application. This does not log the user out of their
- * Solid identity provider, and should not redirect the user away.
+ * Logs the user out of the application.
+ *
+ * By default this does not log the user out of their Solid identity provider.
+ * In order to do so, you must set the logoutType to `idp`.
  *
  * @since 1.3.0
  */

package/src/dependencies.node.spec.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in

package/src/dependencies.spec.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in

package/src/dependencies.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -27,14 +27,17 @@
 /**
  * Top Level core document. Responsible for setting up the dependency graph
  */
-import { IStorage, InMemoryStorage } from "@inrupt/solid-client-authn-core";
+import type { IStorage } from "@inrupt/solid-client-authn-core";
+import {
+  InMemoryStorage,
+  IWaterfallLogoutHandler,
+} from "@inrupt/solid-client-authn-core";
 import StorageUtilityBrowser from "./storage/StorageUtility";
 import ClientAuthentication from "./ClientAuthentication";
 import OidcLoginHandler from "./login/oidc/OidcLoginHandler";
 import AuthorizationCodeWithPkceOidcHandler from "./login/oidc/oidcHandlers/AuthorizationCodeWithPkceOidcHandler";
 import IssuerConfigFetcher from "./login/oidc/IssuerConfigFetcher";
 import { FallbackRedirectHandler } from "./login/oidc/incomingRedirectHandler/FallbackRedirectHandler";
-import GeneralLogoutHandler from "./logout/GeneralLogoutHandler";
 import { SessionInfoManager } from "./sessionInfo/SessionInfoManager";
 import { AuthCodeRedirectHandler } from "./login/oidc/incomingRedirectHandler/AuthCodeRedirectHandler";
 import AggregateRedirectHandler from "./login/oidc/AggregateRedirectHandler";
@@ -73,10 +76,12 @@ export function getClientAuthenticationWithDependencies(dependencies: {
     clientRegistrar
   );
 
+  const redirector = new Redirector();
+
   // make new handler for redirect and login
   const loginHandler = new OidcLoginHandler(
     storageUtility,
-    new AuthorizationCodeWithPkceOidcHandler(storageUtility, new Redirector()),
+    new AuthorizationCodeWithPkceOidcHandler(storageUtility, redirector),
     issuerConfigFetcher,
     clientRegistrar
   );
@@ -98,7 +103,7 @@ export function getClientAuthenticationWithDependencies(dependencies: {
   return new ClientAuthentication(
     loginHandler,
     redirectHandler,
-    new GeneralLogoutHandler(sessionInfoManager),
+    new IWaterfallLogoutHandler(sessionInfoManager, redirector),
     sessionInfoManager,
     issuerConfigFetcher
   );

package/src/index.browser.spec.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in

package/src/index.browser.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in

package/src/index.spec.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in

package/src/index.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in

package/src/login/__mocks__/LoginHandler.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -19,7 +19,7 @@
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import {
+import type {
   ILoginOptions,
   ILoginHandler,
   ISessionInfo,

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

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -19,10 +19,8 @@
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import {
-  IOidcHandler,
-  AggregateHandler,
-} from "@inrupt/solid-client-authn-core";
+import type { IOidcHandler } from "@inrupt/solid-client-authn-core";
+import { AggregateHandler } from "@inrupt/solid-client-authn-core";
 import { jest, it, describe, expect } from "@jest/globals";
 import AggregateOidcHandler from "./AggregateOidcHandler";
 

package/src/login/oidc/AggregateOidcHandler.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -27,12 +27,12 @@
 /**
  * Responsible for selecting the correct OidcHandler to handle the provided OIDC Options
  */
-import {
+import type {
   IOidcHandler,
   IOidcOptions,
-  AggregateHandler,
   LoginResult,
 } from "@inrupt/solid-client-authn-core";
+import { AggregateHandler } from "@inrupt/solid-client-authn-core";
 
 /**
  * @hidden

package/src/login/oidc/AggregateRedirectHandler.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -27,12 +27,12 @@
 /**
  * Responsible for selecting the correct OidcHandler to handle the provided OIDC Options
  */
-import {
+import type {
   IIncomingRedirectHandler,
-  AggregateHandler,
   IncomingRedirectInput,
   IncomingRedirectResult,
 } from "@inrupt/solid-client-authn-core";
+import { AggregateHandler } from "@inrupt/solid-client-authn-core";
 
 /**
  * @hidden

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

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in

package/src/login/oidc/ClientRegistrar.ts

@@ -1,5 +1,5 @@
 //
-// Copyright 2022 Inrupt Inc.
+// Copyright Inrupt Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal in
@@ -24,7 +24,7 @@
  * @packageDocumentation
  */
 
-import {
+import type {
   IStorageUtility,
   IClientRegistrar,
   IIssuerConfig,