Make account info mandatory for AuthenticationResult and CacheRecord types. (#6156)

- Make account info mandatory for `AuthenticationResult` type.
- Make account info mandatory for `CacheRecord` type.

Author: konstantin-msft

change/@azure-msal-browser-327c8ac5-8041-4c9b-9b4c-fa7ca85e713f.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Make account info mandatory for AuthenticationResult and CacheRecord types #6156",
+  "packageName": "@azure/msal-browser",
+  "email": "[email protected]",
+  "dependentChangeType": "prerelease"
+}

lib/msal-browser/src/app/IPublicClientApplication.ts

@@ -4,7 +4,6 @@
  */
 
 import {
-    AuthenticationResult,
     AccountInfo,
     Logger,
     PerformanceCallbackFunction,
@@ -21,6 +20,7 @@ import { EndSessionPopupRequest } from "../request/EndSessionPopupRequest";
 import { ITokenCache } from "../cache/ITokenCache";
 import { AuthorizationCodeRequest } from "../request/AuthorizationCodeRequest";
 import { BrowserConfiguration } from "../config/Configuration";
+import { AuthenticationResult } from "../response/AuthenticationResult";
 
 export interface IPublicClientApplication {
     initialize(): Promise<void>;

lib/msal-browser/src/app/PublicClientApplication.ts

@@ -13,7 +13,6 @@ import { WrapperSKU } from "../utils/BrowserConstants";
 import { IPublicClientApplication } from "./IPublicClientApplication";
 import { IController } from "../controllers/IController";
 import {
-    AuthenticationResult,
     PerformanceCallbackFunction,
     AccountInfo,
     Logger,
@@ -24,6 +23,7 @@ import { ControllerFactory } from "../controllers/ControllerFactory";
 import { StandardController } from "../controllers/StandardController";
 import { BrowserConfiguration, Configuration } from "../config/Configuration";
 import { StandardOperatingContext } from "../operatingcontext/StandardOperatingContext";
+import { AuthenticationResult } from "../response/AuthenticationResult";
 
 /**
  * The PublicClientApplication class is the object exposed by the library to perform authentication and authorization functions in Single Page Applications

lib/msal-browser/src/cache/ITokenCache.ts

@@ -4,11 +4,11 @@
  */
 
 import {
-    ExternalTokenResponse,
-    AuthenticationResult,
+    ExternalTokenResponse
 } from "@azure/msal-common";
 import { SilentRequest } from "../request/SilentRequest";
 import { LoadTokenOptions } from "./TokenCache";
+import { AuthenticationResult } from "../response/AuthenticationResult";
 
 export interface ITokenCache {
     /**

lib/msal-browser/src/cache/TokenCache.ts

@@ -16,15 +16,15 @@ import {
     AuthToken,
     RefreshTokenEntity,
     AuthorityType,
-    CacheRecord,
-    AuthenticationResult,
     Constants,
 } from "@azure/msal-common";
 import { BrowserConfiguration } from "../config/Configuration";
 import { SilentRequest } from "../request/SilentRequest";
 import { BrowserCacheManager } from "./BrowserCacheManager";
 import { ITokenCache } from "./ITokenCache";
 import { BrowserAuthError } from "../error/BrowserAuthError";
+import { AuthenticationResult } from "../response/AuthenticationResult";
+import { CacheRecord } from "./entities/CacheRecord";
 
 export type LoadTokenOptions = {
     clientInfo?: string;
@@ -84,7 +84,7 @@ export class TokenCache implements ITokenCache {
 
         const idToken = new AuthToken(response.id_token, this.cryptoObj);
 
-        let cacheRecord: CacheRecord | undefined;
+        let cacheRecord: CacheRecord;
         let authority: Authority | undefined;
 
         if (request.account) {
@@ -435,7 +435,7 @@ export class TokenCache implements ITokenCache {
     private generateAuthenticationResult(
         request: SilentRequest,
         idTokenObj: AuthToken,
-        cacheRecord?: CacheRecord,
+        cacheRecord: CacheRecord,
         authority?: Authority
     ): AuthenticationResult {
         let accessToken: string = Constants.EMPTY_STRING;
@@ -469,9 +469,7 @@ export class TokenCache implements ITokenCache {
             uniqueId: uid,
             tenantId: tid,
             scopes: responseScopes,
-            account: cacheRecord?.account
-                ? cacheRecord.account.getAccountInfo()
-                : null,
+            account: cacheRecord.account.getAccountInfo(),
             idToken: idTokenObj ? idTokenObj.rawToken : Constants.EMPTY_STRING,
             idTokenClaims: idTokenObj ? idTokenObj.claims : {},
             accessToken: accessToken,

lib/msal-browser/src/cache/entities/CacheRecord.ts

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import {
+    AccessTokenEntity,
+    AccountEntity,
+    AppMetadataEntity,
+    CacheRecord as CommonCacheRecord,
+    IdTokenEntity,
+    RefreshTokenEntity
+} from "@azure/msal-common";
+
+export class CacheRecord extends CommonCacheRecord {
+    account: AccountEntity;
+
+    constructor(
+        accountEntity: AccountEntity,
+        idTokenEntity?: IdTokenEntity | null,
+        accessTokenEntity?: AccessTokenEntity | null,
+        refreshTokenEntity?: RefreshTokenEntity | null,
+        appMetadataEntity?: AppMetadataEntity | null
+    ) {
+        super(accountEntity, idTokenEntity, accessTokenEntity, refreshTokenEntity, appMetadataEntity);
+        this.account = accountEntity;
+    }
+}

lib/msal-browser/src/controllers/IController.ts

@@ -4,7 +4,6 @@
  */
 
 import {
-    AuthenticationResult,
     AccountInfo,
     Logger,
     PerformanceCallbackFunction,
@@ -28,6 +27,7 @@ import { NativeMessageHandler } from "../broker/nativeBroker/NativeMessageHandle
 import { EventHandler } from "../event/EventHandler";
 import { PopupClient } from "../interaction_client/PopupClient";
 import { SilentIframeClient } from "../interaction_client/SilentIframeClient";
+import { AuthenticationResult } from "../response/AuthenticationResult";
 
 export interface IController {
     initialize(): Promise<void>;

lib/msal-browser/src/controllers/StandardController.ts

@@ -9,7 +9,6 @@ import {
     AccountInfo,
     Constants,
     INetworkModule,
-    AuthenticationResult,
     Logger,
     CommonSilentFlowRequest,
     ICrypto,
@@ -72,6 +71,7 @@ import { StandardOperatingContext } from "../operatingcontext/StandardOperatingC
 import { BaseOperatingContext } from "../operatingcontext/BaseOperatingContext";
 import { version, name } from "../packageMetadata";
 import { IController } from "./IController";
+import { AuthenticationResult } from "../response/AuthenticationResult";
 
 export class StandardController implements IController {
     // OperatingContext

lib/msal-browser/src/event/EventMessage.ts

@@ -4,7 +4,6 @@
  */
 
 import {
-    AuthenticationResult,
     AuthError,
     AccountInfo,
 } from "@azure/msal-common";
@@ -16,6 +15,7 @@ import {
     SilentRequest,
     SsoSilentRequest,
     EndSessionRequest,
+    AuthenticationResult,
 } from "..";
 
 export type EventMessage = {

lib/msal-browser/src/index.ts

@@ -66,6 +66,7 @@ export { EndSessionRequest } from "./request/EndSessionRequest";
 export { EndSessionPopupRequest } from "./request/EndSessionPopupRequest";
 export { AuthorizationUrlRequest } from "./request/AuthorizationUrlRequest";
 export { AuthorizationCodeRequest } from "./request/AuthorizationCodeRequest";
+export { AuthenticationResult } from "./response/AuthenticationResult";
 
 // Cache
 export { LoadTokenOptions } from "./cache/TokenCache";
@@ -94,8 +95,6 @@ export {
     // Account
     AccountInfo,
     AccountEntity,
-    // Response
-    AuthenticationResult,
     IdTokenClaims,
     // Error
     AuthError,