Adding graph hostname and graph host to the auth result

lib/msal-common/src/client/AuthorizationCodeClient.ts

@@ -21,7 +21,7 @@ import { UrlString } from "../url/UrlString";
 import { ServerAuthorizationCodeResponse } from "../server/ServerAuthorizationCodeResponse";
 import { AccountEntity } from "../cache/entities/AccountEntity";
 import { EndSessionRequest } from "../request/EndSessionRequest";
-import { AuthorizationCodeResponse } from "../response/AuthorizationCodeResponse";
+import { AuthorizationCodePayload } from "../response/AuthorizationCodeResponse";
 
 /**
  * Oauth2.0 Authorization Code client
@@ -52,7 +52,7 @@ export class AuthorizationCodeClient extends BaseClient {
      * authorization_code_grant
      * @param request
      */
-    async acquireToken(request: AuthorizationCodeRequest, cachedNonce?: string, cachedState?: string): Promise<AuthenticationResult> {
+    async acquireToken(request: AuthorizationCodeRequest, authCodePayload?: AuthorizationCodePayload): Promise<AuthenticationResult> {
         this.logger.info("in acquireToken call");
         // If no code response is given, we cannot acquire a token.
         if (!request || StringUtils.isEmpty(request.code)) {
@@ -70,7 +70,7 @@ export class AuthorizationCodeClient extends BaseClient {
 
         // Validate response. This function throws a server error if an error is returned by the server.
         responseHandler.validateTokenResponse(response.body);
-        const tokenResponse = responseHandler.generateAuthenticationResult(response.body, this.authority, cachedNonce, cachedState);
+        const tokenResponse = responseHandler.generateAuthenticationResult(response.body, this.authority, authCodePayload);
 
         return tokenResponse;
     }
@@ -80,7 +80,7 @@ export class AuthorizationCodeClient extends BaseClient {
      * the client to exchange for a token in acquireToken.
      * @param hashFragment
      */
-    handleFragmentResponse(hashFragment: string, cachedState: string): AuthorizationCodeResponse {
+    handleFragmentResponse(hashFragment: string, cachedState: string): AuthorizationCodePayload {
         // Handle responses.
         const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger);
 

lib/msal-common/src/index.ts

@@ -39,7 +39,7 @@ export { SilentFlowRequest } from "./request/SilentFlowRequest";
 export { DeviceCodeRequest } from "./request/DeviceCodeRequest";
 export { EndSessionRequest } from "./request/EndSessionRequest";
 export { AuthenticationResult } from "./response/AuthenticationResult";
-export { AuthorizationCodeResponse } from "./response/AuthorizationCodeResponse";
+export { AuthorizationCodePayload as AuthorizationCodeResponse } from "./response/AuthorizationCodeResponse";
 // Logger Callback
 export { ILoggerCallback, LogLevel, Logger } from "./logger/Logger";
 // Errors

lib/msal-common/src/response/AuthenticationResult.ts

@@ -23,4 +23,6 @@ export type AuthenticationResult = {
     extExpiresOn?: Date;
     state?: string;
     familyId?: string;
+    cloudGraphHostName?: string;
+    msGraphHost?: string; 
 };

lib/msal-common/src/response/AuthorizationCodeResponse.ts

@@ -6,10 +6,12 @@
 /**
  * Response returned after processing the code response query string or fragment.
  */
-export type AuthorizationCodeResponse = {
+export type AuthorizationCodePayload = {
     code: string,
     cloud_instance_name?: string;
     cloud_instance_host_name?: string;
     cloud_graph_host_name?: string;
     msgraph_host?: string;
+    state?: string;
+    nonce?: string
 };

lib/msal-common/src/response/ResponseHandler.ts

@@ -25,6 +25,7 @@ import { CacheRecord } from "../cache/entities/CacheRecord";
 import { EnvironmentAliases, PreferredCacheEnvironment } from "../utils/Constants";
 import { CacheManager } from "../cache/CacheManager";
 import { ProtocolUtils, LibraryStateObject, RequestStateObject } from "../utils/ProtocolUtils";
+import { AuthorizationCodePayload } from "./AuthorizationCodeResponse";
 
 /**
  * Class that handles response parsing.
@@ -98,7 +99,10 @@ export class ResponseHandler {
      * @param serverTokenResponse
      * @param authority
      */
-    generateAuthenticationResult(serverTokenResponse: ServerAuthorizationTokenResponse, authority: Authority, cachedNonce?: string, cachedState?: string): AuthenticationResult {
+    generateAuthenticationResult(serverTokenResponse: ServerAuthorizationTokenResponse, authority: Authority, authCodePayload?: AuthorizationCodePayload): AuthenticationResult {
+        const cachedNonce = authCodePayload ? authCodePayload.nonce : "";
+        const cachedState = authCodePayload ? authCodePayload.state : "";
+
         // create an idToken object (not entity)
         const idTokenObj = new IdToken(serverTokenResponse.id_token, this.cryptoObj);
 
@@ -132,7 +136,9 @@ export class ResponseHandler {
             expiresOn: new Date(cacheRecord.accessToken.expiresOn),
             extExpiresOn: new Date(cacheRecord.accessToken.extendedExpiresOn),
             familyId: serverTokenResponse.foci || null,
-            state: requestStateObj ? requestStateObj.userRequestState : ""
+            state: requestStateObj ? requestStateObj.userRequestState : "",
+            cloudGraphHostName: authCodePayload.cloud_graph_host_name,
+            msGraphHost: authCodePayload.msgraph_host
         };
 
         return authenticationResult;