@axa-fr/react-oidc 6.13.4 → 6.14.1

package/src/oidc/vanilla/oidc.ts

@@ -1,8 +1,3 @@
-import {
-    AuthorizationServiceConfiguration,
-    GRANT_TYPE_REFRESH_TOKEN,
-} from '@openid/appauth';
-import { AuthorizationServiceConfigurationJson } from '@openid/appauth/src/authorization_service_configuration';
 
 import { startCheckSessionAsync as defaultStartCheckSessionAsync } from './checkSession';
 import { CheckSessionIFrame } from './checkSessionIFrame';
@@ -10,6 +5,7 @@ import { eventNames } from './events';
 import { initSession } from './initSession';
 import { initWorkerAsync, sleepAsync } from './initWorker';
 import { defaultLoginAsync, loginCallbackAsync } from './login';
+import { destroyAsync, logoutAsync } from './logout';
 import {
     computeTimeLeft,
     isTokensOidcValid,
@@ -17,30 +13,35 @@ import {
     Tokens,
 } from './parseTokens';
 import { autoRenewTokens, renewTokensAndStartTimerAsync } from './renewTokens';
-import { fetchFromIssuer, performRevocationRequestAsync, performTokenRequestAsync, TOKEN_TYPE } from './requests';
+import { fetchFromIssuer, performTokenRequestAsync } from './requests';
 import { getParseQueryStringFromLocation } from './route-utils';
 import defaultSilentLoginAsync, { _silentLoginAsync } from './silentLogin';
 import timer from './timer';
 import { AuthorityConfiguration, OidcConfiguration, StringMap } from './types';
 import { userInfoAsync } from './user';
 
-export interface OidcAuthorizationServiceConfigurationJson extends AuthorizationServiceConfigurationJson{
+export interface OidcAuthorizationServiceConfigurationJson {
     check_session_iframe?: string;
     issuer:string;
 }
 
-export class OidcAuthorizationServiceConfiguration extends AuthorizationServiceConfiguration {
-    private check_session_iframe: string;
+export class OidcAuthorizationServiceConfiguration {
+    private checkSessionIframe: string;
     private issuer: string;
+    private authorizationEndpoint: string;
+    private tokenEndpoint: string;
+    private revocationEndpoint: string;
+    private userInfoEndpoint: string;
+    private endSessionEndpoint: string;
 
     constructor(request: any) {
-        super(request);
         this.authorizationEndpoint = request.authorization_endpoint;
         this.tokenEndpoint = request.token_endpoint;
         this.revocationEndpoint = request.revocation_endpoint;
         this.userInfoEndpoint = request.userinfo_endpoint;
-        this.check_session_iframe = request.check_session_iframe;
+        this.checkSessionIframe = request.check_session_iframe;
         this.issuer = request.issuer;
+        this.endSessionEndpoint = request.end_session_endpoint;
     }
 }
 
@@ -246,7 +247,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                         const getLoginParams = session.getLoginParams(this.configurationName);
                         // @ts-ignore
                         this.timeoutId = autoRenewTokens(this, tokens.refreshToken, this.tokens.expiresAt, getLoginParams.extras);
-                        const sessionState = session.getSessionState();
+                        const sessionState = await session.getSessionStateAsync();
                         // @ts-ignore
                         await this.startCheckSessionAsync(oidcServerConfiguration.check_session_iframe, configuration.client_id, sessionState);
                         this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
@@ -314,7 +315,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             // @ts-ignore
             const parsedTokens = response.tokens;
             // @ts-ignore
-            this.tokens = response.tokens;
+            this.tokens = parsedTokens;
             const serviceWorker = await initWorkerAsync(this.configuration.service_worker_relative_url, this.configurationName);
             if (!serviceWorker) {
                 const session = initSession(this.configurationName, this.configuration.storage);
@@ -360,7 +361,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
         };
         const localsilentLoginAsync = async () => {
             try {
-                let loginParams = null;
+                let loginParams;
                 const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
                 if (serviceWorker) {
                     loginParams = serviceWorker.getLoginParams(this.configurationName);
@@ -440,7 +441,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                         const details = {
                             client_id: clientId,
                             redirect_uri: redirectUri,
-                            grant_type: GRANT_TYPE_REFRESH_TOKEN,
+                            grant_type: 'refresh_token',
                             refresh_token: tokens.refreshToken,
                         };
                         const oidcServerConfiguration = await this.initAsync(authority, configuration.authority_configuration);
@@ -548,31 +549,26 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
          });
      }
 
+    renewTokensPromise:Promise<any> = null;
+
      async renewTokensAsync (extras:StringMap = null) {
+         if (this.renewTokensPromise !== null) {
+             return this.renewTokensPromise;
+         }
          if (!this.timeoutId) {
              return;
          }
          timer.clearTimeout(this.timeoutId);
          // @ts-ignore
-         await renewTokensAndStartTimerAsync(this, this.tokens.refreshToken, true, extras);
+         this.renewTokensPromise = renewTokensAndStartTimerAsync(this, this.tokens.refreshToken, true, extras);
+         return this.renewTokensPromise.then(result => {
+             this.renewTokensPromise = null;
+             return result;
+         });
      }
 
      async destroyAsync(status) {
-         timer.clearTimeout(this.timeoutId);
-         this.timeoutId = null;
-         if (this.checkSessionIFrame) {
-             this.checkSessionIFrame.stop();
-         }
-         const serviceWorker = await initWorkerAsync(this.configuration.service_worker_relative_url, this.configurationName);
-         if (!serviceWorker) {
-             const session = initSession(this.configurationName, this.configuration.storage);
-             await session.clearAsync(status);
-         } else {
-             await serviceWorker.clearAsync(status);
-         }
-         this.tokens = null;
-         this.userInfo = null;
-        // this.events = [];
+         return await destroyAsync(this)(status);
      }
 
      async logoutSameTabAsync(clientId: string, sub: any) {
@@ -591,75 +587,16 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
         }
     }
 
+    logoutPromise:Promise<void> = null;
     async logoutAsync(callbackPathOrUrl: string | null | undefined = undefined, extras: StringMap = null) {
-        const configuration = this.configuration;
-        const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
-        if (callbackPathOrUrl && (typeof callbackPathOrUrl !== 'string')) {
-            callbackPathOrUrl = undefined;
-            console.warn('callbackPathOrUrl path is not a string');
-        }
-        const path = (callbackPathOrUrl === null || callbackPathOrUrl === undefined) ? location.pathname + (location.search || '') + (location.hash || '') : callbackPathOrUrl;
-        let isUri = false;
-        if (callbackPathOrUrl) {
-            isUri = callbackPathOrUrl.includes('https://') || callbackPathOrUrl.includes('http://');
-        }
-        const url = isUri ? callbackPathOrUrl : window.location.origin + path;
-        // @ts-ignore
-        const idToken = this.tokens ? this.tokens.idToken : '';
-        try {
-            const revocationEndpoint = oidcServerConfiguration.revocationEndpoint;
-            if (revocationEndpoint) {
-                const promises = [];
-                if (this.tokens.accessToken) {
-                    const revokeAccessTokenPromise = performRevocationRequestAsync(revocationEndpoint, this.tokens.accessToken, TOKEN_TYPE.access_token, configuration.client_id);
-                    promises.push(revokeAccessTokenPromise);
-                }
-                if (this.tokens.refreshToken) {
-                    const revokeRefreshTokenPromise = performRevocationRequestAsync(revocationEndpoint, this.tokens.refreshToken, TOKEN_TYPE.refresh_token, configuration.client_id);
-                    promises.push(revokeRefreshTokenPromise);
-                }
-                if (promises.length > 0) {
-                    await Promise.all(promises);
-                }
-            }
-        } catch (exception) {
-            console.warn(exception);
-        }
-        // @ts-ignore
-        const sub = this.tokens && this.tokens.idTokenPayload ? this.tokens.idTokenPayload.sub : null;
-        await this.destroyAsync('LOGGED_OUT');
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        for (const [key, oidc] of Object.entries(oidcDatabase)) {
-            if (oidc !== this) {
-                // @ts-ignore
-                await oidc.logoutSameTabAsync(this.configuration.client_id, sub);
-            }
-        }
-
-        if (oidcServerConfiguration.endSessionEndpoint) {
-            if (!extras) {
-                extras = {
-                    id_token_hint: idToken,
-                };
-                if (callbackPathOrUrl !== null) {
-                    extras.post_logout_redirect_uri = url;
-                }
-            }
-            let queryString = '';
-            if (extras) {
-                for (const [key, value] of Object.entries(extras)) {
-                    if (queryString === '') {
-                        queryString += '?';
-                    } else {
-                        queryString += '&';
-                    }
-                    queryString += `${key}=${encodeURIComponent(value)}`;
-                }
-            }
-            window.location.href = `${oidcServerConfiguration.endSessionEndpoint}${queryString}`;
-        } else {
-            window.location.reload();
+        if (this.logoutPromise) {
+            return this.logoutPromise;
         }
+        this.logoutPromise = logoutAsync(this, oidcDatabase)(callbackPathOrUrl, extras);
+        return this.logoutPromise.then(result => {
+            this.logoutPromise = null;
+            return result;
+        });
     }
   }
 

package/src/oidc/vanilla/requests.spec.ts

@@ -0,0 +1,4 @@
+
+test('performAuthorizationRequestAsync', async () => {
+    expect(true).toBe(true);
+});

package/src/oidc/vanilla/requests.ts

@@ -1,6 +1,8 @@
 import { getFromCache, setCache } from './cache';
+import { deriveChallengeAsync, generateRandom } from './crypto';
 import { OidcAuthorizationServiceConfiguration } from './oidc';
 import { parseOriginalTokens } from './parseTokens';
+import { StringMap } from './types';
 
 const oneHourSecond = 60 * 60;
 export const fetchFromIssuer = async (openIdIssuerUrl: string, timeCacheSecond = oneHourSecond, storage = window.sessionStorage):
@@ -112,3 +114,56 @@ export const performTokenRequestAsync = async (url, details, extras, oldTokens,
         data: parseOriginalTokens(tokens, oldTokens, tokenRenewMode),
     };
 };
+
+export const performAuthorizationRequestAsync = (storage: any) => async (url, extras: StringMap) => {
+    extras = extras ? { ...extras } : {};
+    const codeVerifier = generateRandom(128);
+    const codeChallenge = await deriveChallengeAsync(codeVerifier);
+    await storage.setCodeVerifierAsync(codeVerifier);
+    await storage.setStateAsync(extras.state);
+    extras.code_challenge = codeChallenge;
+    extras.code_challenge_method = 'S256';
+    let queryString = '';
+    if (extras) {
+        for (const [key, value] of Object.entries(extras)) {
+            if (queryString === '') {
+                queryString += '?';
+            } else {
+                queryString += '&';
+            }
+            queryString += `${key}=${encodeURIComponent(value)}`;
+        }
+    }
+    window.location.href = `${url}${queryString}`;
+};
+
+export const performFirstTokenRequestAsync = (storage:any) => async (url, extras, tokenRenewMode: string, timeoutMs = 10000) => {
+    extras = extras ? { ...extras } : {};
+    extras.code_verifier = await storage.getCodeVerifierAsync();
+    const formBody = [];
+    for (const property in extras) {
+        const encodedKey = encodeURIComponent(property);
+        const encodedValue = encodeURIComponent(extras[property]);
+        formBody.push(`${encodedKey}=${encodedValue}`);
+    }
+    const formBodyString = formBody.join('&');
+    const response = await internalFetch(url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+        },
+        body: formBodyString,
+    }, timeoutMs);
+    await Promise.all([storage.setCodeVerifierAsync(null), storage.setStateAsync(null)]);
+    if (response.status !== 200) {
+        return { success: false, status: response.status };
+    }
+    const tokens = await response.json();
+    return {
+        success: true,
+        data: {
+            state: extras.state,
+            tokens: parseOriginalTokens(tokens, null, tokenRenewMode),
+            },
+    };
+};

package/src/oidc/vanilla/route-utils.ts

@@ -18,7 +18,7 @@ export const getLocation = (href: string) => {
         }
     }
 
-    if (search) {
+    if (search.startsWith('?')) {
         search = search.slice(1);
     }
 
@@ -72,7 +72,7 @@ const parseQueryString = (queryString:string) => {
     // Convert the array of strings into an object
     for (i = 0, l = queries.length; i < l; i++) {
         temp = queries[i].split('=');
-        params[decodeURIComponent(temp[0])] = temp[1];
+        params[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
     }
 
     return params;

package/dist/vanilla/memoryStorageBackend.d.ts

@@ -1,11 +0,0 @@
-export declare type ItemName = string | number;
-export declare class MemoryStorageBackend {
-    items: any;
-    private saveItemsAsync;
-    constructor(saveItemsAsync: any, items?: {});
-    getItem(name: ItemName): Promise<any>;
-    removeItem(name: ItemName): Promise<any>;
-    clear(): Promise<any>;
-    setItem(name: ItemName, value: any): Promise<any>;
-}
-//# sourceMappingURL=memoryStorageBackend.d.ts.map

package/dist/vanilla/memoryStorageBackend.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"memoryStorageBackend.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/memoryStorageBackend.ts"],"names":[],"mappings":"AAKA,oBAAY,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;AAEvC,qBAAa,oBAAoB;IACtB,KAAK,EAAE,GAAG,CAAC;IAClB,OAAO,CAAC,cAAc,CAAc;gBAExB,cAAc,KAAA,EAAE,KAAK,KAAK;IAUtC,OAAO,CAAC,IAAI,EAAE,QAAQ;IAItB,UAAU,CAAC,IAAI,EAAE,QAAQ;IAKzB,KAAK;IAKL,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG;CAIrC"}

package/dist/vanilla/memoryStorageBackend.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MemoryStorageBackend = void 0;
-class MemoryStorageBackend {
-    constructor(saveItemsAsync, items = {}) {
-        this.items = items;
-        this.saveItemsAsync = saveItemsAsync;
-        this.saveItemsAsync.bind(this);
-        this.getItem.bind(this);
-        this.removeItem.bind(this);
-        this.clear.bind(this);
-        this.setItem.bind(this);
-    }
-    getItem(name) {
-        return Promise.resolve(this.items[name]);
-    }
-    removeItem(name) {
-        delete this.items[name];
-        return this.saveItemsAsync(this.items);
-    }
-    clear() {
-        this.items = {};
-        return this.saveItemsAsync(this.items);
-    }
-    setItem(name, value) {
-        this.items[name] = value;
-        return this.saveItemsAsync(this.items);
-    }
-}
-exports.MemoryStorageBackend = MemoryStorageBackend;
-//# sourceMappingURL=memoryStorageBackend.js.map

package/dist/vanilla/memoryStorageBackend.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"memoryStorageBackend.js","sourceRoot":"","sources":["../../src/oidc/vanilla/memoryStorageBackend.ts"],"names":[],"mappings":";;;AAOA,MAAa,oBAAoB;IAI7B,YAAY,cAAc,EAAE,KAAK,GAAG,EAAE;QAClC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO,CAAC,IAAc;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,UAAU,CAAC,IAAc;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK;QACD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,CAAC,IAAc,EAAE,KAAU;QAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;CACJ;AAhCD,oDAgCC"}

package/dist/vanilla/noHashQueryStringUtils.d.ts

@@ -1,8 +0,0 @@
-import { BasicQueryStringUtils, LocationLike } from '@openid/appauth';
-export declare class NoHashQueryStringUtils extends BasicQueryStringUtils {
-    parse(input: LocationLike, _useHash: boolean): import("@openid/appauth").StringMap;
-}
-export declare class HashQueryStringUtils extends BasicQueryStringUtils {
-    parse(input: LocationLike, _useHash: boolean): import("@openid/appauth").StringMap;
-}
-//# sourceMappingURL=noHashQueryStringUtils.d.ts.map

package/dist/vanilla/noHashQueryStringUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"noHashQueryStringUtils.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEtE,qBAAa,sBAAuB,SAAQ,qBAAqB;IAC7D,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO;CAG/C;AAID,qBAAa,oBAAqB,SAAQ,qBAAqB;IAC3D,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO;CAoB/C"}

package/dist/vanilla/noHashQueryStringUtils.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HashQueryStringUtils = exports.NoHashQueryStringUtils = void 0;
-const appauth_1 = require("@openid/appauth");
-class NoHashQueryStringUtils extends appauth_1.BasicQueryStringUtils {
-    parse(input, _useHash) {
-        return super.parse(input, false /* never use hash */);
-    }
-}
-exports.NoHashQueryStringUtils = NoHashQueryStringUtils;
-const keys = ['code', 'session_state', 'state'];
-class HashQueryStringUtils extends appauth_1.BasicQueryStringUtils {
-    parse(input, _useHash) {
-        const output = super.parse(input, true /* use hash */);
-        // Fix AppAuthJs behavior
-        let propertyToDelelete = null;
-        Object.entries(output).forEach(([key, value]) => {
-            keys.forEach(k => {
-                if (key.endsWith(`?${k}`)) {
-                    output[k] = value;
-                    propertyToDelelete = key;
-                }
-            });
-        });
-        if (propertyToDelelete) {
-            delete output[propertyToDelelete];
-        }
-        return output;
-    }
-}
-exports.HashQueryStringUtils = HashQueryStringUtils;
-//# sourceMappingURL=noHashQueryStringUtils.js.map

package/dist/vanilla/noHashQueryStringUtils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"noHashQueryStringUtils.js","sourceRoot":"","sources":["../../src/oidc/vanilla/noHashQueryStringUtils.ts"],"names":[],"mappings":";;;AAAA,6CAAsE;AAEtE,MAAa,sBAAuB,SAAQ,+BAAqB;IAC7D,KAAK,CAAC,KAAmB,EAAE,QAAiB;QACxC,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC1D,CAAC;CACJ;AAJD,wDAIC;AAED,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;AAEhD,MAAa,oBAAqB,SAAQ,+BAAqB;IAC3D,KAAK,CAAC,KAAmB,EAAE,QAAiB;QACxC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAEvD,yBAAyB;QACzB,IAAI,kBAAkB,GAAG,IAAI,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC5C,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACb,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;oBACvB,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;oBAClB,kBAAkB,GAAG,GAAG,CAAC;iBAC5B;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,IAAI,kBAAkB,EAAE;YACpB,OAAO,MAAM,CAAC,kBAAkB,CAAC,CAAC;SACrC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArBD,oDAqBC"}

package/src/oidc/vanilla/memoryStorageBackend.ts

@@ -1,40 +0,0 @@
-
-interface SaveItemsFn {
-    (items:any):Promise<any>;
-}
-
-export type ItemName = string | number;
-
-export class MemoryStorageBackend {
-    public items: any;
-    private saveItemsAsync: SaveItemsFn;
-
-    constructor(saveItemsAsync, items = {}) {
-        this.items = items;
-        this.saveItemsAsync = saveItemsAsync;
-        this.saveItemsAsync.bind(this);
-        this.getItem.bind(this);
-        this.removeItem.bind(this);
-        this.clear.bind(this);
-        this.setItem.bind(this);
-    }
-
-    getItem(name: ItemName) {
-        return Promise.resolve(this.items[name]);
-    }
-
-    removeItem(name: ItemName) {
-        delete this.items[name];
-        return this.saveItemsAsync(this.items);
-    }
-
-    clear() {
-        this.items = {};
-        return this.saveItemsAsync(this.items);
-    }
-
-    setItem(name: ItemName, value: any) {
-        this.items[name] = value;
-        return this.saveItemsAsync(this.items);
-    }
-}

package/src/oidc/vanilla/noHashQueryStringUtils.ts

@@ -1,32 +0,0 @@
-import { BasicQueryStringUtils, LocationLike } from '@openid/appauth';
-
-export class NoHashQueryStringUtils extends BasicQueryStringUtils {
-    parse(input: LocationLike, _useHash: boolean) {
-        return super.parse(input, false /* never use hash */);
-    }
-}
-
-const keys = ['code', 'session_state', 'state'];
-
-export class HashQueryStringUtils extends BasicQueryStringUtils {
-    parse(input: LocationLike, _useHash: boolean) {
-        const output = super.parse(input, true /* use hash */);
-
-        // Fix AppAuthJs behavior
-        let propertyToDelelete = null;
-        Object.entries(output).forEach(([key, value]) => {
-            keys.forEach(k => {
-                if (key.endsWith(`?${k}`)) {
-                    output[k] = value;
-                    propertyToDelelete = key;
-                }
-            });
-        });
-
-        if (propertyToDelelete) {
-            delete output[propertyToDelelete];
-        }
-
-        return output;
-    }
-}