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

package/src/controllers/NestedAppAuthController.ts

@@ -5,7 +5,6 @@
 
 import {
     CommonAuthorizationUrlRequest,
-    CommonSilentFlowRequest,
     PerformanceCallbackFunction,
     AccountInfo,
     Logger,
@@ -19,6 +18,7 @@ import {
     AccountFilter,
     AuthError,
     AccountEntityUtils,
+    AuthToken,
 } from "@azure/msal-common/browser";
 import * as RootPerformanceEvents from "../telemetry/BrowserRootPerformanceEvents.js";
 import { BrowserConfiguration } from "../config/Configuration.js";
@@ -31,13 +31,12 @@ import { RedirectRequest } from "../request/RedirectRequest.js";
 import { SilentRequest } from "../request/SilentRequest.js";
 import { SsoSilentRequest } from "../request/SsoSilentRequest.js";
 import {
-    ApiId,
     WrapperSKU,
     InteractionType,
     DEFAULT_REQUEST,
     CacheLookupPolicy,
 } from "../utils/BrowserConstants.js";
-import { IController, HandleRedirectPromiseOptions } from "./IController.js";
+import { IController } from "./IController.js";
 import { NestedAppOperatingContext } from "../operatingcontext/NestedAppOperatingContext.js";
 import { IBridgeProxy } from "../naa/IBridgeProxy.js";
 import { CryptoOps } from "../crypto/CryptoOps.js";
@@ -56,6 +55,8 @@ import * as AccountManager from "../cache/AccountManager.js";
 import { AccountContext } from "../naa/BridgeAccountContext.js";
 import { InitializeApplicationRequest } from "../request/InitializeApplicationRequest.js";
 import { createNewGuid } from "../crypto/BrowserCrypto.js";
+import { HandleRedirectPromiseOptions } from "../request/HandleRedirectPromiseOptions.js";
+
 export class NestedAppAuthController implements IController {
     // OperatingContext
     protected readonly operatingContext: NestedAppOperatingContext;
@@ -210,7 +211,7 @@ export class NestedAppAuthController implements IController {
             correlationId
         );
 
-        atPopupMeasurement?.add({ nestedAppAuthRequest: true });
+        atPopupMeasurement.add({ nestedAppAuthRequest: true });
 
         try {
             const naaRequest =
@@ -256,10 +257,14 @@ export class NestedAppAuthController implements IController {
                 idTokenSize: result.idToken.length,
             });
 
-            atPopupMeasurement.end({
-                success: true,
-                requestId: result.requestId,
-            });
+            atPopupMeasurement.end(
+                {
+                    success: true,
+                    requestId: result.requestId,
+                },
+                undefined,
+                result.account
+            );
 
             return result;
         } catch (e) {
@@ -278,7 +283,8 @@ export class NestedAppAuthController implements IController {
                 {
                     success: false,
                 },
-                e
+                e,
+                request.account
             );
 
             throw error;
@@ -318,11 +324,10 @@ export class NestedAppAuthController implements IController {
             correlationId
         );
 
-        ssoSilentMeasurement?.increment({
+        ssoSilentMeasurement.increment({
             visibilityChangeCount: 0,
         });
-
-        ssoSilentMeasurement?.add({
+        ssoSilentMeasurement.add({
             nestedAppAuthRequest: true,
         });
 
@@ -367,10 +372,14 @@ export class NestedAppAuthController implements IController {
                 accessTokenSize: result.accessToken.length,
                 idTokenSize: result.idToken.length,
             });
-            ssoSilentMeasurement?.end({
-                success: true,
-                requestId: result.requestId,
-            });
+            ssoSilentMeasurement?.end(
+                {
+                    success: true,
+                    requestId: result.requestId,
+                },
+                undefined,
+                result.account
+            );
             return result;
         } catch (e) {
             const error =
@@ -387,7 +396,8 @@ export class NestedAppAuthController implements IController {
                 {
                     success: false,
                 },
-                e
+                e,
+                request.account
             );
             throw error;
         }
@@ -451,13 +461,17 @@ export class NestedAppAuthController implements IController {
                 InteractionType.Silent,
                 result
             );
-            atsMeasurement?.add({
-                accessTokenSize: result?.accessToken.length,
-                idTokenSize: result?.idToken.length,
-            });
-            atsMeasurement?.end({
-                success: true,
+            atsMeasurement.add({
+                accessTokenSize: result.accessToken.length,
+                idTokenSize: result.idToken.length,
             });
+            atsMeasurement.end(
+                {
+                    success: true,
+                },
+                undefined,
+                result.account
+            );
             return result;
         }
 
@@ -471,9 +485,13 @@ export class NestedAppAuthController implements IController {
             InteractionType.Silent,
             null
         );
-        atsMeasurement?.end({
-            success: false,
-        });
+        atsMeasurement.end(
+            {
+                success: false,
+            },
+            undefined,
+            request.account
+        );
 
         return null;
     }
@@ -613,44 +631,6 @@ export class NestedAppAuthController implements IController {
         throw NestedAppAuthError.createUnsupportedError();
     }
 
-    /**
-     * acquireTokenNative flow is not currently supported in nested app auth
-     * @param request
-     * @param apiId
-     * @param accountId
-     */
-    acquireTokenNative(
-        request: // eslint-disable-line @typescript-eslint/no-unused-vars
-        | SilentRequest
-            | Partial<
-                  Omit<
-                      CommonAuthorizationUrlRequest,
-                      | "responseMode"
-                      | "earJwk"
-                      | "codeChallenge"
-                      | "codeChallengeMethod"
-                      | "platformBroker"
-                  >
-              >
-            | PopupRequest,
-        apiId: ApiId, // eslint-disable-line @typescript-eslint/no-unused-vars
-        accountId?: string | undefined // eslint-disable-line @typescript-eslint/no-unused-vars
-    ): Promise<AuthenticationResult> {
-        throw NestedAppAuthError.createUnsupportedError();
-    }
-
-    /**
-     * acquireTokenByRefreshToken flow is not currently supported in nested app auth
-     * @param commonRequest
-     * @param silentRequest
-     */
-    acquireTokenByRefreshToken(
-        commonRequest: CommonSilentFlowRequest, // eslint-disable-line @typescript-eslint/no-unused-vars
-        silentRequest: SilentRequest // eslint-disable-line @typescript-eslint/no-unused-vars
-    ): Promise<AuthenticationResult> {
-        throw NestedAppAuthError.createUnsupportedError();
-    }
-
     /**
      * Adds event callbacks to array
      * @param callback
@@ -712,55 +692,6 @@ export class NestedAppAuthController implements IController {
         );
     }
 
-    /**
-     * 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
-     */
-    getAccountByUsername(username: string): AccountInfo | null {
-        return AccountManager.getAccountByUsername(
-            username,
-            this.logger,
-            this.browserStorage,
-            createNewGuid()
-        );
-    }
-
-    /**
-     * 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
-     */
-    getAccountByHomeId(homeAccountId: string): AccountInfo | null {
-        return AccountManager.getAccountByHomeId(
-            homeAccountId,
-            this.logger,
-            this.browserStorage,
-            createNewGuid()
-        );
-    }
-
-    /**
-     * 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
-     */
-    getAccountByLocalId(localAccountId: string): AccountInfo | null {
-        return AccountManager.getAccountByLocalId(
-            localAccountId,
-            this.logger,
-            this.browserStorage,
-            createNewGuid()
-        );
-    }
-
     /**
      * 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
@@ -904,7 +835,8 @@ export class NestedAppAuthController implements IController {
             );
         await this.browserStorage.setAccount(
             accountEntity,
-            result.correlationId
+            result.correlationId,
+            AuthToken.isKmsi(result.idTokenClaims)
         );
         return this.browserStorage.hydrateCache(result, request);
     }