@azure/msal-common 15.2.0 → 15.3.0

package/src/response/AuthorizeResponse.ts

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+/**
+ * Response properties that may be returned by the /authorize endpoint
+ */
+export type AuthorizeResponse = {
+    /**
+     * Authorization Code to be exchanged for tokens
+     */
+    code?: string;
+    /**
+     * Client info object containing UserId and TenantId
+     */
+    client_info?: string;
+    /**
+     * State string, should match what was sent on request
+     */
+    state?: string;
+    /**
+     * Cloud instance returned when application is instance aware
+     */
+    cloud_instance_name?: string;
+    /**
+     * Cloud instance hostname returned when application is instance aware
+     */
+    cloud_instance_host_name?: string;
+    /**
+     * AAD Graph hostname returned when application is instance aware
+     * https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-graph-api
+     */
+    cloud_graph_host_name?: string;
+    /**
+     * Microsoft Graph hostname returned when application is instance aware
+     * https://docs.microsoft.com/en-us/graph/overview
+     */
+    msgraph_host?: string;
+    /**
+     * Server error code
+     */
+    error?: string;
+    /**
+     * Server error URI
+     */
+    error_uri?: string;
+    /**
+     * Server error description
+     */
+    error_description?: string;
+    /**
+     * Server Sub-Error
+     */
+    suberror?: string;
+    /**
+     * Timestamp of request
+     */
+    timestamp?: string;
+    /**
+     * Trace Id used to look up request in logs
+     */
+    trace_id?: string;
+    /**
+     * Correlation ID use to look up request in logs
+     */
+    correlation_id?: string;
+    /**
+     * Claims
+     */
+    claims?: string;
+    /**
+     * AccountId for the user, returned when platform broker is available to use
+     */
+    accountId?: string;
+};

package/src/response/ResponseHandler.ts

@@ -9,7 +9,6 @@ import {
     ClientAuthErrorCodes,
     createClientAuthError,
 } from "../error/ClientAuthError.js";
-import { ServerAuthorizationCodeResponse } from "./ServerAuthorizationCodeResponse.js";
 import { Logger } from "../logger/Logger.js";
 import { ServerError } from "../error/ServerError.js";
 import { ScopeSet } from "../request/ScopeSet.js";
@@ -52,19 +51,7 @@ import {
     updateAccountTenantProfileData,
 } from "../account/AccountInfo.js";
 import * as CacheHelpers from "../cache/utils/CacheHelpers.js";
-
-function parseServerErrorNo(
-    serverResponse: ServerAuthorizationCodeResponse
-): string | undefined {
-    const errorCodePrefix = "code=";
-    const errorCodePrefixIndex =
-        serverResponse.error_uri?.lastIndexOf(errorCodePrefix);
-    return errorCodePrefixIndex && errorCodePrefixIndex >= 0
-        ? serverResponse.error_uri?.substring(
-              errorCodePrefixIndex + errorCodePrefix.length
-          )
-        : undefined;
-}
+import * as TimeUtils from "../utils/TimeUtils.js";
 
 /**
  * Class that handles response parsing.
@@ -98,90 +85,6 @@ export class ResponseHandler {
         this.performanceClient = performanceClient;
     }
 
-    /**
-     * Function which validates server authorization code response.
-     * @param serverResponseHash
-     * @param requestState
-     * @param cryptoObj
-     */
-    validateServerAuthorizationCodeResponse(
-        serverResponse: ServerAuthorizationCodeResponse,
-        requestState: string
-    ): void {
-        if (!serverResponse.state || !requestState) {
-            throw serverResponse.state
-                ? createClientAuthError(
-                      ClientAuthErrorCodes.stateNotFound,
-                      "Cached State"
-                  )
-                : createClientAuthError(
-                      ClientAuthErrorCodes.stateNotFound,
-                      "Server State"
-                  );
-        }
-
-        let decodedServerResponseState: string;
-        let decodedRequestState: string;
-
-        try {
-            decodedServerResponseState = decodeURIComponent(
-                serverResponse.state
-            );
-        } catch (e) {
-            throw createClientAuthError(
-                ClientAuthErrorCodes.invalidState,
-                serverResponse.state
-            );
-        }
-
-        try {
-            decodedRequestState = decodeURIComponent(requestState);
-        } catch (e) {
-            throw createClientAuthError(
-                ClientAuthErrorCodes.invalidState,
-                serverResponse.state
-            );
-        }
-
-        if (decodedServerResponseState !== decodedRequestState) {
-            throw createClientAuthError(ClientAuthErrorCodes.stateMismatch);
-        }
-
-        // Check for error
-        if (
-            serverResponse.error ||
-            serverResponse.error_description ||
-            serverResponse.suberror
-        ) {
-            const serverErrorNo = parseServerErrorNo(serverResponse);
-            if (
-                isInteractionRequiredError(
-                    serverResponse.error,
-                    serverResponse.error_description,
-                    serverResponse.suberror
-                )
-            ) {
-                throw new InteractionRequiredAuthError(
-                    serverResponse.error || "",
-                    serverResponse.error_description,
-                    serverResponse.suberror,
-                    serverResponse.timestamp || "",
-                    serverResponse.trace_id || "",
-                    serverResponse.correlation_id || "",
-                    serverResponse.claims || "",
-                    serverErrorNo
-                );
-            }
-
-            throw new ServerError(
-                serverResponse.error || "",
-                serverResponse.error_description,
-                serverResponse.suberror,
-                serverErrorNo
-            );
-        }
-    }
-
     /**
      * Function which validates server authorization token response.
      * @param serverResponse
@@ -632,15 +535,16 @@ export class ResponseHandler {
             responseScopes = ScopeSet.fromString(
                 cacheRecord.accessToken.target
             ).asArray();
-            expiresOn = new Date(
-                Number(cacheRecord.accessToken.expiresOn) * 1000
+            // Access token expiresOn cached in seconds, converting to Date for AuthenticationResult
+            expiresOn = TimeUtils.toDateFromSeconds(
+                cacheRecord.accessToken.expiresOn
             );
-            extExpiresOn = new Date(
-                Number(cacheRecord.accessToken.extendedExpiresOn) * 1000
+            extExpiresOn = TimeUtils.toDateFromSeconds(
+                cacheRecord.accessToken.extendedExpiresOn
             );
             if (cacheRecord.accessToken.refreshOn) {
-                refreshOn = new Date(
-                    Number(cacheRecord.accessToken.refreshOn) * 1000
+                refreshOn = TimeUtils.toDateFromSeconds(
+                    cacheRecord.accessToken.refreshOn
                 );
             }
         }

package/src/telemetry/performance/PerformanceEvent.ts

@@ -214,13 +214,12 @@ export const PerformanceEvents = {
         "standardInteractionClientGetClientConfiguration",
     StandardInteractionClientInitializeAuthorizationRequest:
         "standardInteractionClientInitializeAuthorizationRequest",
-    StandardInteractionClientInitializeAuthorizationCodeRequest:
-        "standardInteractionClientInitializeAuthorizationCodeRequest",
 
     /**
      * getAuthCodeUrl API (msal-browser and msal-node).
      */
     GetAuthCodeUrl: "getAuthCodeUrl",
+    GetStandardParams: "getStandardParams",
 
     /**
      * Functions from InteractionHandler (msal-browser)
@@ -235,7 +234,6 @@ export const PerformanceEvents = {
     AuthClientAcquireToken: "authClientAcquireToken",
     AuthClientExecuteTokenRequest: "authClientExecuteTokenRequest",
     AuthClientCreateTokenRequestBody: "authClientCreateTokenRequestBody",
-    AuthClientCreateQueryString: "authClientCreateQueryString",
 
     /**
      * Generate functions in PopTokenGenerator (msal-common)
@@ -433,10 +431,6 @@ export const PerformanceEventAbbreviations: ReadonlyMap<string, string> =
             PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest,
             "StdIntClientInitAuthReq",
         ],
-        [
-            PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest,
-            "StdIntClientInitAuthCodeReq",
-        ],
 
         [PerformanceEvents.GetAuthCodeUrl, "GetAuthCodeUrl"],
 
@@ -453,10 +447,6 @@ export const PerformanceEventAbbreviations: ReadonlyMap<string, string> =
             PerformanceEvents.AuthClientCreateTokenRequestBody,
             "AuthClientCreateTReqBody",
         ],
-        [
-            PerformanceEvents.AuthClientCreateQueryString,
-            "AuthClientCreateQueryStr",
-        ],
         [PerformanceEvents.PopTokenGenerateCnf, "PopTGenCnf"],
         [PerformanceEvents.PopTokenGenerateKid, "PopTGenKid"],
         [PerformanceEvents.HandleServerTokenResponse, "HandleServerTRes"],

package/src/utils/TimeUtils.ts

@@ -15,6 +15,26 @@ export function nowSeconds(): number {
     return Math.round(new Date().getTime() / 1000.0);
 }
 
+/**
+ * Converts JS Date object to seconds
+ * @param date Date
+ */
+export function toSecondsFromDate(date: Date): number {
+    // Convert date to seconds
+    return date.getTime() / 1000;
+}
+
+/**
+ * Convert seconds to JS Date object. Seconds can be in a number or string format or undefined (will still return a date).
+ * @param seconds
+ */
+export function toDateFromSeconds(seconds: number | string | undefined): Date {
+    if (seconds) {
+        return new Date(Number(seconds) * 1000);
+    }
+    return new Date();
+}
+
 /**
  * check if a token is expired based on given UTC time in seconds.
  * @param expiresOn

package/src/utils/UrlUtils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ServerAuthorizationCodeResponse } from "../response/ServerAuthorizationCodeResponse.js";
+import { AuthorizeResponse } from "../response/AuthorizeResponse.js";
 import {
     ClientAuthErrorCodes,
     createClientAuthError,
@@ -31,7 +31,7 @@ export function stripLeadingHashOrQuery(responseString: string): string {
  */
 export function getDeserializedResponse(
     responseString: string
-): ServerAuthorizationCodeResponse | null {
+): AuthorizeResponse | null {
     // Check if given hash is empty
     if (!responseString || responseString.indexOf("=") < 0) {
         return null;
@@ -40,8 +40,9 @@ export function getDeserializedResponse(
         // 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: ServerAuthorizationCodeResponse =
-            Object.fromEntries(new URLSearchParams(normalizedResponse));
+        const deserializedHash: AuthorizeResponse = Object.fromEntries(
+            new URLSearchParams(normalizedResponse)
+        );
 
         // Check for known response properties
         if (
@@ -58,3 +59,16 @@ export function getDeserializedResponse(
 
     return null;
 }
+
+/**
+ * Utility to create a URL from the params map
+ */
+export function mapToQueryString(parameters: Map<string, string>): string {
+    const queryParameterArray: Array<string> = new Array<string>();
+
+    parameters.forEach((value, key) => {
+        queryParameterArray.push(`${key}=${encodeURIComponent(value)}`);
+    });
+
+    return queryParameterArray.join("&");
+}

package/dist/response/ServerAuthorizationCodeResponse.d.ts

@@ -1,27 +0,0 @@
-/**
- * Deserialized response object from server authorization code request.
- * - code: authorization code from server
- * - client_info: client info object
- * - state: OAuth2 request state
- * - error: error sent back in hash
- * - error: description
- */
-export type ServerAuthorizationCodeResponse = {
-    code?: string;
-    client_info?: string;
-    state?: string;
-    cloud_instance_name?: string;
-    cloud_instance_host_name?: string;
-    cloud_graph_host_name?: string;
-    msgraph_host?: string;
-    error?: string;
-    error_uri?: string;
-    error_description?: string;
-    suberror?: string;
-    timestamp?: string;
-    trace_id?: string;
-    correlation_id?: string;
-    claims?: string;
-    accountId?: string;
-};
-//# sourceMappingURL=ServerAuthorizationCodeResponse.d.ts.map

package/dist/response/ServerAuthorizationCodeResponse.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServerAuthorizationCodeResponse.d.ts","sourceRoot":"","sources":["../../src/response/ServerAuthorizationCodeResponse.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAE1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC"}