@azure/msal-browser 3.1.0 → 3.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app/IPublicClientApplication.d.ts.map +1 -1
- package/dist/app/IPublicClientApplication.mjs +20 -19
- package/dist/app/IPublicClientApplication.mjs.map +1 -1
- package/dist/app/PublicClientApplication.d.ts +14 -6
- package/dist/app/PublicClientApplication.d.ts.map +1 -1
- package/dist/app/PublicClientApplication.mjs +18 -8
- package/dist/app/PublicClientApplication.mjs.map +1 -1
- package/dist/app/PublicClientNext.d.ts +274 -0
- package/dist/app/PublicClientNext.d.ts.map +1 -0
- package/dist/app/PublicClientNext.mjs +362 -0
- package/dist/app/PublicClientNext.mjs.map +1 -0
- package/dist/broker/nativeBroker/NativeMessageHandler.d.ts +3 -4
- package/dist/broker/nativeBroker/NativeMessageHandler.d.ts.map +1 -1
- package/dist/broker/nativeBroker/NativeMessageHandler.mjs +13 -13
- package/dist/broker/nativeBroker/NativeMessageHandler.mjs.map +1 -1
- package/dist/broker/nativeBroker/NativeStatusCodes.d.ts +8 -0
- package/dist/broker/nativeBroker/NativeStatusCodes.d.ts.map +1 -0
- package/dist/broker/nativeBroker/NativeStatusCodes.mjs +16 -0
- package/dist/broker/nativeBroker/NativeStatusCodes.mjs.map +1 -0
- package/dist/cache/AsyncMemoryStorage.mjs +1 -1
- package/dist/cache/BrowserCacheManager.d.ts +4 -15
- package/dist/cache/BrowserCacheManager.d.ts.map +1 -1
- package/dist/cache/BrowserCacheManager.mjs +13 -69
- package/dist/cache/BrowserCacheManager.mjs.map +1 -1
- package/dist/cache/BrowserStorage.d.ts.map +1 -1
- package/dist/cache/BrowserStorage.mjs +7 -9
- package/dist/cache/BrowserStorage.mjs.map +1 -1
- package/dist/cache/CryptoKeyStore.mjs +1 -1
- package/dist/cache/DatabaseStorage.mjs +1 -1
- package/dist/cache/MemoryStorage.mjs +1 -1
- package/dist/cache/TokenCache.mjs +1 -1
- package/dist/config/Configuration.d.ts +4 -0
- package/dist/config/Configuration.d.ts.map +1 -1
- package/dist/config/Configuration.mjs +8 -7
- package/dist/config/Configuration.mjs.map +1 -1
- package/dist/controllers/ControllerFactory.d.ts +2 -1
- package/dist/controllers/ControllerFactory.d.ts.map +1 -1
- package/dist/controllers/ControllerFactory.mjs +26 -19
- package/dist/controllers/ControllerFactory.mjs.map +1 -1
- package/dist/controllers/IController.d.ts +3 -2
- package/dist/controllers/IController.d.ts.map +1 -1
- package/dist/controllers/NestedAppAuthController.d.ts +96 -0
- package/dist/controllers/NestedAppAuthController.d.ts.map +1 -0
- package/dist/controllers/NestedAppAuthController.mjs +345 -0
- package/dist/controllers/NestedAppAuthController.mjs.map +1 -0
- package/dist/controllers/StandardController.d.ts +11 -6
- package/dist/controllers/StandardController.d.ts.map +1 -1
- package/dist/controllers/StandardController.mjs +67 -45
- package/dist/controllers/StandardController.mjs.map +1 -1
- package/dist/controllers/UnknownOperatingContextController.d.ts +88 -0
- package/dist/controllers/UnknownOperatingContextController.d.ts.map +1 -0
- package/dist/controllers/UnknownOperatingContextController.mjs +275 -0
- package/dist/controllers/UnknownOperatingContextController.mjs.map +1 -0
- package/dist/crypto/BrowserCrypto.d.ts +44 -49
- package/dist/crypto/BrowserCrypto.d.ts.map +1 -1
- package/dist/crypto/BrowserCrypto.mjs +77 -77
- package/dist/crypto/BrowserCrypto.mjs.map +1 -1
- package/dist/crypto/CryptoOps.d.ts +1 -7
- package/dist/crypto/CryptoOps.d.ts.map +1 -1
- package/dist/crypto/CryptoOps.mjs +18 -23
- package/dist/crypto/CryptoOps.mjs.map +1 -1
- package/dist/crypto/PkceGenerator.d.ts +6 -21
- package/dist/crypto/PkceGenerator.d.ts.map +1 -1
- package/dist/crypto/PkceGenerator.mjs +45 -46
- package/dist/crypto/PkceGenerator.mjs.map +1 -1
- package/dist/crypto/SignedHttpRequest.mjs +1 -1
- package/dist/encode/Base64Decode.d.ts.map +1 -1
- package/dist/encode/Base64Decode.mjs +18 -2
- package/dist/encode/Base64Decode.mjs.map +1 -1
- package/dist/encode/Base64Encode.mjs +1 -1
- package/dist/error/BrowserAuthError.d.ts +10 -1
- package/dist/error/BrowserAuthError.d.ts.map +1 -1
- package/dist/error/BrowserAuthError.mjs +12 -3
- package/dist/error/BrowserAuthError.mjs.map +1 -1
- package/dist/error/BrowserAuthErrorCodes.d.ts +1 -0
- package/dist/error/BrowserAuthErrorCodes.d.ts.map +1 -1
- package/dist/error/BrowserAuthErrorCodes.mjs +3 -2
- package/dist/error/BrowserAuthErrorCodes.mjs.map +1 -1
- package/dist/error/BrowserConfigurationAuthError.d.ts +9 -46
- package/dist/error/BrowserConfigurationAuthError.d.ts.map +1 -1
- package/dist/error/BrowserConfigurationAuthError.mjs +20 -73
- package/dist/error/BrowserConfigurationAuthError.mjs.map +1 -1
- package/dist/error/BrowserConfigurationAuthErrorCodes.d.ts +4 -0
- package/dist/error/BrowserConfigurationAuthErrorCodes.d.ts.map +1 -0
- package/dist/error/BrowserConfigurationAuthErrorCodes.mjs +12 -0
- package/dist/error/BrowserConfigurationAuthErrorCodes.mjs.map +1 -0
- package/dist/error/NativeAuthError.d.ts +17 -45
- package/dist/error/NativeAuthError.d.ts.map +1 -1
- package/dist/error/NativeAuthError.mjs +47 -78
- package/dist/error/NativeAuthError.mjs.map +1 -1
- package/dist/error/NativeAuthErrorCodes.d.ts +3 -0
- package/dist/error/NativeAuthErrorCodes.d.ts.map +1 -0
- package/dist/error/NativeAuthErrorCodes.mjs +11 -0
- package/dist/error/NativeAuthErrorCodes.mjs.map +1 -0
- package/dist/error/NestedAppAuthError.d.ts +15 -0
- package/dist/error/NestedAppAuthError.d.ts.map +1 -0
- package/dist/error/NestedAppAuthError.mjs +30 -0
- package/dist/error/NestedAppAuthError.mjs.map +1 -0
- package/dist/event/EventHandler.d.ts.map +1 -1
- package/dist/event/EventHandler.mjs +3 -2
- package/dist/event/EventHandler.mjs.map +1 -1
- package/dist/event/EventMessage.mjs +1 -1
- package/dist/event/EventType.mjs +1 -1
- package/dist/index.d.ts +5 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.mjs +7 -3
- package/dist/index.mjs.map +1 -1
- package/dist/interaction_client/BaseInteractionClient.d.ts.map +1 -1
- package/dist/interaction_client/BaseInteractionClient.mjs +10 -11
- package/dist/interaction_client/BaseInteractionClient.mjs.map +1 -1
- package/dist/interaction_client/HybridSpaAuthorizationCodeClient.mjs +1 -1
- package/dist/interaction_client/NativeInteractionClient.d.ts.map +1 -1
- package/dist/interaction_client/NativeInteractionClient.mjs +26 -13
- package/dist/interaction_client/NativeInteractionClient.mjs.map +1 -1
- package/dist/interaction_client/PopupClient.d.ts.map +1 -1
- package/dist/interaction_client/PopupClient.mjs +5 -4
- package/dist/interaction_client/PopupClient.mjs.map +1 -1
- package/dist/interaction_client/RedirectClient.mjs +7 -7
- package/dist/interaction_client/SilentAuthCodeClient.d.ts.map +1 -1
- package/dist/interaction_client/SilentAuthCodeClient.mjs +7 -10
- package/dist/interaction_client/SilentAuthCodeClient.mjs.map +1 -1
- package/dist/interaction_client/SilentCacheClient.d.ts.map +1 -1
- package/dist/interaction_client/SilentCacheClient.mjs +11 -18
- package/dist/interaction_client/SilentCacheClient.mjs.map +1 -1
- package/dist/interaction_client/SilentIframeClient.d.ts.map +1 -1
- package/dist/interaction_client/SilentIframeClient.mjs +27 -13
- package/dist/interaction_client/SilentIframeClient.mjs.map +1 -1
- package/dist/interaction_client/SilentRefreshClient.d.ts.map +1 -1
- package/dist/interaction_client/SilentRefreshClient.mjs +8 -18
- package/dist/interaction_client/SilentRefreshClient.mjs.map +1 -1
- package/dist/interaction_client/StandardInteractionClient.d.ts.map +1 -1
- package/dist/interaction_client/StandardInteractionClient.mjs +16 -37
- package/dist/interaction_client/StandardInteractionClient.mjs.map +1 -1
- package/dist/interaction_handler/InteractionHandler.d.ts.map +1 -1
- package/dist/interaction_handler/InteractionHandler.mjs +6 -9
- package/dist/interaction_handler/InteractionHandler.mjs.map +1 -1
- package/dist/interaction_handler/RedirectHandler.d.ts.map +1 -1
- package/dist/interaction_handler/RedirectHandler.mjs +3 -3
- package/dist/interaction_handler/RedirectHandler.mjs.map +1 -1
- package/dist/interaction_handler/SilentHandler.d.ts +13 -47
- package/dist/interaction_handler/SilentHandler.d.ts.map +1 -1
- package/dist/interaction_handler/SilentHandler.mjs +120 -156
- package/dist/interaction_handler/SilentHandler.mjs.map +1 -1
- package/dist/naa/AccountInfo.d.ts +13 -0
- package/dist/naa/AccountInfo.d.ts.map +1 -0
- package/dist/naa/AccountRequests.d.ts +10 -0
- package/dist/naa/AccountRequests.d.ts.map +1 -0
- package/dist/naa/AuthBridge.d.ts +6 -0
- package/dist/naa/AuthBridge.d.ts.map +1 -0
- package/dist/naa/BridgeCapabilities.d.ts +4 -0
- package/dist/naa/BridgeCapabilities.d.ts.map +1 -0
- package/dist/naa/BridgeError.d.ts +10 -0
- package/dist/naa/BridgeError.d.ts.map +1 -0
- package/dist/naa/BridgeError.mjs +12 -0
- package/dist/naa/BridgeError.mjs.map +1 -0
- package/dist/naa/BridgeProxy.d.ts +72 -0
- package/dist/naa/BridgeProxy.d.ts.map +1 -0
- package/dist/naa/BridgeProxy.mjs +154 -0
- package/dist/naa/BridgeProxy.mjs.map +1 -0
- package/dist/naa/BridgeRequest.d.ts +7 -0
- package/dist/naa/BridgeRequest.d.ts.map +1 -0
- package/dist/naa/BridgeRequestEnvelope.d.ts +14 -0
- package/dist/naa/BridgeRequestEnvelope.d.ts.map +1 -0
- package/dist/naa/BridgeResponseEnvelope.d.ts +11 -0
- package/dist/naa/BridgeResponseEnvelope.d.ts.map +1 -0
- package/dist/naa/BridgeStatusCode.d.ts +11 -0
- package/dist/naa/BridgeStatusCode.d.ts.map +1 -0
- package/dist/naa/BridgeStatusCode.mjs +20 -0
- package/dist/naa/BridgeStatusCode.mjs.map +1 -0
- package/dist/naa/IBridgeProxy.d.ts +11 -0
- package/dist/naa/IBridgeProxy.d.ts.map +1 -0
- package/dist/naa/InitializeBridgeResponse.d.ts +7 -0
- package/dist/naa/InitializeBridgeResponse.d.ts.map +1 -0
- package/dist/naa/TokenRequest.d.ts +22 -0
- package/dist/naa/TokenRequest.d.ts.map +1 -0
- package/dist/naa/TokenResponse.d.ts +17 -0
- package/dist/naa/TokenResponse.d.ts.map +1 -0
- package/dist/naa/mapping/NestedAppAuthAdapter.d.ts +26 -0
- package/dist/naa/mapping/NestedAppAuthAdapter.d.ts.map +1 -0
- package/dist/naa/mapping/NestedAppAuthAdapter.mjs +178 -0
- package/dist/naa/mapping/NestedAppAuthAdapter.mjs.map +1 -0
- package/dist/navigation/NavigationClient.mjs +1 -1
- package/dist/network/FetchClient.mjs +1 -1
- package/dist/operatingcontext/BaseOperatingContext.mjs +1 -1
- package/dist/operatingcontext/StandardOperatingContext.mjs +1 -1
- package/dist/operatingcontext/TeamsAppOperatingContext.d.ts +7 -0
- package/dist/operatingcontext/TeamsAppOperatingContext.d.ts.map +1 -1
- package/dist/operatingcontext/TeamsAppOperatingContext.mjs +45 -4
- package/dist/operatingcontext/TeamsAppOperatingContext.mjs.map +1 -1
- package/dist/operatingcontext/UnknownOperatingContext.d.ts +26 -0
- package/dist/operatingcontext/UnknownOperatingContext.d.ts.map +1 -0
- package/dist/operatingcontext/UnknownOperatingContext.mjs +49 -0
- package/dist/operatingcontext/UnknownOperatingContext.mjs.map +1 -0
- package/dist/packageMetadata.d.ts +1 -1
- package/dist/packageMetadata.mjs +2 -2
- package/dist/telemetry/BrowserPerformanceClient.mjs +1 -1
- package/dist/telemetry/BrowserPerformanceMeasurement.mjs +1 -1
- package/dist/utils/BrowserConstants.mjs +1 -1
- package/dist/utils/BrowserProtocolUtils.d.ts.map +1 -1
- package/dist/utils/BrowserProtocolUtils.mjs +3 -3
- package/dist/utils/BrowserProtocolUtils.mjs.map +1 -1
- package/dist/utils/BrowserUtils.d.ts +54 -53
- package/dist/utils/BrowserUtils.d.ts.map +1 -1
- package/dist/utils/BrowserUtils.mjs +114 -102
- package/dist/utils/BrowserUtils.mjs.map +1 -1
- package/lib/msal-browser.cjs +61 -18042
- package/lib/msal-browser.cjs.map +1 -1
- package/lib/msal-browser.js +13593 -12505
- package/lib/msal-browser.js.map +1 -1
- package/lib/msal-browser.min.js +66 -65
- package/package.json +2 -2
- package/src/app/IPublicClientApplication.ts +55 -18
- package/src/app/PublicClientApplication.ts +19 -7
- package/src/app/PublicClientNext.ts +442 -0
- package/src/broker/nativeBroker/NativeMessageHandler.ts +12 -15
- package/src/broker/nativeBroker/NativeStatusCodes.ts +13 -0
- package/src/cache/BrowserCacheManager.ts +29 -103
- package/src/cache/BrowserStorage.ts +9 -11
- package/src/config/Configuration.ts +21 -8
- package/src/controllers/ControllerFactory.ts +36 -25
- package/src/controllers/IController.ts +4 -1
- package/src/controllers/NestedAppAuthController.ts +525 -0
- package/src/controllers/StandardController.ts +163 -98
- package/src/controllers/UnknownOperatingContextController.ts +383 -0
- package/src/crypto/BrowserCrypto.ts +119 -103
- package/src/crypto/CryptoOps.ts +18 -27
- package/src/crypto/PkceGenerator.ts +93 -54
- package/src/encode/Base64Decode.ts +21 -1
- package/src/error/BrowserAuthError.ts +13 -1
- package/src/error/BrowserAuthErrorCodes.ts +1 -0
- package/src/error/BrowserConfigurationAuthError.ts +33 -102
- package/src/error/BrowserConfigurationAuthErrorCodes.ts +9 -0
- package/src/error/NativeAuthError.ts +73 -101
- package/src/error/NativeAuthErrorCodes.ts +7 -0
- package/src/error/NestedAppAuthError.ts +32 -0
- package/src/event/EventHandler.ts +2 -1
- package/src/index.ts +8 -10
- package/src/interaction_client/BaseInteractionClient.ts +14 -8
- package/src/interaction_client/NativeInteractionClient.ts +48 -14
- package/src/interaction_client/PopupClient.ts +2 -1
- package/src/interaction_client/RedirectClient.ts +1 -1
- package/src/interaction_client/SilentAuthCodeClient.ts +22 -19
- package/src/interaction_client/SilentCacheClient.ts +28 -28
- package/src/interaction_client/SilentIframeClient.ts +54 -18
- package/src/interaction_client/SilentRefreshClient.ts +26 -28
- package/src/interaction_client/StandardInteractionClient.ts +37 -68
- package/src/interaction_handler/InteractionHandler.ts +20 -15
- package/src/interaction_handler/RedirectHandler.ts +6 -2
- package/src/interaction_handler/SilentHandler.ts +177 -230
- package/src/naa/AccountInfo.ts +17 -0
- package/src/naa/AccountRequests.ts +16 -0
- package/src/naa/AuthBridge.ts +16 -0
- package/src/naa/BridgeCapabilities.ts +8 -0
- package/src/naa/BridgeError.ts +18 -0
- package/src/naa/BridgeProxy.ts +230 -0
- package/src/naa/BridgeRequest.ts +12 -0
- package/src/naa/BridgeRequestEnvelope.ts +46 -0
- package/src/naa/BridgeResponseEnvelope.ts +21 -0
- package/src/naa/BridgeStatusCode.ts +15 -0
- package/src/naa/IBridgeProxy.ts +25 -0
- package/src/naa/InitializeBridgeResponse.ts +12 -0
- package/src/naa/TokenRequest.ts +26 -0
- package/src/naa/TokenResponse.ts +61 -0
- package/src/naa/mapping/NestedAppAuthAdapter.ts +252 -0
- package/src/operatingcontext/TeamsAppOperatingContext.ts +43 -3
- package/src/operatingcontext/UnknownOperatingContext.ts +48 -0
- package/src/packageMetadata.ts +1 -1
- package/src/utils/BrowserProtocolUtils.ts +3 -2
- package/src/utils/BrowserUtils.ts +133 -125
- package/dist/crypto/ISubtleCrypto.d.ts +0 -10
- package/dist/crypto/ISubtleCrypto.d.ts.map +0 -1
- package/dist/crypto/ModernBrowserCrypto.d.ts +0 -10
- package/dist/crypto/ModernBrowserCrypto.d.ts.map +0 -1
- package/dist/crypto/ModernBrowserCrypto.mjs +0 -31
- package/dist/crypto/ModernBrowserCrypto.mjs.map +0 -1
- package/dist/utils/BrowserStringUtils.d.ts +0 -22
- package/dist/utils/BrowserStringUtils.d.ts.map +0 -1
- package/dist/utils/BrowserStringUtils.mjs +0 -144
- package/dist/utils/BrowserStringUtils.mjs.map +0 -1
- package/src/crypto/ISubtleCrypto.ts +0 -30
- package/src/crypto/ModernBrowserCrypto.ts +0 -69
- package/src/utils/BrowserStringUtils.ts +0 -143
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
|
-
import { AccountEntity, PerformanceEvents, AuthenticationScheme,
|
|
3
|
+
import { AccountEntity, PerformanceEvents, AuthenticationScheme, createClientConfigurationError, ClientConfigurationErrorCodes, StringUtils, UrlString, ServerTelemetryManager, AuthorityFactory } from '@azure/msal-common';
|
|
4
4
|
import { version } from '../packageMetadata.mjs';
|
|
5
5
|
import { BrowserConstants } from '../utils/BrowserConstants.mjs';
|
|
6
|
-
import {
|
|
6
|
+
import { getCurrentUri } from '../utils/BrowserUtils.mjs';
|
|
7
|
+
import { createNewGuid } from '../crypto/BrowserCrypto.mjs';
|
|
7
8
|
|
|
8
9
|
/*
|
|
9
10
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -18,8 +19,7 @@ class BaseInteractionClient {
|
|
|
18
19
|
this.eventHandler = eventHandler;
|
|
19
20
|
this.navigationClient = navigationClient;
|
|
20
21
|
this.nativeMessageHandler = nativeMessageHandler;
|
|
21
|
-
this.correlationId =
|
|
22
|
-
correlationId || this.browserCrypto.createNewGuid();
|
|
22
|
+
this.correlationId = correlationId || createNewGuid();
|
|
23
23
|
this.logger = logger.clone(BrowserConstants.MSAL_SKU, version, this.correlationId);
|
|
24
24
|
this.performanceClient = performanceClient;
|
|
25
25
|
}
|
|
@@ -57,7 +57,6 @@ class BaseInteractionClient {
|
|
|
57
57
|
*/
|
|
58
58
|
async initializeBaseRequest(request, account) {
|
|
59
59
|
this.performanceClient.addQueueMeasurement(PerformanceEvents.InitializeBaseRequest, request.correlationId);
|
|
60
|
-
this.logger.verbose("Initializing BaseAuthRequest");
|
|
61
60
|
const authority = request.authority || this.config.auth.authority;
|
|
62
61
|
if (account) {
|
|
63
62
|
await this.validateRequestAuthority(authority, account);
|
|
@@ -78,10 +77,10 @@ class BaseInteractionClient {
|
|
|
78
77
|
if (validatedRequest.authenticationScheme ===
|
|
79
78
|
AuthenticationScheme.SSH) {
|
|
80
79
|
if (!request.sshJwk) {
|
|
81
|
-
throw
|
|
80
|
+
throw createClientConfigurationError(ClientConfigurationErrorCodes.missingSshJwk);
|
|
82
81
|
}
|
|
83
82
|
if (!request.sshKid) {
|
|
84
|
-
throw
|
|
83
|
+
throw createClientConfigurationError(ClientConfigurationErrorCodes.missingSshKid);
|
|
85
84
|
}
|
|
86
85
|
}
|
|
87
86
|
this.logger.verbose(`Authentication Scheme set to "${validatedRequest.authenticationScheme}" as configured in Auth request`);
|
|
@@ -107,8 +106,8 @@ class BaseInteractionClient {
|
|
|
107
106
|
this.logger.verbose("getRedirectUri called");
|
|
108
107
|
const redirectUri = requestRedirectUri ||
|
|
109
108
|
this.config.auth.redirectUri ||
|
|
110
|
-
|
|
111
|
-
return UrlString.getAbsoluteUrl(redirectUri,
|
|
109
|
+
getCurrentUri();
|
|
110
|
+
return UrlString.getAbsoluteUrl(redirectUri, getCurrentUri());
|
|
112
111
|
}
|
|
113
112
|
/*
|
|
114
113
|
* If authority provided in the request does not match environment/authority specified
|
|
@@ -117,7 +116,7 @@ class BaseInteractionClient {
|
|
|
117
116
|
async validateRequestAuthority(authority, account) {
|
|
118
117
|
const discoveredAuthority = await this.getDiscoveredAuthority(authority);
|
|
119
118
|
if (!discoveredAuthority.isAlias(account.environment)) {
|
|
120
|
-
throw
|
|
119
|
+
throw createClientConfigurationError(ClientConfigurationErrorCodes.authorityMismatch);
|
|
121
120
|
}
|
|
122
121
|
}
|
|
123
122
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseInteractionClient.mjs","sources":["../../src/interaction_client/BaseInteractionClient.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BaseInteractionClient.mjs","sources":["../../src/interaction_client/BaseInteractionClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;AAKA;AAoBA;AACA;AACA;AASO,MAAE,qBAAsB,CAAA;AAC/B,IAAA,WAAS,CAAA,MAAA,EAAA,WAAsB,EAAM,mCAAmC,EAAA,gBAAA,EAAA,iBAAA,EAAA,oBAAA,EAAA,aAAA,EAAA;AACxE,QAAS,IAAA,CAAA,MAAA,GAAA,MAAmB,CAAA;AAG5B,QAAA,IAAA,CAAA,cAAA,GAAsB,WAAqB,CAAA;AACvC,QAAA,IAAA,CAAS,aAAS,GAAA,aAAoB,CAAC;AACvC,QAAA,IAAA,CAAS,aAAC,GAAgB,IAAA,CAAA,MAAA,CAAA,MAAA,CAAA,aAAoB,CAAA;AAC9C,QAAA,IAAA,CAAS,YAAC,GAAe,YAAQ,CAAA;AACjC,QAAA,IAAA,CAAS,gBAAgB,GAAA,gBAAe,CAAA;AACxC,QAAA,IAAA,CAAS,oBAAgB,GAAA,oBAAA,CAAA;AACzB,QAAA,IAAA,CAAS,aAAa,GAAE,aAAa,IAAA,aAAA,EAAA,CAAA;AACrC,QAAA,IAAA,CAAS,MAAC,GAAA,MAAA,CAAA,KAAkB,CAAA,gBAAkB,CAAA,QAAA,EAAA,OAAA,EAAA,IAAA,CAAA,aAAA,CAAA,CAAA;AAC9C,QAAA,IAAA,CAAS,iBAAqB,GAAA,iBAAsB,CAAA;AACpD,KAAA;AACA,IAAA,MAAA,kBAAU,CAAA,OAAmB,EAAA;AAGzB,QAAA,IAAA,OAAA,EAAA;AA0BJ,YAAQ,IAAa,aACV,CAAA,0BAAoB,EAAA,IAAA,CAAA,cAAe,CAAA,gBACpC,EAAqB,EAAA,KAAA,CAAA,EAAA;AAE/B,gBAAS,IACL,CAAA,MAAO,QAAmB,CAAA,gCAAoB,CAAG,CAAS;gBAG5B,IAAA,CAAA,cACvB,CAAA,gBAAG,CAAA,IAAc,CAAA,CAAA;AA4C5B,aAAA;;;AAGG,gBAAA,MAAA,IAAA,CAAA,cAAA,CAAA,aAAA,CAAA,aAAA,CAAA,uBAAA,CAAA,OAAA,CAAA,CAAA,CAAA;AACa,gBAAA,IAAA,CAAA,MAAA,CAAA,OAAqB,CACjC;AA+DJ,aAAA;;;;;;AAMG,YAAA,IAAA;AACH,gBAAA,IAAiC,CAAA,MAAA,CAAA,OAAA,CAAA,kEAAkB,EAAA,IAAA,CAAA,aAAA,CAAA,CAAA;AAgB7C;AAeN,gBAAA,MAAA,IAAA,CAAA,cAAA,CAAA,KAAA,EAAA,CAAA;;;;;AAKG,gBAAA,IAAA,CAAA,MAAA,CAAA,KAAA,CAAA,4EAAA,CAAA,CAAA;AACH,aAAS;AAoBT,SAAA;;;;AAIG;;AAqCN,IAAA,MAAA,qBAAA,CAAA,OAAA,EAAA,OAAA,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NativeInteractionClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/NativeInteractionClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,MAAM,EACN,OAAO,EAIP,aAAa,EAEb,QAAQ,EAOR,kBAAkB,
|
|
1
|
+
{"version":3,"file":"NativeInteractionClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/NativeInteractionClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
|
-
import { PerformanceEvents, TimeUtils, ScopeSet,
|
|
3
|
+
import { PerformanceEvents, TimeUtils, ScopeSet, createClientAuthError, ClientAuthErrorCodes, AuthToken, AccountEntity, Constants, AuthorityType, AuthenticationScheme, PopTokenGenerator, IdTokenEntity, AccessTokenEntity, CacheRecord, createAuthError, AuthErrorCodes, UrlString, OIDC_DEFAULT_SCOPES, invokeAsync, AADServerParamKeys, PromptValue } from '@azure/msal-common';
|
|
4
4
|
import { BaseInteractionClient } from './BaseInteractionClient.mjs';
|
|
5
5
|
import { TemporaryCacheKeys, NativeConstants, NativeExtensionMethod, ApiId } from '../utils/BrowserConstants.mjs';
|
|
6
|
-
import { NativeAuthError } from '../error/NativeAuthError.mjs';
|
|
6
|
+
import { NativeAuthError, isFatalNativeAuthError, createNativeAuthError } from '../error/NativeAuthError.mjs';
|
|
7
7
|
import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
|
|
8
8
|
import { SilentCacheClient } from './SilentCacheClient.mjs';
|
|
9
9
|
import { base64Decode } from '../encode/Base64Decode.mjs';
|
|
10
|
+
import { userSwitch } from '../error/NativeAuthErrorCodes.mjs';
|
|
10
11
|
import { nativePromptNotSupported } from '../error/BrowserAuthErrorCodes.mjs';
|
|
11
12
|
|
|
12
13
|
/*
|
|
@@ -31,6 +32,7 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
31
32
|
* @param request
|
|
32
33
|
*/
|
|
33
34
|
async acquireToken(request) {
|
|
35
|
+
this.performanceClient.addQueueMeasurement(PerformanceEvents.NativeInteractionClientAcquireToken, request.correlationId);
|
|
34
36
|
this.logger.trace("NativeInteractionClient - acquireToken called.");
|
|
35
37
|
// start the perf measurement
|
|
36
38
|
const nativeATMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.NativeInteractionClientAcquireToken, request.correlationId);
|
|
@@ -101,22 +103,26 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
101
103
|
async acquireTokensFromCache(nativeAccountId, request) {
|
|
102
104
|
if (!nativeAccountId) {
|
|
103
105
|
this.logger.warning("NativeInteractionClient:acquireTokensFromCache - No nativeAccountId provided");
|
|
104
|
-
throw
|
|
106
|
+
throw createClientAuthError(ClientAuthErrorCodes.noAccountFound);
|
|
105
107
|
}
|
|
106
108
|
// fetch the account from browser cache
|
|
107
|
-
const account = this.browserStorage.
|
|
109
|
+
const account = this.browserStorage.getBaseAccountInfo({
|
|
108
110
|
nativeAccountId,
|
|
109
111
|
});
|
|
110
112
|
if (!account) {
|
|
111
|
-
throw
|
|
113
|
+
throw createClientAuthError(ClientAuthErrorCodes.noAccountFound);
|
|
112
114
|
}
|
|
113
115
|
// leverage silent flow for cached tokens retrieval
|
|
114
116
|
try {
|
|
115
117
|
const silentRequest = this.createSilentCacheRequest(request, account);
|
|
116
118
|
const result = await this.silentCacheClient.acquireToken(silentRequest);
|
|
119
|
+
const fullAccount = {
|
|
120
|
+
...account,
|
|
121
|
+
idTokenClaims: result?.idTokenClaims,
|
|
122
|
+
};
|
|
117
123
|
return {
|
|
118
124
|
...result,
|
|
119
|
-
account,
|
|
125
|
+
account: fullAccount,
|
|
120
126
|
};
|
|
121
127
|
}
|
|
122
128
|
catch (e) {
|
|
@@ -140,7 +146,7 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
140
146
|
}
|
|
141
147
|
catch (e) {
|
|
142
148
|
// Only throw fatal errors here to allow application to fallback to regular redirect. Otherwise proceed and the error will be thrown in handleRedirectPromise
|
|
143
|
-
if (e instanceof NativeAuthError && e
|
|
149
|
+
if (e instanceof NativeAuthError && isFatalNativeAuthError(e)) {
|
|
144
150
|
throw e;
|
|
145
151
|
}
|
|
146
152
|
}
|
|
@@ -211,7 +217,7 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
211
217
|
this.logger.trace("NativeInteractionClient - handleNativeResponse called.");
|
|
212
218
|
if (response.account.id !== request.accountId) {
|
|
213
219
|
// User switch in native broker prompt is not supported. All users must first sign in through web flow to ensure server state is in sync
|
|
214
|
-
throw
|
|
220
|
+
throw createNativeAuthError(userSwitch);
|
|
215
221
|
}
|
|
216
222
|
// Get the preferred_cache domain for the given authority
|
|
217
223
|
const authority = await this.getDiscoveredAuthority(request.authority);
|
|
@@ -282,7 +288,7 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
282
288
|
* PopTokenGenerator to query the full key for signing
|
|
283
289
|
*/
|
|
284
290
|
if (!request.keyId) {
|
|
285
|
-
throw
|
|
291
|
+
throw createClientAuthError(ClientAuthErrorCodes.keyIdMissing);
|
|
286
292
|
}
|
|
287
293
|
return await popTokenGenerator.signPopToken(response.access_token, request.keyId, shrParameters);
|
|
288
294
|
}
|
|
@@ -315,6 +321,13 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
315
321
|
const tid = accountProperties["TenantId"] ||
|
|
316
322
|
idTokenClaims.tid ||
|
|
317
323
|
Constants.EMPTY_STRING;
|
|
324
|
+
const fullAccountEntity = idTokenClaims
|
|
325
|
+
? Object.assign(new AccountEntity(), {
|
|
326
|
+
...accountEntity,
|
|
327
|
+
idTokenClaims: idTokenClaims,
|
|
328
|
+
})
|
|
329
|
+
: accountEntity;
|
|
330
|
+
const accountInfo = fullAccountEntity.getAccountInfo();
|
|
318
331
|
// generate PoP token as needed
|
|
319
332
|
const responseAccessToken = await this.generatePopAccessToken(response, request);
|
|
320
333
|
const tokenType = request.tokenType === AuthenticationScheme.POP
|
|
@@ -325,7 +338,7 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
325
338
|
uniqueId: uid,
|
|
326
339
|
tenantId: tid,
|
|
327
340
|
scopes: responseScopes.asArray(),
|
|
328
|
-
account:
|
|
341
|
+
account: accountInfo,
|
|
329
342
|
idToken: response.id_token,
|
|
330
343
|
idTokenClaims: idTokenClaims,
|
|
331
344
|
accessToken: responseAccessToken,
|
|
@@ -412,7 +425,7 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
412
425
|
return response;
|
|
413
426
|
}
|
|
414
427
|
else {
|
|
415
|
-
throw
|
|
428
|
+
throw createAuthError(AuthErrorCodes.unexpectedError, "Response missing expected properties.");
|
|
416
429
|
}
|
|
417
430
|
}
|
|
418
431
|
/**
|
|
@@ -515,7 +528,7 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
515
528
|
shrNonce: request.shrNonce,
|
|
516
529
|
};
|
|
517
530
|
const popTokenGenerator = new PopTokenGenerator(this.browserCrypto);
|
|
518
|
-
const reqCnfData = await popTokenGenerator.generateCnf(shrParameters);
|
|
531
|
+
const reqCnfData = await invokeAsync(popTokenGenerator.generateCnf.bind(popTokenGenerator), PerformanceEvents.PopTokenGenerateCnf, this.logger, this.performanceClient, this.correlationId)(shrParameters, this.logger);
|
|
519
532
|
// to reduce the URL length, it is recommended to send the hash of the req_cnf instead of the whole string
|
|
520
533
|
validatedRequest.reqCnf = reqCnfData.reqCnfHash;
|
|
521
534
|
validatedRequest.keyId = reqCnfData.kid;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NativeInteractionClient.mjs","sources":["../../src/interaction_client/NativeInteractionClient.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NativeInteractionClient.mjs","sources":["../../src/interaction_client/NativeInteractionClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;AAKA;AA+BA;AACA;AACA;AAgBA,MAAA,wBAA+B;AAO/B,IAAA,gBAAS,EAAA;AAET,IAAA,mBAAS,EAAA;AAKT,CAAA,CAAA;AACO,MAAE,uBAAsB;AAQ/B,IAAa,WAAA,CAAA,MAAA,EAAA,cAAA,EAAA,aAAgC,EAAqB,MAAA,EAAA,YAAA,EAAA,gBAAA,EAAA,KAAA,EAAA,iBAAA,EAAA,QAAA,EAAA,SAAA,EAAA,iBAAA,EAAA,aAAA,EAAA;AAC9D,QAAA,KAAS,CAAC,MAAO,EAAA,cAAM,EAAA,aAAA,EAAA,MAAA,EAAA,YAAA,EAAA,gBAAA,EAAA,iBAAA,EAAA,QAAA,EAAA,aAAA,CAAA,CAAA;AACvB,QAAA,IAAA,CAAS,KAAC,GAAA,KAAW,CAAA;AACrB,QAAA,IAAA,CAAS,SAAC,GAAA,SAAoB,CAAE;AAChC,QAAA,IAAA,CAAS,oBAAoB,GAAA,QAAA,CAAA;AAC7B,QAAA,IAAA,CAAS,oBAAC,GAAsB,iBAAA,CAAA;sDAI5B,CAAA,QAAmC,IAAA,CAAA,mCACpB,EAAO,MAChB,EAAA,YACN,EAAA,gBAA0B,EAAA,iBACV,EAAA,QAAmB,EAAA,aAAA,CACnC;AAmCJ,KAAA;;;AAGG;AACG;AA0EN,IAAA,MAAA,YAAA,CAAA,OAAA,EAAA;;;;;AAKG,QAAA,MAAA,YAAA,GAAA,SAAA,CAAA,UAAA,EAAA,CAAA;AACH;AAaA,QAAA,MAAA,aAAA,GAAA,MAAA,IAAA,CAAA,uBAAA,CAAA,OAAA,CAAA,CAAA;;;;;AAKG,gBAAA,OAAA,EAAA,IAAA;AACa,gBAAA,cAAA,EAAA,KACZ;AA0CJ,gBAAA,SAAA,EAAA,IAAA;;;AAGG,SAAA;QACuB,OAAA,CAAA,EAAA;AAyC1B;;AAEG,SAAA;AACG;AA4DN,QAAA,MAAA,WAAA,GAAA;;;AAGG,SAAA,CAAA;AACH,QAAA,MAAU,QAAQ,GAAA,MAAK,IAAA,CAAA,oBAAA,CAAA,WAAA,CAAA,WAAA,CAAA,CAAA;AAKvB,QAAA,MAAA,iBAAA,GAAA,IAAA,CAAA,sBAAA,CAAA,QAAA,CAAA,CAAA;;;;;AAKG,gBAAA,cAAA,EAAA,IAAA;AACa,gBAAA,SAAA,EAAA,MAAA,CAAoB,SACxB;AA4DZ,aAAA,CAAA,CAAA;;;;;AAKG,gBAAA,OAAA,EAAA,KAAA;gBACkC,SAAA,EAAA,KAAA,CAAA,SACjC;AAeJ,gBAAA,YAAA,EAAA,KAAA,CAAA,QAAA;;;;;AAKG,KAAA;;AAUH;;;;AAIG;AACG,IAAA,wBACF,CAAA,OAAU,EAAA,aAAc,EACxB;AA4CJ,QAAA,OAAA;;;;;;;;;AASG;AACa;AAoEhB;;;AAGG,IAAA,MAAA,sBAAA,CAAA,eAAA,EAAA,OAAA,EAAA;AACH,QAAA,IAAA,CAAA,eAAa,EAAa;AAY1B,YAAA,IAAA,CAAA,MAAA,CAAA,OAAA,CAAA,8EAAA,CAAA,CAAA;;;;;;;;;AASG,SAAA;AACH;QAqDS,IAAA;AAkCT,YAAA,MAAA,aAAA,GAAA,IAAA,CAAA,wBAAA,CAAA,OAAA,EAAA,OAAA,CAAA,CAAA;;;AAGG,gBAAA,GAAA,OAAA;AACH,gBAA8B,aAAA,EAAA,MAAA,EAAA,aAAA;AAkB9B,aAAA,CAAA;;;;AAIG,aAAA,CAAA;AACH,SAAA;AAcA,QAAA,OAAA,CAAA,EAAA;;;;AAIG;AACH;AAWA;;;AAGG,QAAA,IAAA,CAAA,MAAA,CAAA,KAAA,CAAA,wDAAA,CAAA,CAAA;cACa,aAAuB,GAAA,MAAA,IAC5B,CAAA;AA8GX,QAAA,MAAA,WAAA,GAAA;;;;AAIG,QAAA,IAAA;AACH,YAAQ,MAAuB,QAAA,GAAA,MAAA,IAAA,CAAA,oBAAA,CAAA,WAAA,CAAA,WAAA,CAAA,CAAA;AA4BlC,YAAA,IAAA,CAAA,sBAAA,CAAA,QAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopupClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/PopupClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAIH,uBAAuB,EAQvB,kBAAkB,EAClB,MAAM,EACN,OAAO,EAGV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAOxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAG3E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAKnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAEH,iBAAiB,EACpB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG;IAC1C,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,EAAE,qBAAqB,CAAC;CAChD,CAAC;AAEF,qBAAa,WAAY,SAAQ,yBAAyB;IACtD,OAAO,CAAC,aAAa,CAAqB;IAC1C,SAAS,CAAC,aAAa,EAAE,mBAAmB,CAAC;gBAGzC,MAAM,EAAE,oBAAoB,EAC5B,WAAW,EAAE,mBAAmB,EAChC,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,iBAAiB,EACnC,iBAAiB,EAAE,kBAAkB,EACrC,iBAAiB,EAAE,mBAAmB,EACtC,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,aAAa,CAAC,EAAE,MAAM;IAkB1B;;;OAGG;IACH,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAuClE;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgD7D;;;;;;;;OAQG;cACa,sBAAsB,CAClC,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,MAAM,EACjB,qBAAqB,EAAE,qBAAqB,EAC5C,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GACtB,OAAO,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"PopupClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/PopupClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { OIDC_DEFAULT_SCOPES, PerformanceEvents, Constants, UrlString, ThrottlingUtils, ProtocolUtils, AuthError, ProtocolMode, ServerResponseType } from '@azure/msal-common';
|
|
4
4
|
import { StandardInteractionClient } from './StandardInteractionClient.mjs';
|
|
5
5
|
import { EventType } from '../event/EventType.mjs';
|
|
6
6
|
import { ApiId, InteractionType, BrowserConstants } from '../utils/BrowserConstants.mjs';
|
|
7
|
-
import {
|
|
7
|
+
import { preconnect, getCurrentUri } from '../utils/BrowserUtils.mjs';
|
|
8
8
|
import { NativeInteractionClient } from './NativeInteractionClient.mjs';
|
|
9
9
|
import { NativeMessageHandler } from '../broker/nativeBroker/NativeMessageHandler.mjs';
|
|
10
10
|
import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
|
|
@@ -91,6 +91,7 @@ class PopupClient extends StandardInteractionClient {
|
|
|
91
91
|
const serverTelemetryManager = this.initializeServerTelemetryManager(ApiId.acquireTokenPopup);
|
|
92
92
|
this.performanceClient.setPreQueueTime(PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest, request.correlationId);
|
|
93
93
|
const validRequest = await this.initializeAuthorizationRequest(request, InteractionType.Popup);
|
|
94
|
+
preconnect(validRequest.authority);
|
|
94
95
|
this.browserStorage.updateCacheEntries(validRequest.state, validRequest.nonce, validRequest.authority, validRequest.loginHint || Constants.EMPTY_STRING, validRequest.account || null);
|
|
95
96
|
try {
|
|
96
97
|
// Create auth code request and generate PKCE params
|
|
@@ -205,7 +206,7 @@ class PopupClient extends StandardInteractionClient {
|
|
|
205
206
|
timeout: this.config.system.redirectNavigationTimeout,
|
|
206
207
|
noHistory: false,
|
|
207
208
|
};
|
|
208
|
-
const absoluteUrl = UrlString.getAbsoluteUrl(mainWindowRedirectUri,
|
|
209
|
+
const absoluteUrl = UrlString.getAbsoluteUrl(mainWindowRedirectUri, getCurrentUri());
|
|
209
210
|
await this.navigationClient.navigateInternal(absoluteUrl, navigationOptions);
|
|
210
211
|
}
|
|
211
212
|
if (popup) {
|
|
@@ -231,7 +232,7 @@ class PopupClient extends StandardInteractionClient {
|
|
|
231
232
|
timeout: this.config.system.redirectNavigationTimeout,
|
|
232
233
|
noHistory: false,
|
|
233
234
|
};
|
|
234
|
-
const absoluteUrl = UrlString.getAbsoluteUrl(mainWindowRedirectUri,
|
|
235
|
+
const absoluteUrl = UrlString.getAbsoluteUrl(mainWindowRedirectUri, getCurrentUri());
|
|
235
236
|
this.logger.verbose("Redirecting main window to url specified in the request");
|
|
236
237
|
this.logger.verbosePii(`Redirecting main window to: ${absoluteUrl}`);
|
|
237
238
|
await this.navigationClient.navigateInternal(absoluteUrl, navigationOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopupClient.mjs","sources":["../../src/interaction_client/PopupClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;AAKA;AAkBA;AAOA;AAGA;AAoBI,MAAc,oBAAQ,yBAAA,CAAA;IACtB,WAAW,OAAO,EAAA,WAAA,EAAA,aAAA,EAAA,MAAA,EAAA,YAAA,EAAA,gBAAA,EAAA,iBAAA,EAAA,iBAAA,EAAA,oBAAA,EAAA,aAAA,EAAA;QACG,KAAA,CAAA,MAAA,EAAA,0BAAuB,EAAC,MAAA,EAAA,YAAA,EAAA,gBAAA,EAAA,iBAAA,EAAA,oBAAA,EAAA,aAAA,CAAA,CAAA;;AAGjD,QAAa,IAAA,CAAA,YAAA,GAAA,IAAY,aAAiC,CAAA,IAAA,CAAA,IAAA,CAAA,CAAA;QAC/C,IAAC,cAAkC,GAAA,iBAAA,CAAA;AAC1C,KAAA;AAGI;AA2BJ;;;AAGG,IAAA,YAAA,CAAA,OAAA,EAAA;QACS,IAAA;AAuCZ,YAAA,MAAA,SAAA,GAAA,IAAA,CAAA,iBAAA,CAAA,OAAA,CAAA,MAAA,IAAA,mBAAA,EAAA,OAAA,CAAA,SAAA,IAAA,IAAA,CAAA,MAAA,CAAA,IAAA,CAAA,SAAA,CAAA,CAAA;;;AAGG,YAAA,IAAA,IAAA,CAAA,MAAA,CAAA,MAAA,CAAA,WAAA,EAAA;2BACoB,mDAAsC,CAAA,CAAA;AAgD7D;;;;;;;;AAQG,aAAA;;
|
|
1
|
+
{"version":3,"file":"PopupClient.mjs","sources":["../../src/interaction_client/PopupClient.ts"],"sourcesContent":[null],"names":["BrowserUtils.preconnect"],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { PerformanceEvents, Constants, AuthError, UrlString, ProtocolUtils, ThrottlingUtils, ProtocolMode } from '@azure/msal-common';
|
|
4
4
|
import { StandardInteractionClient } from './StandardInteractionClient.mjs';
|
|
5
5
|
import { InteractionType, ApiId, TemporaryCacheKeys } from '../utils/BrowserConstants.mjs';
|
|
6
6
|
import { RedirectHandler } from '../interaction_handler/RedirectHandler.mjs';
|
|
7
|
-
import {
|
|
7
|
+
import { replaceHash, isInIframe, getHomepage, clearHash, getCurrentUri } from '../utils/BrowserUtils.mjs';
|
|
8
8
|
import { EventType } from '../event/EventType.mjs';
|
|
9
9
|
import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
|
|
10
10
|
import { NativeInteractionClient } from './NativeInteractionClient.mjs';
|
|
@@ -117,7 +117,7 @@ class RedirectClient extends StandardInteractionClient {
|
|
|
117
117
|
const handleHashResult = await this.handleHash(responseHash, state, serverTelemetryManager);
|
|
118
118
|
if (loginRequestUrl.indexOf("#") > -1) {
|
|
119
119
|
// Replace current hash with non-msal hash, if present
|
|
120
|
-
|
|
120
|
+
replaceHash(loginRequestUrl);
|
|
121
121
|
}
|
|
122
122
|
return handleHashResult;
|
|
123
123
|
}
|
|
@@ -125,7 +125,7 @@ class RedirectClient extends StandardInteractionClient {
|
|
|
125
125
|
this.logger.verbose("NavigateToLoginRequestUrl set to false, handling hash");
|
|
126
126
|
return this.handleHash(responseHash, state, serverTelemetryManager);
|
|
127
127
|
}
|
|
128
|
-
else if (!
|
|
128
|
+
else if (!isInIframe() ||
|
|
129
129
|
this.config.system.allowRedirectInIframe) {
|
|
130
130
|
/*
|
|
131
131
|
* Returned from authority using redirect - need to perform navigation before processing response
|
|
@@ -144,7 +144,7 @@ class RedirectClient extends StandardInteractionClient {
|
|
|
144
144
|
let processHashOnRedirect = true;
|
|
145
145
|
if (!loginRequestUrl || loginRequestUrl === "null") {
|
|
146
146
|
// Redirect to home page if login request url is null (real null or the string null)
|
|
147
|
-
const homepage =
|
|
147
|
+
const homepage = getHomepage();
|
|
148
148
|
// Cache the homepage under ORIGIN_URI to ensure cached hash is processed on homepage
|
|
149
149
|
this.browserStorage.setTemporaryCache(TemporaryCacheKeys.ORIGIN_URI, homepage, true);
|
|
150
150
|
this.logger.warning("Unable to get valid login request url from cache, redirecting to home page");
|
|
@@ -183,7 +183,7 @@ class RedirectClient extends StandardInteractionClient {
|
|
|
183
183
|
// Get current location hash from window or cache.
|
|
184
184
|
const isResponseHash = UrlString.hashContainsKnownProperties(hash);
|
|
185
185
|
if (isResponseHash) {
|
|
186
|
-
|
|
186
|
+
clearHash(window);
|
|
187
187
|
this.logger.verbose("Hash contains known properties, returning response hash");
|
|
188
188
|
return hash;
|
|
189
189
|
}
|
|
@@ -311,7 +311,7 @@ class RedirectClient extends StandardInteractionClient {
|
|
|
311
311
|
*/
|
|
312
312
|
getRedirectStartPage(requestStartPage) {
|
|
313
313
|
const redirectStartPage = requestStartPage || window.location.href;
|
|
314
|
-
return UrlString.getAbsoluteUrl(redirectStartPage,
|
|
314
|
+
return UrlString.getAbsoluteUrl(redirectStartPage, getCurrentUri());
|
|
315
315
|
}
|
|
316
316
|
}
|
|
317
317
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentAuthCodeClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/SilentAuthCodeClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,OAAO,EACP,MAAM,EAIN,kBAAkB,
|
|
1
|
+
{"version":3,"file":"SilentAuthCodeClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/SilentAuthCodeClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,OAAO,EACP,MAAM,EAIN,kBAAkB,EAGrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKpE,OAAO,EAAmB,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAGxE,qBAAa,oBAAqB,SAAQ,yBAAyB;IAC/D,OAAO,CAAC,KAAK,CAAQ;gBAGjB,MAAM,EAAE,oBAAoB,EAC5B,WAAW,EAAE,mBAAmB,EAChC,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,iBAAiB,EACnC,KAAK,EAAE,KAAK,EACZ,iBAAiB,EAAE,kBAAkB,EACrC,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,aAAa,CAAC,EAAE,MAAM;IAgB1B;;;OAGG;IACG,YAAY,CACd,OAAO,EAAE,wBAAwB,GAClC,OAAO,CAAC,oBAAoB,CAAC;IAuFhC;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ1B"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
|
-
import { PerformanceEvents, Constants, AuthError } from '@azure/msal-common';
|
|
3
|
+
import { invokeAsync, PerformanceEvents, Constants, AuthError } from '@azure/msal-common';
|
|
4
4
|
import { StandardInteractionClient } from './StandardInteractionClient.mjs';
|
|
5
5
|
import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
|
|
6
6
|
import { InteractionType } from '../utils/BrowserConstants.mjs';
|
|
7
|
-
import { SilentHandler } from '../interaction_handler/SilentHandler.mjs';
|
|
8
7
|
import { HybridSpaAuthorizationCodeClient } from './HybridSpaAuthorizationCodeClient.mjs';
|
|
8
|
+
import { InteractionHandler } from '../interaction_handler/InteractionHandler.mjs';
|
|
9
9
|
import { authCodeRequired, silentLogoutUnsupported } from '../error/BrowserAuthErrorCodes.mjs';
|
|
10
10
|
|
|
11
11
|
/*
|
|
@@ -22,14 +22,12 @@ class SilentAuthCodeClient extends StandardInteractionClient {
|
|
|
22
22
|
* @param request
|
|
23
23
|
*/
|
|
24
24
|
async acquireToken(request) {
|
|
25
|
-
this.logger.trace("SilentAuthCodeClient.acquireToken called");
|
|
26
25
|
// Auth code payload is required
|
|
27
26
|
if (!request.code) {
|
|
28
27
|
throw createBrowserAuthError(authCodeRequired);
|
|
29
28
|
}
|
|
30
29
|
// Create silent request
|
|
31
|
-
this.
|
|
32
|
-
const silentRequest = await this.initializeAuthorizationRequest(request, InteractionType.Silent);
|
|
30
|
+
const silentRequest = await invokeAsync(this.initializeAuthorizationRequest.bind(this), PerformanceEvents.StandardInteractionClientInitializeAuthorizationRequest, this.logger, this.performanceClient, request.correlationId)(request, InteractionType.Silent);
|
|
33
31
|
this.browserStorage.updateCacheEntries(silentRequest.state, silentRequest.nonce, silentRequest.authority, silentRequest.loginHint || Constants.EMPTY_STRING, silentRequest.account || null);
|
|
34
32
|
const serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
|
|
35
33
|
try {
|
|
@@ -39,14 +37,13 @@ class SilentAuthCodeClient extends StandardInteractionClient {
|
|
|
39
37
|
code: request.code,
|
|
40
38
|
};
|
|
41
39
|
// Initialize the client
|
|
42
|
-
this.
|
|
43
|
-
const clientConfig = await this.getClientConfiguration(serverTelemetryManager, silentRequest.authority);
|
|
40
|
+
const clientConfig = await invokeAsync(this.getClientConfiguration.bind(this), PerformanceEvents.StandardInteractionClientGetClientConfiguration, this.logger, this.performanceClient, request.correlationId)(serverTelemetryManager, silentRequest.authority);
|
|
44
41
|
const authClient = new HybridSpaAuthorizationCodeClient(clientConfig);
|
|
45
42
|
this.logger.verbose("Auth code client created");
|
|
46
43
|
// Create silent handler
|
|
47
|
-
const
|
|
44
|
+
const interactionHandler = new InteractionHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.performanceClient);
|
|
48
45
|
// Handle auth code parameters from request
|
|
49
|
-
return
|
|
46
|
+
return invokeAsync(interactionHandler.handleCodeResponseFromServer.bind(interactionHandler), PerformanceEvents.HandleCodeResponseFromServer, this.logger, this.performanceClient, request.correlationId)({
|
|
50
47
|
code: request.code,
|
|
51
48
|
msgraph_host: request.msGraphHost,
|
|
52
49
|
cloud_graph_host_name: request.cloudGraphHostName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentAuthCodeClient.mjs","sources":["../../src/interaction_client/SilentAuthCodeClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;AAKA;
|
|
1
|
+
{"version":3,"file":"SilentAuthCodeClient.mjs","sources":["../../src/interaction_client/SilentAuthCodeClient.ts"],"sourcesContent":[null],"names":["BrowserAuthErrorCodes.authCodeRequired"],"mappings":";;;;;;;;;;AAKA;AAUA;AAEA;AACA;AAca,MAAA,oBAAA,kCAAsD,CAAA;IAC/D,kBAAqB,EAAA,WAAA,EAAA,aAAA,EAAA,MAAA,EAAA,YAAA,EAAA,gBAAA,EAAA,KAAA,EAAA,iBAAA,EAAA,oBAAA,EAAA,aAAA,EAAA;AAGjB,QAAA,KAAA,CAAA,MAAA,EAAM,WAAsB,EAAA,aACjB,EAAA,MAAA,EAAA,8BACX,EAAA,iBACM,EAAA,oBACN,EAAA,aAA0B,CAAA,CAAA;AAqB9B,QAAA,IAAA,CAAA,KAAA,GAAA,KAAA,CAAA;;;AAGG;;AA0FH;;AAEG;AACH,QAAA,IAAU,CAAA,OAAA,CAAO,IAAC,EAAK;AAQ1B,YAAA,MAAA,sBAAA,CAAAA,gBAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentCacheClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/SilentCacheClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EACH,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,EACtB,WAAW,EACX,iBAAiB,EAGpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,qBAAa,iBAAkB,SAAQ,yBAAyB;IAC5D;;;OAGG;IACG,YAAY,CACd,aAAa,EAAE,uBAAuB,GACvC,OAAO,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"SilentCacheClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/SilentCacheClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EACH,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,EACtB,WAAW,EACX,iBAAiB,EAGpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE,qBAAa,iBAAkB,SAAQ,yBAAyB;IAC5D;;;OAGG;IACG,YAAY,CACd,aAAa,EAAE,uBAAuB,GACvC,OAAO,CAAC,oBAAoB,CAAC;IA+ChC;;;OAGG;IACH,MAAM,CAAC,aAAa,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxD;;;;OAIG;cACa,sBAAsB,CAClC,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,CAAC,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,iBAAiB,GACtC,OAAO,CAAC,gBAAgB,CAAC;IAYtB,uBAAuB,CACzB,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,WAAW,GACrB,OAAO,CAAC,uBAAuB,CAAC;CAoBtC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { StandardInteractionClient } from './StandardInteractionClient.mjs';
|
|
4
|
-
import { PerformanceEvents,
|
|
4
|
+
import { PerformanceEvents, invokeAsync, SilentFlowClient } from '@azure/msal-common';
|
|
5
5
|
import { ApiId } from '../utils/BrowserConstants.mjs';
|
|
6
6
|
import { BrowserAuthError } from '../error/BrowserAuthError.mjs';
|
|
7
7
|
import { cryptoKeyNotFound } from '../error/BrowserAuthErrorCodes.mjs';
|
|
@@ -16,30 +16,24 @@ class SilentCacheClient extends StandardInteractionClient {
|
|
|
16
16
|
* @param silentRequest
|
|
17
17
|
*/
|
|
18
18
|
async acquireToken(silentRequest) {
|
|
19
|
-
|
|
19
|
+
this.performanceClient.addQueueMeasurement(PerformanceEvents.SilentCacheClientAcquireToken, silentRequest.correlationId);
|
|
20
20
|
// Telemetry manager only used to increment cacheHits here
|
|
21
21
|
const serverTelemetryManager = this.initializeServerTelemetryManager(ApiId.acquireTokenSilent_silentFlow);
|
|
22
22
|
const silentAuthClient = await this.createSilentFlowClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions);
|
|
23
23
|
this.logger.verbose("Silent auth client created");
|
|
24
24
|
try {
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
const response = await invokeAsync(silentAuthClient.acquireCachedToken.bind(silentAuthClient), PerformanceEvents.SilentFlowClientAcquireCachedToken, this.logger, this.performanceClient, silentRequest.correlationId)(silentRequest);
|
|
26
|
+
const authResponse = response[0];
|
|
27
|
+
this.performanceClient.addFields({
|
|
28
28
|
fromCache: true,
|
|
29
|
-
});
|
|
30
|
-
return
|
|
29
|
+
}, silentRequest.correlationId);
|
|
30
|
+
return authResponse;
|
|
31
31
|
}
|
|
32
32
|
catch (error) {
|
|
33
33
|
if (error instanceof BrowserAuthError &&
|
|
34
34
|
error.errorCode === cryptoKeyNotFound) {
|
|
35
35
|
this.logger.verbose("Signing keypair for bound access token not found. Refreshing bound access token and generating a new crypto keypair.");
|
|
36
36
|
}
|
|
37
|
-
acquireTokenMeasurement.end({
|
|
38
|
-
errorCode: (error instanceof AuthError && error.errorCode) ||
|
|
39
|
-
undefined,
|
|
40
|
-
subErrorCode: (error instanceof AuthError && error.subError) || undefined,
|
|
41
|
-
success: false,
|
|
42
|
-
});
|
|
43
37
|
throw error;
|
|
44
38
|
}
|
|
45
39
|
}
|
|
@@ -59,16 +53,15 @@ class SilentCacheClient extends StandardInteractionClient {
|
|
|
59
53
|
*/
|
|
60
54
|
async createSilentFlowClient(serverTelemetryManager, authorityUrl, azureCloudOptions) {
|
|
61
55
|
// Create auth module.
|
|
62
|
-
this.
|
|
63
|
-
const clientConfig = await this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions);
|
|
56
|
+
const clientConfig = await invokeAsync(this.getClientConfiguration.bind(this), PerformanceEvents.StandardInteractionClientGetClientConfiguration, this.logger, this.performanceClient, this.correlationId)(serverTelemetryManager, authorityUrl, azureCloudOptions);
|
|
64
57
|
return new SilentFlowClient(clientConfig, this.performanceClient);
|
|
65
58
|
}
|
|
66
59
|
async initializeSilentRequest(request, account) {
|
|
67
60
|
this.performanceClient.addQueueMeasurement(PerformanceEvents.InitializeSilentRequest, this.correlationId);
|
|
68
|
-
this.
|
|
61
|
+
const baseRequest = await invokeAsync(this.initializeBaseRequest.bind(this), PerformanceEvents.InitializeBaseRequest, this.logger, this.performanceClient, this.correlationId)(request, account);
|
|
69
62
|
return {
|
|
70
63
|
...request,
|
|
71
|
-
...
|
|
64
|
+
...baseRequest,
|
|
72
65
|
account: account,
|
|
73
66
|
forceRefresh: request.forceRefresh || false,
|
|
74
67
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentCacheClient.mjs","sources":["../../src/interaction_client/SilentCacheClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;AAKA;AACA;AASA;AAMA;;AAOO;;
|
|
1
|
+
{"version":3,"file":"SilentCacheClient.mjs","sources":["../../src/interaction_client/SilentCacheClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;AAKA;AACA;AASA;AAMA;;AAOO;;AAkDH;;;AAGG,QAAA,IAAA,CAAA,iBAAA,CAAA,mBAAA,CAAA,iBAAA,CAAA,6BAAA,EAAA,aAAA,CAAA,aAAA,CAAA,CAAA;;AAOH,QAAA,MAAA,sBAAA,GAAA,IAAA,CAAA,gCAAA,CAAA,KAAA,CAAA,6BAAA,CAAA,CAAA;;;;AAIG,YAAA,MAAA,QAAA,GAAA,MAAA,WAAA,CAAA,gBAAA,CAAA,kBAAA,CAAA,IAAA,CAAA,gBAAA,CAAA,EAAA,iBAAA,CAAA,kCAAA,EAAA,IAAA,CAAA,MAAA,EAAA,IAAA,CAAA,iBAAA,EAAA,aAAA,CAAA,aAAA,CAAA,CAAA,aAAA,CAAA,CAAA;AACa,YAAA,MAAA,YAAA,GAAA,QACU,CAAA,CAAA,CAAA,CAAA;AAepB,YAAA,IAAA,CAAA,iBACF,CAAO,SAAE,CAAA;AAsBhB,gBAAA,SAAA,EAAA,IAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentIframeClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/SilentIframeClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,OAAO,EACP,MAAM,EAGN,uBAAuB,EAMvB,kBAAkB,EAGrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKpE,OAAO,EAAmB,KAAK,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"SilentIframeClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/SilentIframeClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,OAAO,EACP,MAAM,EAGN,uBAAuB,EAMvB,kBAAkB,EAGrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKpE,OAAO,EAAmB,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAKnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAEnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAIxE,qBAAa,kBAAmB,SAAQ,yBAAyB;IAC7D,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,aAAa,EAAE,mBAAmB,CAAC;gBAGzC,MAAM,EAAE,oBAAoB,EAC5B,WAAW,EAAE,mBAAmB,EAChC,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,iBAAiB,EACnC,KAAK,EAAE,KAAK,EACZ,iBAAiB,EAAE,kBAAkB,EACrC,iBAAiB,EAAE,mBAAmB,EACtC,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,aAAa,CAAC,EAAE,MAAM;IAiB1B;;;OAGG;IACG,YAAY,CACd,OAAO,EAAE,gBAAgB,GAC1B,OAAO,CAAC,oBAAoB,CAAC;IAqFhC;;OAEG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvB;;;;;OAKG;cACa,iBAAiB,CAC7B,UAAU,EAAE,uBAAuB,EACnC,aAAa,EAAE,uBAAuB,GACvC,OAAO,CAAC,oBAAoB,CAAC;CAsJnC"}
|