@azure/msal-common 16.0.0-alpha.0 → 16.0.1

package/src/response/ResponseHandler.ts

@@ -24,7 +24,7 @@ import {
 } from "../error/InteractionRequiredAuthError.js";
 import { CacheRecord } from "../cache/entities/CacheRecord.js";
 import { CacheManager } from "../cache/CacheManager.js";
-import { ProtocolUtils, RequestStateObject } from "../utils/ProtocolUtils.js";
+import * as ProtocolUtils from "../utils/ProtocolUtils.js";
 import * as Constants from "../utils/Constants.js";
 import { PopTokenGenerator } from "../crypto/PopTokenGenerator.js";
 import { AppMetadataEntity } from "../cache/entities/AppMetadataEntity.js";
@@ -33,7 +33,11 @@ import { TokenCacheContext } from "../cache/persistence/TokenCacheContext.js";
 import { ISerializableTokenCache } from "../cache/interface/ISerializableTokenCache.js";
 import { AuthorizationCodePayload } from "./AuthorizationCodePayload.js";
 import { BaseAuthRequest } from "../request/BaseAuthRequest.js";
-import { checkMaxAge, extractTokenClaims } from "../account/AuthToken.js";
+import {
+    checkMaxAge,
+    extractTokenClaims,
+    isKmsi,
+} from "../account/AuthToken.js";
 import {
     TokenClaims,
     getTenantIdFromIdTokenClaims,
@@ -47,6 +51,7 @@ import * as CacheHelpers from "../cache/utils/CacheHelpers.js";
 import * as TimeUtils from "../utils/TimeUtils.js";
 import * as AccountEntityUtils from "../cache/utils/AccountEntityUtils.js";
 import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient.js";
+import { RequestStateObject } from "../utils/StateTypes.js";
 
 /**
  * Class that handles response parsing.
@@ -234,7 +239,7 @@ export class ResponseHandler {
         let requestStateObj: RequestStateObject | undefined;
         if (!!authCodePayload && !!authCodePayload.state) {
             requestStateObj = ProtocolUtils.parseRequestState(
-                this.cryptoObj,
+                this.cryptoObj.base64Decode,
                 authCodePayload.state
             );
         }
@@ -305,6 +310,7 @@ export class ResponseHandler {
             await this.cacheStorage.saveCacheRecord(
                 cacheRecord,
                 request.correlationId,
+                isKmsi(idTokenClaims || {}),
                 request.storeInCache
             );
         } finally {
@@ -451,6 +457,11 @@ export class ResponseHandler {
                           )
                         : serverTokenResponse.refresh_token_expires_in;
                 rtExpiresOn = reqTimestamp + rtExpiresIn;
+
+                this.performanceClient?.addFields(
+                    { ntwkRtExpiresOnSeconds: rtExpiresOn },
+                    request.correlationId
+                );
             }
             cachedRefreshToken = CacheHelpers.createRefreshTokenEntity(
                 this.homeAccountIdentifier,

package/src/telemetry/performance/IPerformanceClient.ts

@@ -4,13 +4,15 @@
  */
 
 import { PerformanceEvent } from "./PerformanceEvent.js";
+import { AccountInfo } from "../../account/AccountInfo.js";
 
 export type PerformanceCallbackFunction = (events: PerformanceEvent[]) => void;
 
 export type InProgressPerformanceEvent = {
     end: (
         event?: Partial<PerformanceEvent>,
-        error?: unknown
+        error?: unknown,
+        account?: AccountInfo
     ) => PerformanceEvent | null;
     discard: () => void;
     add: (fields: { [key: string]: {} | undefined }) => void;

package/src/telemetry/performance/PerformanceClient.ts

@@ -4,7 +4,7 @@
  */
 
 import { ApplicationTelemetry } from "../../config/ClientConfiguration.js";
-import { Logger } from "../../logger/Logger.js";
+import { getAndFlushLogsFromCache, Logger } from "../../logger/Logger.js";
 import {
     InProgressPerformanceEvent,
     IPerformanceClient,
@@ -21,6 +21,7 @@ import { AuthError } from "../../error/AuthError.js";
 import { CacheError } from "../../error/CacheError.js";
 import { ServerError } from "../../error/ServerError.js";
 import { InteractionRequiredAuthError } from "../../error/InteractionRequiredAuthError.js";
+import { AccountInfo } from "../../account/AccountInfo.js";
 
 /**
  * Starts context by adding payload to the stack
@@ -250,6 +251,22 @@ export function compactStackLine(line: string): string {
     return line.trimStart();
 }
 
+export function getAccountType(
+    account?: AccountInfo
+): "AAD" | "MSA" | "B2C" | undefined {
+    const idTokenClaims = account?.idTokenClaims;
+    if (idTokenClaims?.tfp || idTokenClaims?.acr) {
+        return "B2C";
+    }
+
+    if (!idTokenClaims?.tid) {
+        return undefined;
+    } else if (idTokenClaims?.tid === "9188040d-6c67-4c5b-b112-36a304b66dad") {
+        return "MSA";
+    }
+    return "AAD";
+}
+
 export abstract class PerformanceClient implements IPerformanceClient {
     protected authority: string;
     protected libraryName: string;
@@ -333,17 +350,6 @@ export abstract class PerformanceClient implements IPerformanceClient {
     ): InProgressPerformanceEvent {
         // Generate a placeholder correlation if the request does not provide one
         const eventCorrelationId = correlationId || this.generateId();
-        if (!correlationId) {
-            this.logger.info(
-                `PerformanceClient: No correlation id provided for '${measureName}', generating`,
-                eventCorrelationId
-            );
-        }
-
-        this.logger.trace(
-            `PerformanceClient: Performance measurement started for '${measureName}'`,
-            eventCorrelationId
-        );
 
         const inProgressEvent: PerformanceEvent = {
             eventId: this.generateId(),
@@ -367,7 +373,8 @@ export abstract class PerformanceClient implements IPerformanceClient {
         return {
             end: (
                 event?: Partial<PerformanceEvent>,
-                error?: unknown
+                error?: unknown,
+                account?: AccountInfo
             ): PerformanceEvent | null => {
                 return this.endMeasurement(
                     {
@@ -376,7 +383,8 @@ export abstract class PerformanceClient implements IPerformanceClient {
                         // Properties set when event ends
                         ...event,
                     },
-                    error
+                    error,
+                    account
                 );
             },
             discard: () => {
@@ -403,11 +411,13 @@ export abstract class PerformanceClient implements IPerformanceClient {
      *
      * @param {PerformanceEvent} event
      * @param {unknown} error
+     * @param {AccountInfo?} account
      * @returns {(PerformanceEvent | null)}
      */
     endMeasurement(
         event: PerformanceEvent,
-        error?: unknown
+        error?: unknown,
+        account?: AccountInfo
     ): PerformanceEvent | null {
         const rootEvent: PerformanceEvent | undefined =
             this.eventsByCorrelationId.get(event.correlationId);
@@ -439,11 +449,6 @@ export abstract class PerformanceClient implements IPerformanceClient {
             rootEvent.incompleteSubMeasurements?.delete(event.eventId);
         }
 
-        this.logger.trace(
-            `PerformanceClient: Performance measurement ended for '${event.name}': '${event.durationMs}' ms`,
-            event.correlationId
-        );
-
         if (error) {
             addError(error, this.logger, rootEvent);
         }
@@ -479,12 +484,26 @@ export abstract class PerformanceClient implements IPerformanceClient {
         });
         finalEvent.incompleteSubMeasurements = undefined;
 
+        const logs = getAndFlushLogsFromCache(event.correlationId);
+        // Format logs: [millis1,hash1;millis2,hash2;...]
+        const formattedLogs = logs
+            .map(
+                (logMessage) => `${logMessage.milliseconds},${logMessage.hash}`
+            )
+            .join(";");
+
         finalEvent = {
             ...finalEvent,
             status: PerformanceEventStatus.Completed,
             incompleteSubsCount,
             context,
+            logs: formattedLogs,
         };
+        if (account) {
+            finalEvent.accountType = getAccountType(account);
+            finalEvent.dataBoundary = account.dataBoundary;
+        }
+
         this.truncateIntegralFields(finalEvent);
         this.emitEvents([finalEvent], event.correlationId);
 
@@ -500,10 +519,6 @@ export abstract class PerformanceClient implements IPerformanceClient {
         fields: { [key: string]: {} | undefined },
         correlationId: string
     ): void {
-        this.logger.trace(
-            "PerformanceClient: Updating static fields",
-            correlationId
-        );
         const event = this.eventsByCorrelationId.get(correlationId);
         if (event) {
             this.eventsByCorrelationId.set(correlationId, {
@@ -527,10 +542,6 @@ export abstract class PerformanceClient implements IPerformanceClient {
         fields: { [key: string]: number | undefined },
         correlationId: string
     ): void {
-        this.logger.trace(
-            "PerformanceClient: Updating counters",
-            correlationId
-        );
         const event = this.eventsByCorrelationId.get(correlationId);
         if (event) {
             for (const counter in fields) {
@@ -561,10 +572,6 @@ export abstract class PerformanceClient implements IPerformanceClient {
     protected cacheEventByCorrelationId(event: PerformanceEvent): void {
         const rootEvent = this.eventsByCorrelationId.get(event.correlationId);
         if (rootEvent) {
-            this.logger.trace(
-                `PerformanceClient: Performance measurement for '${event.name}' added/updated`,
-                event.correlationId
-            );
             rootEvent.incompleteSubMeasurements =
                 rootEvent.incompleteSubMeasurements || new Map();
             rootEvent.incompleteSubMeasurements.set(event.eventId, {
@@ -572,10 +579,6 @@ export abstract class PerformanceClient implements IPerformanceClient {
                 startTimeMs: event.startTimeMs,
             });
         } else {
-            this.logger.trace(
-                `PerformanceClient: Performance measurement for '${event.name}' started`,
-                event.correlationId
-            );
             this.eventsByCorrelationId.set(event.correlationId, { ...event });
             this.eventStack.set(event.correlationId, []);
         }
@@ -587,16 +590,7 @@ export abstract class PerformanceClient implements IPerformanceClient {
      * @param {string} correlationId
      */
     discardMeasurements(correlationId: string): void {
-        this.logger.trace(
-            "PerformanceClient: Performance measurements discarded",
-            correlationId
-        );
         this.eventsByCorrelationId.delete(correlationId);
-
-        this.logger.trace(
-            "PerformanceClient: Event stack discarded",
-            correlationId
-        );
         this.eventStack.delete(correlationId);
     }
 

package/src/telemetry/performance/PerformanceEvent.ts

@@ -3,6 +3,8 @@
  * Licensed under the MIT License.
  */
 
+import { DataBoundary } from "../../account/AccountInfo.js";
+
 /**
  * State of the performance event.
  *
@@ -312,7 +314,9 @@ export type PerformanceEvent = {
 
     isAsyncPopup?: boolean;
 
-    rtExpiresOnMs?: number;
+    cacheRtExpiresOnSeconds?: number;
+    ntwkRtExpiresOnSeconds?: number;
+    rtOffsetSeconds?: number;
 
     sidFromClaims?: boolean;
     sidFromRequest?: boolean;
@@ -331,6 +335,11 @@ export type PerformanceEvent = {
     sameClientIdInstanceCount?: number;
 
     navigateCallbackResult?: boolean;
+
+    dataBoundary?: DataBoundary;
+
+    // Hashed logs in the format [millis1,hash1;millis2,hash2;...]
+    logs?: string;
 };
 
 export type PerformanceEventContext = {

package/src/telemetry/performance/PerformanceEvents.ts

@@ -55,6 +55,7 @@ export const HandleCodeResponseFromServer = "handleCodeResponseFromServer";
 export const AuthClientExecuteTokenRequest = "authClientExecuteTokenRequest";
 export const AuthClientCreateTokenRequestBody =
     "authClientCreateTokenRequestBody";
+export const UpdateTokenEndpointAuthority = "updateTokenEndpointAuthority";
 
 /**
  * Generate functions in PopTokenGenerator (msal-common)

package/src/utils/Constants.ts

@@ -68,6 +68,12 @@ export const HTTP_GATEWAY_TIMEOUT: number = 504;
 export const HTTP_SERVER_ERROR_RANGE_END: number = 599;
 export const HTTP_MULTI_SIDED_ERROR: number = 600;
 
+export const HttpMethod = {
+    GET: "GET",
+    POST: "POST",
+} as const;
+export type HttpMethod = (typeof HttpMethod)[keyof typeof HttpMethod];
+
 export const OIDC_DEFAULT_SCOPES = [
     OPENID_SCOPE,
     PROFILE_SCOPE,

package/src/utils/ProtocolUtils.ts

@@ -9,112 +9,86 @@ import {
     ClientAuthErrorCodes,
     createClientAuthError,
 } from "../error/ClientAuthError.js";
+import { LibraryStateObject, RequestStateObject } from "./StateTypes.js";
 
 /**
- * Type which defines the object that is stringified, encoded and sent in the state value.
- * Contains the following:
- * - id - unique identifier for this request
- * - ts - timestamp for the time the request was made. Used to ensure that token expiration is not calculated incorrectly.
- * - platformState - string value sent from the platform.
+ * Appends user state with random guid, or returns random guid.
+ * @param cryptoObj
+ * @param userState
+ * @param meta
  */
-export type LibraryStateObject = {
-    id: string;
-    meta?: Record<string, string>;
-};
-
-/**
- * Type which defines the stringified and encoded object sent to the service in the authorize request.
- */
-export type RequestStateObject = {
-    userRequestState: string;
-    libraryState: LibraryStateObject;
-};
+export function setRequestState(
+    cryptoObj: ICrypto,
+    userState?: string,
+    meta?: Record<string, string>
+): string {
+    const libraryState = generateLibraryState(cryptoObj, meta);
+    return userState
+        ? `${libraryState}${RESOURCE_DELIM}${userState}`
+        : libraryState;
+}
 
 /**
- * Class which provides helpers for OAuth 2.0 protocol specific values
+ * Generates the state value used by the common library.
+ * @param cryptoObj
+ * @param meta
  */
-export class ProtocolUtils {
-    /**
-     * Appends user state with random guid, or returns random guid.
-     * @param userState
-     * @param randomGuid
-     */
-    static setRequestState(
-        cryptoObj: ICrypto,
-        userState?: string,
-        meta?: Record<string, string>
-    ): string {
-        const libraryState = ProtocolUtils.generateLibraryState(
-            cryptoObj,
-            meta
-        );
-        return userState
-            ? `${libraryState}${RESOURCE_DELIM}${userState}`
-            : libraryState;
+export function generateLibraryState(
+    cryptoObj: ICrypto,
+    meta?: Record<string, string>
+): string {
+    if (!cryptoObj) {
+        throw createClientAuthError(ClientAuthErrorCodes.noCryptoObject);
     }
 
-    /**
-     * Generates the state value used by the common library.
-     * @param randomGuid
-     * @param cryptoObj
-     */
-    static generateLibraryState(
-        cryptoObj: ICrypto,
-        meta?: Record<string, string>
-    ): string {
-        if (!cryptoObj) {
-            throw createClientAuthError(ClientAuthErrorCodes.noCryptoObject);
-        }
+    // Create a state object containing a unique id and the timestamp of the request creation
+    const stateObj: LibraryStateObject = {
+        id: cryptoObj.createNewGuid(),
+    };
 
-        // Create a state object containing a unique id and the timestamp of the request creation
-        const stateObj: LibraryStateObject = {
-            id: cryptoObj.createNewGuid(),
-        };
+    if (meta) {
+        stateObj.meta = meta;
+    }
 
-        if (meta) {
-            stateObj.meta = meta;
-        }
+    const stateString = JSON.stringify(stateObj);
 
-        const stateString = JSON.stringify(stateObj);
+    return cryptoObj.base64Encode(stateString);
+}
 
-        return cryptoObj.base64Encode(stateString);
+/**
+ * Parses the state into the RequestStateObject, which contains the LibraryState info and the state passed by the user.
+ * @param base64Decode
+ * @param state
+ */
+export function parseRequestState(
+    base64Decode: (input: string) => string,
+    state: string
+): RequestStateObject {
+    if (!base64Decode) {
+        throw createClientAuthError(ClientAuthErrorCodes.noCryptoObject);
     }
 
-    /**
-     * Parses the state into the RequestStateObject, which contains the LibraryState info and the state passed by the user.
-     * @param state
-     * @param cryptoObj
-     */
-    static parseRequestState(
-        cryptoObj: ICrypto,
-        state: string
-    ): RequestStateObject {
-        if (!cryptoObj) {
-            throw createClientAuthError(ClientAuthErrorCodes.noCryptoObject);
-        }
-
-        if (!state) {
-            throw createClientAuthError(ClientAuthErrorCodes.invalidState);
-        }
+    if (!state) {
+        throw createClientAuthError(ClientAuthErrorCodes.invalidState);
+    }
 
-        try {
-            // Split the state between library state and user passed state and decode them separately
-            const splitState = state.split(RESOURCE_DELIM);
-            const libraryState = splitState[0];
-            const userState =
-                splitState.length > 1
-                    ? splitState.slice(1).join(RESOURCE_DELIM)
-                    : "";
-            const libraryStateString = cryptoObj.base64Decode(libraryState);
-            const libraryStateObj = JSON.parse(
-                libraryStateString
-            ) as LibraryStateObject;
-            return {
-                userRequestState: userState || "",
-                libraryState: libraryStateObj,
-            };
-        } catch (e) {
-            throw createClientAuthError(ClientAuthErrorCodes.invalidState);
-        }
+    try {
+        // Split the state between library state and user passed state and decode them separately
+        const splitState = state.split(RESOURCE_DELIM);
+        const libraryState = splitState[0];
+        const userState =
+            splitState.length > 1
+                ? splitState.slice(1).join(RESOURCE_DELIM)
+                : "";
+        const libraryStateString = base64Decode(libraryState);
+        const libraryStateObj = JSON.parse(
+            libraryStateString
+        ) as LibraryStateObject;
+        return {
+            userRequestState: userState || "",
+            libraryState: libraryStateObj,
+        };
+    } catch (e) {
+        throw createClientAuthError(ClientAuthErrorCodes.invalidState);
     }
 }

package/src/utils/StateTypes.ts

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+/**
+ * Type which defines library state
+ */
+export type LibraryStateObject = {
+    id: string;
+    meta?: Record<string, string>;
+};
+
+/**
+ * Type which defines the stringified and encoded state object sent to the service in the authorize request.
+ */
+export type RequestStateObject = {
+    userRequestState: string;
+    libraryState: LibraryStateObject;
+};

package/dist/client/BaseClient.d.ts

@@ -1,59 +0,0 @@
-import { ClientConfiguration, CommonClientConfiguration } from "../config/ClientConfiguration.js";
-import { INetworkModule, NetworkRequestOptions } from "../network/INetworkModule.js";
-import { NetworkResponse } from "../network/NetworkResponse.js";
-import { ICrypto } from "../crypto/ICrypto.js";
-import { Authority } from "../authority/Authority.js";
-import { Logger } from "../logger/Logger.js";
-import { ServerAuthorizationTokenResponse } from "../response/ServerAuthorizationTokenResponse.js";
-import { CacheManager } from "../cache/CacheManager.js";
-import { ServerTelemetryManager } from "../telemetry/server/ServerTelemetryManager.js";
-import { RequestThumbprint } from "../network/RequestThumbprint.js";
-import { CcsCredential } from "../account/CcsCredential.js";
-import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient.js";
-import { BaseAuthRequest } from "../request/BaseAuthRequest.js";
-/**
- * Base application class which will construct requests to send to and handle responses from the Microsoft STS using the authorization code flow.
- * @internal
- */
-export declare abstract class BaseClient {
-    logger: Logger;
-    protected config: CommonClientConfiguration;
-    protected cryptoUtils: ICrypto;
-    protected cacheManager: CacheManager;
-    protected networkClient: INetworkModule;
-    protected serverTelemetryManager: ServerTelemetryManager | null;
-    authority: Authority;
-    protected performanceClient: IPerformanceClient;
-    protected constructor(configuration: ClientConfiguration, performanceClient: IPerformanceClient);
-    /**
-     * Creates default headers for requests to token endpoint
-     */
-    protected createTokenRequestHeaders(ccsCred?: CcsCredential): Record<string, string>;
-    /**
-     * Http post to token endpoint
-     * @param tokenEndpoint
-     * @param queryString
-     * @param headers
-     * @param thumbprint
-     */
-    protected executePostToTokenEndpoint(tokenEndpoint: string, queryString: string, headers: Record<string, string>, thumbprint: RequestThumbprint, correlationId: string): Promise<NetworkResponse<ServerAuthorizationTokenResponse>>;
-    /**
-     * Wraps sendPostRequestAsync with necessary preflight and postflight logic
-     * @param thumbprint - Request thumbprint for throttling
-     * @param tokenEndpoint - Endpoint to make the POST to
-     * @param options - Body and Headers to include on the POST request
-     * @param correlationId - CorrelationId for telemetry
-     */
-    sendPostRequest<T extends ServerAuthorizationTokenResponse>(thumbprint: RequestThumbprint, tokenEndpoint: string, options: NetworkRequestOptions, correlationId: string): Promise<NetworkResponse<T>>;
-    /**
-     * Updates the authority object of the client. Endpoint discovery must be completed.
-     * @param updatedAuthority
-     */
-    updateAuthority(cloudInstanceHostname: string, correlationId: string): Promise<void>;
-    /**
-     * Creates query string for the /token request
-     * @param request
-     */
-    createTokenQueryParameters(request: BaseAuthRequest): string;
-}
-//# sourceMappingURL=BaseClient.d.ts.map

package/dist/client/BaseClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BaseClient.d.ts","sourceRoot":"","sources":["../../src/client/BaseClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,mBAAmB,EAEnB,yBAAyB,EAC5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACH,cAAc,EACd,qBAAqB,EACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAAE,gCAAgC,EAAE,MAAM,iDAAiD,CAAC;AACnG,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAqB,MAAM,6BAA6B,CAAC;AAE/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAGpF,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAYhE;;;GAGG;AACH,8BAAsB,UAAU;IAErB,MAAM,EAAE,MAAM,CAAC;IAGtB,SAAS,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAG5C,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAG/B,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC;IAGxC,SAAS,CAAC,sBAAsB,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAGzD,SAAS,EAAE,SAAS,CAAC;IAG5B,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAEhD,SAAS,aACL,aAAa,EAAE,mBAAmB,EAClC,iBAAiB,EAAE,kBAAkB;IA2BzC;;OAEG;IACH,SAAS,CAAC,yBAAyB,CAC/B,OAAO,CAAC,EAAE,aAAa,GACxB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IA8BzB;;;;;;OAMG;cACa,0BAA0B,CACtC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,UAAU,EAAE,iBAAiB,EAC7B,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,eAAe,CAAC,gCAAgC,CAAC,CAAC;IAqB7D;;;;;;OAMG;IACG,eAAe,CAAC,CAAC,SAAS,gCAAgC,EAC5D,UAAU,EAAE,iBAAiB,EAC7B,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,qBAAqB,EAC9B,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAwE9B;;;OAGG;IACG,eAAe,CACjB,qBAAqB,EAAE,MAAM,EAC7B,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IAchB;;;OAGG;IACH,0BAA0B,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM;CA8B/D"}