@azure/msal-browser 5.0.0-alpha.0 → 5.0.1

package/package.json

@@ -1,117 +1,131 @@
 {
-    "name": "@azure/msal-browser",
-    "author": {
-        "name": "Microsoft",
-        "email": "nugetaad@microsoft.com",
-        "url": "https://www.microsoft.com"
+  "name": "@azure/msal-browser",
+  "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": "5.0.1",
+  "description": "Microsoft Authentication Library for js",
+  "keywords": [
+    "implicit",
+    "authorization code",
+    "PKCE",
+    "js",
+    "AAD",
+    "msal",
+    "oauth"
+  ],
+  "type": "module",
+  "sideEffects": false,
+  "main": "./lib/msal-browser.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./custom-auth": {
+      "import": {
+        "types": "./dist/custom-auth-path/custom_auth/index.d.ts",
+        "default": "./dist/custom-auth-path/custom_auth/index.mjs"
+      },
+      "require": {
+        "types": "./lib/custom-auth-path/types/custom_auth/index.d.ts",
+        "default": "./lib/custom-auth-path/msal-custom-auth.cjs"
+      }
     },
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
+    "./redirect-bridge": {
+      "import": {
+        "types": "./dist/redirect-bridge/redirect_bridge/index.d.ts",
+        "default": "./dist/redirect-bridge/redirect_bridge/index.mjs"
+      },
+      "require": {
+        "types": "./lib/redirect-bridge/types/redirect_bridge/index.d.ts",
+        "default": "./lib/redirect-bridge/msal-redirect-bridge.js"
+      }
     },
-    "version": "5.0.0-alpha.0",
-    "description": "Microsoft Authentication Library for js",
-    "keywords": [
-        "implicit",
-        "authorization code",
-        "PKCE",
-        "js",
-        "AAD",
-        "msal",
-        "oauth"
-    ],
-    "type": "module",
-    "sideEffects": false,
-    "main": "./lib/msal-browser.cjs",
-    "module": "./dist/index.mjs",
-    "types": "./dist/index.d.ts",
-    "exports": {
-        "./custom-auth": {
-            "import": {
-                "types": "./dist/custom-auth-path/custom_auth/index.d.ts",
-                "default": "./dist/custom-auth-path/custom_auth/index.mjs"
-            },
-            "require": {
-                "types": "./lib/custom-auth-path/types/custom_auth/index.d.ts",
-                "default": "./lib/custom-auth-path/msal-custom-auth.cjs"
-            }
-        },
-        ".": {
-            "import": {
-                "types": "./dist/index.d.ts",
-                "default": "./dist/index.mjs"
-            },
-            "require": {
-                "types": "./lib/types/index.d.ts",
-                "default": "./lib/msal-browser.cjs"
-            }
-        },
-        "./package.json": "./package.json"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./lib/types/index.d.ts",
+        "default": "./lib/msal-browser.cjs"
+      }
     },
-    "engines": {
-        "node": ">=0.8.0"
-    },
-    "beachball": {
-        "disallowedChangeTypes": []
-    },
-    "directories": {
-        "test": "test"
-    },
-    "files": [
-        "dist",
-        "lib",
-        "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:all": "cd ../.. && npm run build --workspace=@azure/msal-common --workspace=@azure/msal-browser",
-        "build:modules": "rollup -c --strictDeprecations --bundleConfigAsCjs",
-        "build:modules:watch": "rollup -cw --bundleConfigAsCjs",
-        "build": "npm run clean && npm run build:modules",
-        "prepack": "npm run build:all",
-        "format:check": "prettier --ignore-path .gitignore --check src test",
-        "format:fix": "prettier --ignore-path .gitignore --write src test",
-        "apiExtractor": "api-extractor run"
-    },
-    "devDependencies": {
-        "@azure/storage-blob": "^12.2.1",
-        "@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",
-        "@microsoft/api-extractor": "^7.43.4",
-        "@rollup/plugin-node-resolve": "^15.0.1",
-        "@rollup/plugin-terser": "^0.4.0",
-        "@rollup/plugin-typescript": "^11.0.0",
-        "@types/jest": "^29.5.0",
-        "@types/node": "^20.3.1",
-        "dotenv": "^8.2.0",
-        "eslint-config-msal": "file:../../shared-configs/eslint-config-msal",
-        "fake-indexeddb": "^3.1.3",
-        "jest": "^29.5.0",
-        "jest-environment-jsdom": "^29.5.0",
-        "jest-junit": "^16.0.0",
-        "msal-test-utils": "file:../../shared-test-utils",
-        "prettier": "^2.8.7",
-        "rimraf": "^3.0.0",
-        "rollup": "^4.22.4",
-        "rollup-msal": "file:../../shared-configs/rollup-msal",
-        "shx": "^0.3.2",
-        "ssri": "^8.0.1",
-        "ts-jest": "^29.2.5",
-        "ts-jest-resolver": "^2.0.1",
-        "tslib": "^1.10.0",
-        "typescript": "^4.9.5"
-    },
-    "dependencies": {
-        "@azure/msal-common": "16.0.0-alpha.0"
-    }
+    "./package.json": "./package.json"
+  },
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "beachball": {
+    "disallowedChangeTypes": []
+  },
+  "directories": {
+    "test": "test"
+  },
+  "files": [
+    "dist",
+    "lib",
+    "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:all": "cd ../.. && npm run build --workspace=@azure/msal-common --workspace=@azure/msal-browser",
+    "build:all:debug": "cd ../.. && cross-env MSAL_MINIFY_LOGS=false npm run build --workspace=@azure/msal-common --workspace=@azure/msal-browser",
+    "build:modules": "rollup -c --strictDeprecations --bundleConfigAsCjs",
+    "build:modules:watch": "rollup -cw --bundleConfigAsCjs",
+    "build": "npm run clean && npm run build:modules",
+    "build:debug": "npm run clean && cross-env MSAL_MINIFY_LOGS=false npm run build:modules",
+    "decode-logs": "node scripts/decode-logs.cjs",
+    "prepack": "npm run build:all",
+    "format:check": "prettier --ignore-path .gitignore --check src test",
+    "format:fix": "prettier --ignore-path .gitignore --write src test",
+    "apiExtractor": "api-extractor run"
+  },
+  "devDependencies": {
+    "@azure/storage-blob": "^12.2.1",
+    "@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",
+    "@microsoft/api-extractor": "^7.43.4",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-terser": "^0.4.0",
+    "@rollup/plugin-typescript": "^11.0.0",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^20.3.1",
+    "cross-env": "^10.1.0",
+    "dotenv": "^8.2.0",
+    "eslint-config-msal": "file:../../shared-configs/eslint-config-msal",
+    "fake-indexeddb": "^3.1.3",
+    "jest": "^29.5.0",
+    "jest-environment-jsdom": "^29.5.0",
+    "jest-junit": "^16.0.0",
+    "msal-test-utils": "file:../../shared-test-utils",
+    "prettier": "^2.8.7",
+    "rimraf": "^3.0.0",
+    "rollup": "^4.22.4",
+    "rollup-msal": "file:../../shared-configs/rollup-msal",
+    "shx": "^0.3.2",
+    "ssri": "^8.0.1",
+    "ts-jest": "^29.2.5",
+    "ts-jest-resolver": "^2.0.1",
+    "tslib": "^1.10.0",
+    "typescript": "^4.9.5"
+  },
+  "dependencies": {
+    "@azure/msal-common": "16.0.1"
+  }
 }

package/src/app/IPublicClientApplication.ts

@@ -28,7 +28,7 @@ import { EventCallbackFunction } from "../event/EventMessage.js";
 import { ClearCacheRequest } from "../request/ClearCacheRequest.js";
 import { InitializeApplicationRequest } from "../request/InitializeApplicationRequest.js";
 import { EventType } from "../event/EventType.js";
-import { HandleRedirectPromiseOptions } from "../controllers/IController.js";
+import { HandleRedirectPromiseOptions } from "../request/HandleRedirectPromiseOptions.js";
 
 export interface IPublicClientApplication {
     // TODO: Make request mandatory in the next major version?
@@ -49,7 +49,7 @@ export interface IPublicClientApplication {
     addPerformanceCallback(callback: PerformanceCallbackFunction): string;
     removePerformanceCallback(callbackId: string): boolean;
     getAccount(accountFilter: AccountFilter): AccountInfo | null;
-    getAllAccounts(): AccountInfo[];
+    getAllAccounts(accountFilter?: AccountFilter): AccountInfo[];
     handleRedirectPromise(
         options?: HandleRedirectPromiseOptions
     ): Promise<AuthenticationResult | null>;

package/src/app/PublicClientApplication.ts

@@ -10,10 +10,7 @@ import { RedirectRequest } from "../request/RedirectRequest.js";
 import { SilentRequest } from "../request/SilentRequest.js";
 import { WrapperSKU } from "../utils/BrowserConstants.js";
 import { IPublicClientApplication } from "./IPublicClientApplication.js";
-import {
-    HandleRedirectPromiseOptions,
-    IController,
-} from "../controllers/IController.js";
+import { IController } from "../controllers/IController.js";
 import {
     PerformanceCallbackFunction,
     AccountInfo,
@@ -22,7 +19,6 @@ import {
 } from "@azure/msal-common/browser";
 import { EndSessionRequest } from "../request/EndSessionRequest.js";
 import { SsoSilentRequest } from "../request/SsoSilentRequest.js";
-import * as ControllerFactory from "../controllers/ControllerFactory.js";
 import { StandardController } from "../controllers/StandardController.js";
 import {
     BrowserConfiguration,
@@ -38,6 +34,7 @@ import { NestedAppOperatingContext } from "../operatingcontext/NestedAppOperatin
 import { InitializeApplicationRequest } from "../request/InitializeApplicationRequest.js";
 import { EventType } from "../event/EventType.js";
 import { createNewGuid } from "../crypto/BrowserCrypto.js";
+import { HandleRedirectPromiseOptions } from "../request/HandleRedirectPromiseOptions.js";
 
 /**
  * The PublicClientApplication class is the object exposed by the library to perform authentication and authorization functions in Single Page Applications
@@ -45,23 +42,6 @@ import { createNewGuid } from "../crypto/BrowserCrypto.js";
  */
 export class PublicClientApplication implements IPublicClientApplication {
     protected controller: IController;
-    protected isBroker: boolean = false;
-
-    /**
-     * Creates StandardController and passes it to the PublicClientApplication
-     *
-     * @param configuration {Configuration}
-     */
-    public static async createPublicClientApplication(
-        configuration: Configuration
-    ): Promise<IPublicClientApplication> {
-        const controller = await ControllerFactory.createV3Controller(
-            configuration
-        );
-        const pca = new PublicClientApplication(configuration, controller);
-
-        return pca;
-    }
 
     /**
      * @constructor
@@ -96,7 +76,7 @@ export class PublicClientApplication implements IPublicClientApplication {
      * @param request {?InitializeApplicationRequest}
      */
     async initialize(request?: InitializeApplicationRequest): Promise<void> {
-        return this.controller.initialize(request, this.isBroker);
+        return this.controller.initialize(request);
     }
 
     /**
@@ -373,23 +353,29 @@ export class PublicClientApplication implements IPublicClientApplication {
  * falls back to StandardController if NestedAppAuthController is not available
  *
  * @param configuration
+ * @param correlationId
+ * @param pcaFactory
  * @returns IPublicClientApplication
  *
  */
 export async function createNestablePublicClientApplication(
-    configuration: Configuration
+    configuration: Configuration,
+    correlationId?: string,
+    pcaFactory?: (
+        configuration: Configuration,
+        controller: IController
+    ) => IPublicClientApplication
 ): Promise<IPublicClientApplication> {
-    const correlationId = createNewGuid();
+    const cid = correlationId || createNewGuid();
     const nestedAppAuth = new NestedAppOperatingContext(configuration);
-    await nestedAppAuth.initialize(correlationId);
+    await nestedAppAuth.initialize(cid);
 
     if (nestedAppAuth.isAvailable()) {
         const controller = new NestedAppAuthController(nestedAppAuth);
-        const nestablePCA = new PublicClientApplication(
-            configuration,
-            controller
-        );
-        await nestablePCA.initialize({ correlationId });
+        const nestablePCA = pcaFactory
+            ? pcaFactory(configuration, controller)
+            : new PublicClientApplication(configuration, controller);
+        await nestablePCA.initialize({ correlationId: cid });
         return nestablePCA;
     }
 

package/src/cache/AccountManager.ts

@@ -61,148 +61,6 @@ export function getAccount(
     }
 }
 
-/**
- * Returns the signed in account matching username.
- * (the account object is created at the time of successful login)
- * or null when no matching account is found.
- * This API is provided for convenience but getAccountById should be used for best reliability
- * @param username
- * @returns The account object stored in MSAL
- */
-export function getAccountByUsername(
-    username: string,
-    logger: Logger,
-    browserStorage: BrowserCacheManager,
-    correlationId: string
-): AccountInfo | null {
-    logger.trace("getAccountByUsername called", correlationId);
-    if (!username) {
-        logger.warning(
-            "getAccountByUsername: No username provided",
-            correlationId
-        );
-        return null;
-    }
-
-    const account = browserStorage.getAccountInfoFilteredBy(
-        {
-            username,
-        },
-        correlationId
-    );
-    if (account) {
-        logger.verbose(
-            "getAccountByUsername: Account matching username found, returning",
-            correlationId
-        );
-        logger.verbosePii(
-            `getAccountByUsername: Returning signed-in accounts matching username: '${username}'`,
-            correlationId
-        );
-        return account;
-    } else {
-        logger.verbose(
-            "getAccountByUsername: No matching account found, returning null",
-            correlationId
-        );
-        return null;
-    }
-}
-
-/**
- * Returns the signed in account matching homeAccountId.
- * (the account object is created at the time of successful login)
- * or null when no matching account is found
- * @param homeAccountId
- * @returns The account object stored in MSAL
- */
-export function getAccountByHomeId(
-    homeAccountId: string,
-    logger: Logger,
-    browserStorage: BrowserCacheManager,
-    correlationId: string
-): AccountInfo | null {
-    logger.trace("getAccountByHomeId called", correlationId);
-    if (!homeAccountId) {
-        logger.warning(
-            "getAccountByHomeId: No homeAccountId provided",
-            correlationId
-        );
-        return null;
-    }
-
-    const account = browserStorage.getAccountInfoFilteredBy(
-        {
-            homeAccountId,
-        },
-        correlationId
-    );
-    if (account) {
-        logger.verbose(
-            "getAccountByHomeId: Account matching homeAccountId found, returning",
-            correlationId
-        );
-        logger.verbosePii(
-            `getAccountByHomeId: Returning signed-in accounts matching homeAccountId: '${homeAccountId}'`,
-            correlationId
-        );
-        return account;
-    } else {
-        logger.verbose(
-            "getAccountByHomeId: No matching account found, returning null",
-            correlationId
-        );
-        return null;
-    }
-}
-
-/**
- * Returns the signed in account matching localAccountId.
- * (the account object is created at the time of successful login)
- * or null when no matching account is found
- * @param localAccountId
- * @returns The account object stored in MSAL
- */
-export function getAccountByLocalId(
-    localAccountId: string,
-    logger: Logger,
-    browserStorage: BrowserCacheManager,
-    correlationId: string
-): AccountInfo | null {
-    logger.trace("getAccountByLocalId called", correlationId);
-    if (!localAccountId) {
-        logger.warning(
-            "getAccountByLocalId: No localAccountId provided",
-            correlationId
-        );
-        return null;
-    }
-
-    const account = browserStorage.getAccountInfoFilteredBy(
-        {
-            localAccountId,
-        },
-        correlationId
-    );
-    if (account) {
-        logger.verbose(
-            "getAccountByLocalId: Account matching localAccountId found, returning",
-            correlationId
-        );
-        logger.verbosePii(
-            `getAccountByLocalId: Returning signed-in accounts matching localAccountId: '${localAccountId}'`,
-            correlationId
-        );
-        return account;
-    } else {
-        logger.verbose(
-            "getAccountByLocalId: No matching account found, returning null",
-            correlationId
-        );
-        return null;
-    }
-}
-
 /**
  * Sets the account to use as the active account. If no account is passed to the acquireToken APIs, then MSAL will use this active account.
  * @param account