@azure/msal-common 14.3.0 → 14.4.1-beta.0

package/dist/utils/StringUtils.mjs

@@ -1,99 +1,99 @@
-/*! @azure/msal-common v14.3.0 2023-10-30 */
+/*! @azure/msal-common v14.4.1-beta.0 2023-11-14 */
 'use strict';
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-/**
- * @hidden
- */
-class StringUtils {
-    /**
-     * Check if stringified object is empty
-     * @param strObj
-     */
-    static isEmptyObj(strObj) {
-        if (strObj) {
-            try {
-                const obj = JSON.parse(strObj);
-                return Object.keys(obj).length === 0;
-            }
-            catch (e) { }
-        }
-        return true;
-    }
-    static startsWith(str, search) {
-        return str.indexOf(search) === 0;
-    }
-    static endsWith(str, search) {
-        return (str.length >= search.length &&
-            str.lastIndexOf(search) === str.length - search.length);
-    }
-    /**
-     * Parses string into an object.
-     *
-     * @param query
-     */
-    static queryStringToObject(query) {
-        const obj = {};
-        const params = query.split("&");
-        const decode = (s) => decodeURIComponent(s.replace(/\+/g, " "));
-        params.forEach((pair) => {
-            if (pair.trim()) {
-                const [key, value] = pair.split(/=(.+)/g, 2); // Split on the first occurence of the '=' character
-                if (key && value) {
-                    obj[decode(key)] = decode(value);
-                }
-            }
-        });
-        return obj;
-    }
-    /**
-     * Trims entries in an array.
-     *
-     * @param arr
-     */
-    static trimArrayEntries(arr) {
-        return arr.map((entry) => entry.trim());
-    }
-    /**
-     * Removes empty strings from array
-     * @param arr
-     */
-    static removeEmptyStringsFromArray(arr) {
-        return arr.filter((entry) => {
-            return !!entry;
-        });
-    }
-    /**
-     * Attempts to parse a string into JSON
-     * @param str
-     */
-    static jsonParseHelper(str) {
-        try {
-            return JSON.parse(str);
-        }
-        catch (e) {
-            return null;
-        }
-    }
-    /**
-     * Tests if a given string matches a given pattern, with support for wildcards and queries.
-     * @param pattern Wildcard pattern to string match. Supports "*" for wildcards and "?" for queries
-     * @param input String to match against
-     */
-    static matchPattern(pattern, input) {
-        /**
-         * Wildcard support: https://stackoverflow.com/a/3117248/4888559
-         * Queries: replaces "?" in string with escaped "\?" for regex test
-         */
-        // eslint-disable-next-line security/detect-non-literal-regexp
-        const regex = new RegExp(pattern
-            .replace(/\\/g, "\\\\")
-            .replace(/\*/g, "[^ ]*")
-            .replace(/\?/g, "\\?"));
-        return regex.test(input);
-    }
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * @hidden
+ */
+class StringUtils {
+    /**
+     * Check if stringified object is empty
+     * @param strObj
+     */
+    static isEmptyObj(strObj) {
+        if (strObj) {
+            try {
+                const obj = JSON.parse(strObj);
+                return Object.keys(obj).length === 0;
+            }
+            catch (e) { }
+        }
+        return true;
+    }
+    static startsWith(str, search) {
+        return str.indexOf(search) === 0;
+    }
+    static endsWith(str, search) {
+        return (str.length >= search.length &&
+            str.lastIndexOf(search) === str.length - search.length);
+    }
+    /**
+     * Parses string into an object.
+     *
+     * @param query
+     */
+    static queryStringToObject(query) {
+        const obj = {};
+        const params = query.split("&");
+        const decode = (s) => decodeURIComponent(s.replace(/\+/g, " "));
+        params.forEach((pair) => {
+            if (pair.trim()) {
+                const [key, value] = pair.split(/=(.+)/g, 2); // Split on the first occurence of the '=' character
+                if (key && value) {
+                    obj[decode(key)] = decode(value);
+                }
+            }
+        });
+        return obj;
+    }
+    /**
+     * Trims entries in an array.
+     *
+     * @param arr
+     */
+    static trimArrayEntries(arr) {
+        return arr.map((entry) => entry.trim());
+    }
+    /**
+     * Removes empty strings from array
+     * @param arr
+     */
+    static removeEmptyStringsFromArray(arr) {
+        return arr.filter((entry) => {
+            return !!entry;
+        });
+    }
+    /**
+     * Attempts to parse a string into JSON
+     * @param str
+     */
+    static jsonParseHelper(str) {
+        try {
+            return JSON.parse(str);
+        }
+        catch (e) {
+            return null;
+        }
+    }
+    /**
+     * Tests if a given string matches a given pattern, with support for wildcards and queries.
+     * @param pattern Wildcard pattern to string match. Supports "*" for wildcards and "?" for queries
+     * @param input String to match against
+     */
+    static matchPattern(pattern, input) {
+        /**
+         * Wildcard support: https://stackoverflow.com/a/3117248/4888559
+         * Queries: replaces "?" in string with escaped "\?" for regex test
+         */
+        // eslint-disable-next-line security/detect-non-literal-regexp
+        const regex = new RegExp(pattern
+            .replace(/\\/g, "\\\\")
+            .replace(/\*/g, "[^ ]*")
+            .replace(/\?/g, "\\?"));
+        return regex.test(input);
+    }
 }
 
 export { StringUtils };

package/dist/utils/TimeUtils.d.ts

@@ -1,28 +1,28 @@
-/**
- * Utility class which exposes functions for managing date and time operations.
- */
-export declare class TimeUtils {
-    /**
-     * return the current time in Unix time (seconds).
-     */
-    static nowSeconds(): number;
-    /**
-     * check if a token is expired based on given UTC time in seconds.
-     * @param expiresOn
-     */
-    static isTokenExpired(expiresOn: string, offset: number): boolean;
-    /**
-     * If the current time is earlier than the time that a token was cached at, we must discard the token
-     * i.e. The system clock was turned back after acquiring the cached token
-     * @param cachedAt
-     * @param offset
-     */
-    static wasClockTurnedBack(cachedAt: string): boolean;
-    /**
-     * Waits for t number of milliseconds
-     * @param t number
-     * @param value T
-     */
-    static delay<T>(t: number, value?: T): Promise<T | void>;
-}
+/**
+ * Utility class which exposes functions for managing date and time operations.
+ */
+export declare class TimeUtils {
+    /**
+     * return the current time in Unix time (seconds).
+     */
+    static nowSeconds(): number;
+    /**
+     * check if a token is expired based on given UTC time in seconds.
+     * @param expiresOn
+     */
+    static isTokenExpired(expiresOn: string, offset: number): boolean;
+    /**
+     * If the current time is earlier than the time that a token was cached at, we must discard the token
+     * i.e. The system clock was turned back after acquiring the cached token
+     * @param cachedAt
+     * @param offset
+     */
+    static wasClockTurnedBack(cachedAt: string): boolean;
+    /**
+     * Waits for t number of milliseconds
+     * @param t number
+     * @param value T
+     */
+    static delay<T>(t: number, value?: T): Promise<T | void>;
+}
 //# sourceMappingURL=TimeUtils.d.ts.map

package/dist/utils/TimeUtils.mjs

@@ -1,49 +1,49 @@
-/*! @azure/msal-common v14.3.0 2023-10-30 */
+/*! @azure/msal-common v14.4.1-beta.0 2023-11-14 */
 'use strict';
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-/**
- * Utility class which exposes functions for managing date and time operations.
- */
-class TimeUtils {
-    /**
-     * return the current time in Unix time (seconds).
-     */
-    static nowSeconds() {
-        // Date.getTime() returns in milliseconds.
-        return Math.round(new Date().getTime() / 1000.0);
-    }
-    /**
-     * check if a token is expired based on given UTC time in seconds.
-     * @param expiresOn
-     */
-    static isTokenExpired(expiresOn, offset) {
-        // check for access token expiry
-        const expirationSec = Number(expiresOn) || 0;
-        const offsetCurrentTimeSec = TimeUtils.nowSeconds() + offset;
-        // If current time + offset is greater than token expiration time, then token is expired.
-        return offsetCurrentTimeSec > expirationSec;
-    }
-    /**
-     * If the current time is earlier than the time that a token was cached at, we must discard the token
-     * i.e. The system clock was turned back after acquiring the cached token
-     * @param cachedAt
-     * @param offset
-     */
-    static wasClockTurnedBack(cachedAt) {
-        const cachedAtSec = Number(cachedAt);
-        return cachedAtSec > TimeUtils.nowSeconds();
-    }
-    /**
-     * Waits for t number of milliseconds
-     * @param t number
-     * @param value T
-     */
-    static delay(t, value) {
-        return new Promise((resolve) => setTimeout(() => resolve(value), t));
-    }
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * Utility class which exposes functions for managing date and time operations.
+ */
+class TimeUtils {
+    /**
+     * return the current time in Unix time (seconds).
+     */
+    static nowSeconds() {
+        // Date.getTime() returns in milliseconds.
+        return Math.round(new Date().getTime() / 1000.0);
+    }
+    /**
+     * check if a token is expired based on given UTC time in seconds.
+     * @param expiresOn
+     */
+    static isTokenExpired(expiresOn, offset) {
+        // check for access token expiry
+        const expirationSec = Number(expiresOn) || 0;
+        const offsetCurrentTimeSec = TimeUtils.nowSeconds() + offset;
+        // If current time + offset is greater than token expiration time, then token is expired.
+        return offsetCurrentTimeSec > expirationSec;
+    }
+    /**
+     * If the current time is earlier than the time that a token was cached at, we must discard the token
+     * i.e. The system clock was turned back after acquiring the cached token
+     * @param cachedAt
+     * @param offset
+     */
+    static wasClockTurnedBack(cachedAt) {
+        const cachedAtSec = Number(cachedAt);
+        return cachedAtSec > TimeUtils.nowSeconds();
+    }
+    /**
+     * Waits for t number of milliseconds
+     * @param t number
+     * @param value T
+     */
+    static delay(t, value) {
+        return new Promise((resolve) => setTimeout(() => resolve(value), t));
+    }
 }
 
 export { TimeUtils };

package/dist/utils/UrlUtils.d.ts

@@ -0,0 +1,11 @@
+import { ServerAuthorizationCodeResponse } from "../response/ServerAuthorizationCodeResponse";
+/**
+ * Parses hash string from given string. Returns empty string if no hash symbol is found.
+ * @param hashString
+ */
+export declare function stripLeadingHashOrQuery(responseString: string): string;
+/**
+ * Returns URL hash as server auth code response object.
+ */
+export declare function getDeserializedResponse(responseString: string): ServerAuthorizationCodeResponse | null;
+//# sourceMappingURL=UrlUtils.d.ts.map

package/dist/utils/UrlUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UrlUtils.d.ts","sourceRoot":"","sources":["../../src/utils/UrlUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,+BAA+B,EAAE,MAAM,6CAA6C,CAAC;AAM9F;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAWtE;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACnC,cAAc,EAAE,MAAM,GACvB,+BAA+B,GAAG,IAAI,CA0BxC"}

package/dist/utils/UrlUtils.mjs

@@ -0,0 +1,52 @@
+/*! @azure/msal-common v14.4.1-beta.0 2023-11-14 */
+'use strict';
+import { createClientAuthError } from '../error/ClientAuthError.mjs';
+import { hashNotDeserialized } from '../error/ClientAuthErrorCodes.mjs';
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * Parses hash string from given string. Returns empty string if no hash symbol is found.
+ * @param hashString
+ */
+function stripLeadingHashOrQuery(responseString) {
+    if (responseString.startsWith("#/")) {
+        return responseString.substring(2);
+    }
+    else if (responseString.startsWith("#") ||
+        responseString.startsWith("?")) {
+        return responseString.substring(1);
+    }
+    return responseString;
+}
+/**
+ * Returns URL hash as server auth code response object.
+ */
+function getDeserializedResponse(responseString) {
+    // Check if given hash is empty
+    if (!responseString || responseString.indexOf("=") < 0) {
+        return null;
+    }
+    try {
+        // Strip the # or ? symbol if present
+        const normalizedResponse = stripLeadingHashOrQuery(responseString);
+        // If # symbol was not present, above will return empty string, so give original hash value
+        const deserializedHash = Object.fromEntries(new URLSearchParams(normalizedResponse));
+        // Check for known response properties
+        if (deserializedHash.code ||
+            deserializedHash.error ||
+            deserializedHash.error_description ||
+            deserializedHash.state) {
+            return deserializedHash;
+        }
+    }
+    catch (e) {
+        throw createClientAuthError(hashNotDeserialized);
+    }
+    return null;
+}
+
+export { getDeserializedResponse, stripLeadingHashOrQuery };
+//# sourceMappingURL=UrlUtils.mjs.map

package/dist/utils/UrlUtils.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"UrlUtils.mjs","sources":["../../src/utils/UrlUtils.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAKA;AAMA;;;AAIA;AAaA;;AAEG;AACa,SAAA,uBAAA,CAAA,cACE,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,95 +1,95 @@
 {
-  "name": "@azure/msal-common",
-  "author": {
-    "name": "Microsoft",
-    "email": "nugetaad@microsoft.com",
-    "url": "https://www.microsoft.com"
-  },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
-  },
-  "version": "14.3.0",
-  "description": "Microsoft Authentication Library for js",
-  "keywords": [
-    "implicit",
-    "authorization code",
-    "PKCE",
-    "js",
-    "AAD",
-    "msal",
-    "oauth"
-  ],
-  "sideEffects": false,
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "module": "./dist/index.mjs",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs",
-      "default": "./dist/index.mjs"
+    "name": "@azure/msal-common",
+    "author": {
+        "name": "Microsoft",
+        "email": "nugetaad@microsoft.com",
+        "url": "https://www.microsoft.com"
     },
-    "./package.json": "./package.json"
-  },
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "scripts": {
-    "clean": "shx rm -rf dist lib",
-    "clean:coverage": "rimraf ../../.nyc_output/*",
-    "lint": "eslint src --ext .ts",
-    "lint:fix": "npm run lint -- --fix",
-    "test": "jest",
-    "test:coverage": "jest --coverage",
-    "test:coverage:only": "npm run clean:coverage && npm run test:coverage",
-    "build:modules": "rollup -c --strictDeprecations --bundleConfigAsCjs",
-    "build:modules:watch": "rollup -cw --bundleConfigAsCjs",
-    "build": "npm run clean && npm run build:modules",
-    "build:all": "npm run build",
-    "prepack": "npm run build",
-    "metadata:check": "ts-node scripts/metadata.ts",
-    "format:check": "npx prettier --ignore-path .gitignore --check src test",
-    "format:fix": "npx prettier --ignore-path .gitignore --write src test"
-  },
-  "beachball": {
-    "disallowedChangeTypes": [
-      "major"
-    ]
-  },
-  "devDependencies": {
-    "@babel/core": "^7.7.2",
-    "@babel/plugin-proposal-class-properties": "^7.7.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
-    "@babel/preset-env": "^7.7.1",
-    "@babel/preset-typescript": "^7.7.2",
-    "@rollup/plugin-typescript": "^11.0.0",
-    "@types/debug": "^4.1.5",
-    "@types/jest": "^29.5.0",
-    "@types/lodash": "^4.14.182",
-    "@types/node": "^20.3.1",
-    "@types/sinon": "^7.5.0",
-    "eslint-config-msal": "^0.0.0",
-    "jest": "^29.5.0",
-    "lodash": "^4.17.21",
-    "prettier": "2.8.7",
-    "rimraf": "^3.0.2",
-    "rollup": "^3.14.0",
-    "shx": "^0.3.2",
-    "sinon": "^7.5.0",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "tslib": "^1.10.0",
-    "typescript": "^4.9.5",
-    "yargs": "^17.5.1"
-  }
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
+    },
+    "version": "14.4.1-beta.0",
+    "description": "Microsoft Authentication Library for js",
+    "keywords": [
+        "implicit",
+        "authorization code",
+        "PKCE",
+        "js",
+        "AAD",
+        "msal",
+        "oauth"
+    ],
+    "sideEffects": false,
+    "module": "./dist/index.mjs",
+    "types": "./dist/index.d.ts",
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "module": "./dist/index.mjs",
+            "import": "./dist/index.mjs",
+            "require": "./dist/index.cjs",
+            "default": "./dist/index.mjs"
+        },
+        "./package.json": "./package.json"
+    },
+    "engines": {
+        "node": ">=0.8.0"
+    },
+    "directories": {
+        "test": "test"
+    },
+    "files": [
+        "dist",
+        "src"
+    ],
+    "scripts": {
+        "clean": "shx rm -rf dist lib",
+        "clean:coverage": "rimraf ../../.nyc_output/*",
+        "lint": "eslint src --ext .ts",
+        "lint:fix": "npm run lint -- --fix",
+        "test": "jest",
+        "test:coverage": "jest --coverage",
+        "test:coverage:only": "npm run clean:coverage && npm run test:coverage",
+        "build:modules": "rollup -c --strictDeprecations --bundleConfigAsCjs",
+        "build:modules:watch": "rollup -cw --bundleConfigAsCjs",
+        "build": "npm run clean && npm run build:modules",
+        "build:all": "npm run build",
+        "prepack": "npm run build",
+        "metadata:check": "ts-node scripts/metadata.ts",
+        "format:check": "npx prettier --ignore-path .gitignore --check src test",
+        "format:fix": "npx prettier --ignore-path .gitignore --write src test"
+    },
+    "beachball": {
+        "disallowedChangeTypes": [
+            "major"
+        ]
+    },
+    "devDependencies": {
+        "@babel/core": "^7.7.2",
+        "@babel/plugin-proposal-class-properties": "^7.7.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
+        "@babel/preset-env": "^7.7.1",
+        "@babel/preset-typescript": "^7.7.2",
+        "@rollup/plugin-typescript": "^11.0.0",
+        "@types/debug": "^4.1.5",
+        "@types/jest": "^29.5.0",
+        "@types/lodash": "^4.14.182",
+        "@types/node": "^20.3.1",
+        "@types/sinon": "^7.5.0",
+        "eslint-config-msal": "^0.0.0",
+        "jest": "^29.5.0",
+        "lodash": "^4.17.21",
+        "prettier": "2.8.7",
+        "rimraf": "^3.0.2",
+        "rollup": "^3.14.0",
+        "shx": "^0.3.2",
+        "sinon": "^7.5.0",
+        "ts-jest": "^29.1.0",
+        "ts-node": "^10.9.1",
+        "tslib": "^1.10.0",
+        "typescript": "^4.9.5",
+        "yargs": "^17.5.1"
+    }
 }

package/src/authority/Authority.ts

@@ -1205,12 +1205,11 @@ export class Authority {
                 regionalMetadata.authorization_endpoint,
                 azureRegion
             );
-        // TODO: Enquire on whether we should leave the query string or remove it before releasing the feature
+
         regionalMetadata.token_endpoint =
             Authority.buildRegionalAuthorityString(
                 regionalMetadata.token_endpoint,
-                azureRegion,
-                Constants.REGIONAL_AUTH_NON_MSI_QUERY_STRING
+                azureRegion
             );
 
         if (regionalMetadata.end_session_endpoint) {