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

package/dist/constant.d.ts

@@ -1,2 +1,2 @@
-export declare const KEY_CURRENT_SESSION: string;
-export declare const KEY_CURRENT_URL: string;
+export declare const KEY_CURRENT_SESSION = "solidClientAuthn:currentSession";
+export declare const KEY_CURRENT_URL = "solidClientAuthn:currentUrl";

package/dist/index.js

@@ -20,7 +20,7 @@ class ClientAuthentication extends solidClientAuthnCore.ClientAuthentication {
             await this.sessionInfoManager.clear(options.sessionId);
             const redirectUrl = (_a = options.redirectUrl) !== null && _a !== void 0 ? _a : oidcClientExt.removeOidcQueryParam(window.location.href);
             if (!solidClientAuthnCore.isValidRedirectUrl(redirectUrl)) {
-                throw new Error(`${redirectUrl} is not a valid redirect URL, it is either a malformed IRI or it includes a hash fragment.`);
+                throw new Error(`${redirectUrl} is not a valid redirect URL, it is either a malformed IRI, includes a hash fragment, or reserved query parameters ('code' or 'state').`);
             }
             await this.loginHandler.handle({
                 ...options,
@@ -83,6 +83,10 @@ class OidcLoginHandler {
         this.oidcHandler = oidcHandler;
         this.issuerConfigFetcher = issuerConfigFetcher;
         this.clientRegistrar = clientRegistrar;
+        this.storageUtility = storageUtility;
+        this.oidcHandler = oidcHandler;
+        this.issuerConfigFetcher = issuerConfigFetcher;
+        this.clientRegistrar = clientRegistrar;
     }
     async canHandle(options) {
         return hasIssuer(options) && hasRedirectUrl(options);
@@ -243,6 +247,7 @@ function processConfig(config) {
 class IssuerConfigFetcher {
     constructor(storageUtility) {
         this.storageUtility = storageUtility;
+        this.storageUtility = storageUtility;
     }
     static getLocalStorageKey(issuer) {
         return `issuerConfig:${issuer}`;
@@ -250,7 +255,7 @@ class IssuerConfigFetcher {
     async fetchConfig(issuer) {
         let issuerConfig;
         const openIdConfigUrl = new URL(WELL_KNOWN_OPENID_CONFIG, issuer.endsWith("/") ? issuer : `${issuer}/`).href;
-        const issuerConfigRequestBody = await universalFetch.fetch(openIdConfigUrl);
+        const issuerConfigRequestBody = await universalFetch.fetch.call(globalThis, openIdConfigUrl);
         try {
             issuerConfig = processConfig(await issuerConfigRequestBody.json());
         }
@@ -268,32 +273,40 @@ async function clear(sessionId, storage) {
 }
 class SessionInfoManager extends solidClientAuthnCore.SessionInfoManagerBase {
     async get(sessionId) {
-        var _a;
-        const isLoggedIn = await this.storageUtility.getForUser(sessionId, "isLoggedIn", {
-            secure: true,
-        });
-        const webId = await this.storageUtility.getForUser(sessionId, "webId", {
-            secure: true,
-        });
-        const clientId = await this.storageUtility.getForUser(sessionId, "clientId", {
-            secure: false,
-        });
-        const clientSecret = await this.storageUtility.getForUser(sessionId, "clientSecret", {
-            secure: false,
-        });
-        const redirectUrl = await this.storageUtility.getForUser(sessionId, "redirectUrl", {
-            secure: false,
-        });
-        const refreshToken = await this.storageUtility.getForUser(sessionId, "refreshToken", {
-            secure: true,
-        });
-        const issuer = await this.storageUtility.getForUser(sessionId, "issuer", {
-            secure: false,
-        });
-        const tokenType = (_a = (await this.storageUtility.getForUser(sessionId, "tokenType", {
-            secure: false,
-        }))) !== null && _a !== void 0 ? _a : "DPoP";
-        if (!solidClientAuthnCore.isSupportedTokenType(tokenType)) {
+        const [isLoggedIn, webId, clientId, clientSecret, redirectUrl, refreshToken, issuer, tokenType,] = await Promise.all([
+            this.storageUtility.getForUser(sessionId, "isLoggedIn", {
+                secure: true,
+            }),
+            this.storageUtility.getForUser(sessionId, "webId", {
+                secure: true,
+            }),
+            this.storageUtility.getForUser(sessionId, "clientId", {
+                secure: false,
+            }),
+            this.storageUtility.getForUser(sessionId, "clientSecret", {
+                secure: false,
+            }),
+            this.storageUtility.getForUser(sessionId, "redirectUrl", {
+                secure: false,
+            }),
+            this.storageUtility.getForUser(sessionId, "refreshToken", {
+                secure: true,
+            }),
+            this.storageUtility.getForUser(sessionId, "issuer", {
+                secure: false,
+            }),
+            this.storageUtility.getForUser(sessionId, "tokenType", {
+                secure: false,
+            }),
+        ]);
+        if (typeof redirectUrl === "string" && !solidClientAuthnCore.isValidRedirectUrl(redirectUrl)) {
+            await Promise.all([
+                this.storageUtility.deleteAllUserData(sessionId, { secure: false }),
+                this.storageUtility.deleteAllUserData(sessionId, { secure: true }),
+            ]);
+            return undefined;
+        }
+        if (tokenType !== undefined && !solidClientAuthnCore.isSupportedTokenType(tokenType)) {
             throw new Error(`Tokens of type [${tokenType}] are not supported.`);
         }
         if (clientId === undefined &&
@@ -311,7 +324,7 @@ class SessionInfoManager extends solidClientAuthnCore.SessionInfoManagerBase {
             issuer,
             clientAppId: clientId,
             clientAppSecret: clientSecret,
-            tokenType,
+            tokenType: tokenType !== null && tokenType !== void 0 ? tokenType : "DPoP",
         };
     }
     async clear(sessionId) {
@@ -334,6 +347,7 @@ class FallbackRedirectHandler {
     }
 }
 
+const globalFetch = (...args) => universalFetch.fetch.call(globalThis, ...args);
 class AuthCodeRedirectHandler {
     constructor(storageUtility, sessionInfoManager, issuerConfigFetcher, clientRegistrar, tokerRefresher) {
         this.storageUtility = storageUtility;
@@ -341,6 +355,11 @@ class AuthCodeRedirectHandler {
         this.issuerConfigFetcher = issuerConfigFetcher;
         this.clientRegistrar = clientRegistrar;
         this.tokerRefresher = tokerRefresher;
+        this.storageUtility = storageUtility;
+        this.sessionInfoManager = sessionInfoManager;
+        this.issuerConfigFetcher = issuerConfigFetcher;
+        this.clientRegistrar = clientRegistrar;
+        this.tokerRefresher = tokerRefresher;
     }
     async canHandle(redirectUrl) {
         try {
@@ -395,7 +414,7 @@ class AuthCodeRedirectHandler {
                 tokenRefresher: this.tokerRefresher,
             };
         }
-        const authFetch = await solidClientAuthnCore.buildAuthenticatedFetch(universalFetch.fetch, tokens.accessToken, {
+        const authFetch = await solidClientAuthnCore.buildAuthenticatedFetch(globalFetch, tokens.accessToken, {
             dpopKey: tokens.dpopKey,
             refreshOptions,
             eventEmitter,
@@ -460,6 +479,7 @@ class Redirector {
 class ClientRegistrar {
     constructor(storageUtility) {
         this.storageUtility = storageUtility;
+        this.storageUtility = storageUtility;
     }
     async getClient(options, issuerConfig) {
         const [storedClientId, storedClientSecret,] = await Promise.all([
@@ -525,6 +545,9 @@ class TokenRefresher {
         this.storageUtility = storageUtility;
         this.issuerConfigFetcher = issuerConfigFetcher;
         this.clientRegistrar = clientRegistrar;
+        this.storageUtility = storageUtility;
+        this.issuerConfigFetcher = issuerConfigFetcher;
+        this.clientRegistrar = clientRegistrar;
     }
     async refresh(sessionId, refreshToken, dpopKey, eventEmitter) {
         const oidcContext = await solidClientAuthnCore.loadOidcContextFromStorage(sessionId, this.storageUtility, this.issuerConfigFetcher);