@azure/msal-browser 3.2.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.mjs +1 -1
- package/dist/app/PublicClientApplication.mjs +2 -2
- 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.mjs +1 -1
- package/dist/broker/nativeBroker/NativeStatusCodes.mjs +1 -1
- package/dist/cache/AsyncMemoryStorage.mjs +1 -1
- package/dist/cache/BrowserCacheManager.d.ts +2 -13
- package/dist/cache/BrowserCacheManager.d.ts.map +1 -1
- package/dist/cache/BrowserCacheManager.mjs +7 -64
- package/dist/cache/BrowserCacheManager.mjs.map +1 -1
- package/dist/cache/BrowserStorage.mjs +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 +2 -1
- 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/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.map +1 -1
- package/dist/controllers/StandardController.mjs +16 -13
- 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.map +1 -1
- package/dist/crypto/BrowserCrypto.mjs +3 -3
- package/dist/crypto/BrowserCrypto.mjs.map +1 -1
- package/dist/crypto/CryptoOps.d.ts.map +1 -1
- package/dist/crypto/CryptoOps.mjs +8 -5
- package/dist/crypto/CryptoOps.mjs.map +1 -1
- package/dist/crypto/PkceGenerator.mjs +1 -1
- package/dist/crypto/SignedHttpRequest.mjs +1 -1
- package/dist/encode/Base64Decode.mjs +1 -1
- package/dist/encode/Base64Encode.mjs +1 -1
- package/dist/error/BrowserAuthError.mjs +1 -1
- package/dist/error/BrowserAuthErrorCodes.mjs +1 -1
- package/dist/error/BrowserConfigurationAuthError.mjs +1 -1
- package/dist/error/BrowserConfigurationAuthErrorCodes.mjs +1 -1
- package/dist/error/NativeAuthError.mjs +1 -1
- package/dist/error/NativeAuthErrorCodes.mjs +1 -1
- 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.mjs +1 -1
- package/dist/event/EventMessage.mjs +1 -1
- package/dist/event/EventType.mjs +1 -1
- package/dist/index.d.ts +3 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.mjs +4 -2
- package/dist/index.mjs.map +1 -1
- package/dist/interaction_client/BaseInteractionClient.mjs +4 -4
- package/dist/interaction_client/HybridSpaAuthorizationCodeClient.mjs +1 -1
- package/dist/interaction_client/NativeInteractionClient.d.ts.map +1 -1
- package/dist/interaction_client/NativeInteractionClient.mjs +15 -4
- 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 +4 -4
- 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 +4 -3
- 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.mjs +1 -1
- package/dist/interaction_client/StandardInteractionClient.mjs +5 -5
- package/dist/interaction_handler/InteractionHandler.mjs +1 -1
- package/dist/interaction_handler/RedirectHandler.mjs +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 -155
- 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.mjs +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 -17728
- package/lib/msal-browser.cjs.map +1 -1
- package/lib/msal-browser.js +14625 -13223
- package/lib/msal-browser.js.map +1 -1
- package/lib/msal-browser.min.js +66 -68
- package/package.json +2 -2
- package/src/app/PublicClientApplication.ts +1 -1
- package/src/app/PublicClientNext.ts +442 -0
- package/src/cache/BrowserCacheManager.ts +11 -100
- package/src/config/Configuration.ts +5 -0
- package/src/controllers/ControllerFactory.ts +36 -25
- package/src/controllers/NestedAppAuthController.ts +525 -0
- package/src/controllers/StandardController.ts +8 -6
- package/src/controllers/UnknownOperatingContextController.ts +383 -0
- package/src/crypto/BrowserCrypto.ts +2 -2
- package/src/crypto/CryptoOps.ts +8 -5
- package/src/error/NestedAppAuthError.ts +32 -0
- package/src/index.ts +3 -10
- package/src/interaction_client/BaseInteractionClient.ts +1 -1
- package/src/interaction_client/NativeInteractionClient.ts +19 -3
- package/src/interaction_client/PopupClient.ts +2 -1
- package/src/interaction_client/RedirectClient.ts +1 -1
- package/src/interaction_client/SilentAuthCodeClient.ts +5 -4
- package/src/interaction_client/SilentCacheClient.ts +11 -3
- package/src/interaction_client/SilentIframeClient.ts +53 -17
- package/src/interaction_client/StandardInteractionClient.ts +1 -1
- package/src/interaction_handler/SilentHandler.ts +177 -233
- 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/BrowserUtils.ts +133 -125
- 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/utils/BrowserStringUtils.ts +0 -143
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
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';
|
|
@@ -106,7 +106,7 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
106
106
|
throw createClientAuthError(ClientAuthErrorCodes.noAccountFound);
|
|
107
107
|
}
|
|
108
108
|
// fetch the account from browser cache
|
|
109
|
-
const account = this.browserStorage.
|
|
109
|
+
const account = this.browserStorage.getBaseAccountInfo({
|
|
110
110
|
nativeAccountId,
|
|
111
111
|
});
|
|
112
112
|
if (!account) {
|
|
@@ -116,9 +116,13 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
116
116
|
try {
|
|
117
117
|
const silentRequest = this.createSilentCacheRequest(request, account);
|
|
118
118
|
const result = await this.silentCacheClient.acquireToken(silentRequest);
|
|
119
|
+
const fullAccount = {
|
|
120
|
+
...account,
|
|
121
|
+
idTokenClaims: result?.idTokenClaims,
|
|
122
|
+
};
|
|
119
123
|
return {
|
|
120
124
|
...result,
|
|
121
|
-
account,
|
|
125
|
+
account: fullAccount,
|
|
122
126
|
};
|
|
123
127
|
}
|
|
124
128
|
catch (e) {
|
|
@@ -317,6 +321,13 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
317
321
|
const tid = accountProperties["TenantId"] ||
|
|
318
322
|
idTokenClaims.tid ||
|
|
319
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();
|
|
320
331
|
// generate PoP token as needed
|
|
321
332
|
const responseAccessToken = await this.generatePopAccessToken(response, request);
|
|
322
333
|
const tokenType = request.tokenType === AuthenticationScheme.POP
|
|
@@ -327,7 +338,7 @@ class NativeInteractionClient extends BaseInteractionClient {
|
|
|
327
338
|
uniqueId: uid,
|
|
328
339
|
tenantId: tid,
|
|
329
340
|
scopes: responseScopes.asArray(),
|
|
330
|
-
account:
|
|
341
|
+
account: accountInfo,
|
|
331
342
|
idToken: response.id_token,
|
|
332
343
|
idTokenClaims: idTokenClaims,
|
|
333
344
|
accessToken: responseAccessToken,
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,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;
|
|
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
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
|
/*
|
|
@@ -41,9 +41,9 @@ class SilentAuthCodeClient extends StandardInteractionClient {
|
|
|
41
41
|
const authClient = new HybridSpaAuthorizationCodeClient(clientConfig);
|
|
42
42
|
this.logger.verbose("Auth code client created");
|
|
43
43
|
// Create silent handler
|
|
44
|
-
const
|
|
44
|
+
const interactionHandler = new InteractionHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.performanceClient);
|
|
45
45
|
// Handle auth code parameters from request
|
|
46
|
-
return invokeAsync(
|
|
46
|
+
return invokeAsync(interactionHandler.handleCodeResponseFromServer.bind(interactionHandler), PerformanceEvents.HandleCodeResponseFromServer, this.logger, this.performanceClient, request.correlationId)({
|
|
47
47
|
code: request.code,
|
|
48
48
|
msgraph_host: request.msGraphHost,
|
|
49
49
|
cloud_graph_host_name: request.cloudGraphHostName,
|
|
@@ -1 +1 @@
|
|
|
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;;
|
|
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 {
|
|
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,12 +16,13 @@ class SilentCacheClient extends StandardInteractionClient {
|
|
|
16
16
|
* @param silentRequest
|
|
17
17
|
*/
|
|
18
18
|
async acquireToken(silentRequest) {
|
|
19
|
+
this.performanceClient.addQueueMeasurement(PerformanceEvents.SilentCacheClientAcquireToken, silentRequest.correlationId);
|
|
19
20
|
// Telemetry manager only used to increment cacheHits here
|
|
20
21
|
const serverTelemetryManager = this.initializeServerTelemetryManager(ApiId.acquireTokenSilent_silentFlow);
|
|
21
22
|
const silentAuthClient = await this.createSilentFlowClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions);
|
|
22
23
|
this.logger.verbose("Silent auth client created");
|
|
23
24
|
try {
|
|
24
|
-
const response = await silentAuthClient.acquireCachedToken(silentRequest);
|
|
25
|
+
const response = await invokeAsync(silentAuthClient.acquireCachedToken.bind(silentAuthClient), PerformanceEvents.SilentFlowClientAcquireCachedToken, this.logger, this.performanceClient, silentRequest.correlationId)(silentRequest);
|
|
25
26
|
const authResponse = response[0];
|
|
26
27
|
this.performanceClient.addFields({
|
|
27
28
|
fromCache: true,
|
|
@@ -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"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { PerformanceEvents, PromptValue, invokeAsync, Constants, AuthError, UrlString, ProtocolUtils } 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 {
|
|
7
|
+
import { initiateAuthRequest, monitorIframeForHash } from '../interaction_handler/SilentHandler.mjs';
|
|
8
8
|
import { NativeMessageHandler } from '../broker/nativeBroker/NativeMessageHandler.mjs';
|
|
9
9
|
import { NativeInteractionClient } from './NativeInteractionClient.mjs';
|
|
10
|
-
import {
|
|
10
|
+
import { InteractionHandler } from '../interaction_handler/InteractionHandler.mjs';
|
|
11
|
+
import { preconnect } from '../utils/BrowserUtils.mjs';
|
|
12
|
+
import { silentPromptValueError, silentLogoutUnsupported, hashEmptyError, hashDoesNotContainKnownProperties, nativeConnectionNotEstablished } from '../error/BrowserAuthErrorCodes.mjs';
|
|
11
13
|
|
|
12
14
|
/*
|
|
13
15
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -42,6 +44,7 @@ class SilentIframeClient extends StandardInteractionClient {
|
|
|
42
44
|
...request,
|
|
43
45
|
prompt: request.prompt || PromptValue.NONE,
|
|
44
46
|
}, InteractionType.Silent);
|
|
47
|
+
preconnect(silentRequest.authority);
|
|
45
48
|
this.browserStorage.updateCacheEntries(silentRequest.state, silentRequest.nonce, silentRequest.authority, silentRequest.loginHint || Constants.EMPTY_STRING, silentRequest.account || null);
|
|
46
49
|
const serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
|
|
47
50
|
try {
|
|
@@ -72,31 +75,42 @@ class SilentIframeClient extends StandardInteractionClient {
|
|
|
72
75
|
* @param userRequestScopes
|
|
73
76
|
*/
|
|
74
77
|
async silentTokenHelper(authClient, silentRequest) {
|
|
75
|
-
|
|
78
|
+
const correlationId = silentRequest.correlationId;
|
|
79
|
+
this.performanceClient.addQueueMeasurement(PerformanceEvents.SilentIframeClientTokenHelper, correlationId);
|
|
76
80
|
// Create auth code request and generate PKCE params
|
|
77
|
-
const authCodeRequest = await invokeAsync(this.initializeAuthorizationCodeRequest.bind(this), PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest, this.logger, this.performanceClient,
|
|
81
|
+
const authCodeRequest = await invokeAsync(this.initializeAuthorizationCodeRequest.bind(this), PerformanceEvents.StandardInteractionClientInitializeAuthorizationCodeRequest, this.logger, this.performanceClient, correlationId)(silentRequest);
|
|
78
82
|
// Create authorize request url
|
|
79
|
-
const navigateUrl = await invokeAsync(authClient.getAuthCodeUrl.bind(authClient), PerformanceEvents.GetAuthCodeUrl, this.logger, this.performanceClient,
|
|
83
|
+
const navigateUrl = await invokeAsync(authClient.getAuthCodeUrl.bind(authClient), PerformanceEvents.GetAuthCodeUrl, this.logger, this.performanceClient, correlationId)({
|
|
80
84
|
...silentRequest,
|
|
81
85
|
nativeBroker: NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeMessageHandler, silentRequest.authenticationScheme),
|
|
82
86
|
});
|
|
83
87
|
// Create silent handler
|
|
84
|
-
const
|
|
88
|
+
const interactionHandler = new InteractionHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.performanceClient);
|
|
85
89
|
// Get the frame handle for the silent request
|
|
86
|
-
const msalFrame = await invokeAsync(
|
|
90
|
+
const msalFrame = await invokeAsync(initiateAuthRequest, PerformanceEvents.SilentHandlerInitiateAuthRequest, this.logger, this.performanceClient, correlationId)(navigateUrl, this.performanceClient, this.logger, correlationId, this.config.system.navigateFrameWait);
|
|
87
91
|
// Monitor the window for the hash. Return the string value and close the popup when the hash is received. Default timeout is 60 seconds.
|
|
88
|
-
const hash = await invokeAsync(
|
|
92
|
+
const hash = await invokeAsync(monitorIframeForHash, PerformanceEvents.SilentHandlerMonitorIframeForHash, this.logger, this.performanceClient, correlationId)(msalFrame, this.config.system.iframeHashTimeout, this.config.system.pollIntervalMilliseconds, this.performanceClient, this.logger, correlationId);
|
|
93
|
+
if (!hash) {
|
|
94
|
+
// No hash is present
|
|
95
|
+
this.logger.error("The request has returned to the redirectUri but a hash is not present in the iframe. It's likely that the hash has been removed or the page has been redirected by code running on the redirectUri page.");
|
|
96
|
+
throw createBrowserAuthError(hashEmptyError);
|
|
97
|
+
}
|
|
98
|
+
else if (!UrlString.hashContainsKnownProperties(hash)) {
|
|
99
|
+
this.logger.error("A hash is present in the iframe but it does not contain known properties. It's likely that the hash has been replaced by code running on the redirectUri page.");
|
|
100
|
+
this.logger.errorPii(`The hash detected in the iframe is: ${hash}`);
|
|
101
|
+
throw createBrowserAuthError(hashDoesNotContainKnownProperties);
|
|
102
|
+
}
|
|
89
103
|
// Deserialize hash fragment response parameters.
|
|
90
104
|
const serverParams = UrlString.getDeserializedHash(hash);
|
|
91
|
-
const state = this.validateAndExtractStateFromHash(serverParams, InteractionType.Silent,
|
|
105
|
+
const state = this.validateAndExtractStateFromHash(serverParams, InteractionType.Silent, correlationId);
|
|
92
106
|
if (serverParams.accountId) {
|
|
93
107
|
this.logger.verbose("Account id found in hash, calling WAM for token");
|
|
94
108
|
if (!this.nativeMessageHandler) {
|
|
95
109
|
throw createBrowserAuthError(nativeConnectionNotEstablished);
|
|
96
110
|
}
|
|
97
|
-
const nativeInteractionClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.apiId, this.performanceClient, this.nativeMessageHandler, serverParams.accountId, this.browserStorage,
|
|
111
|
+
const nativeInteractionClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.apiId, this.performanceClient, this.nativeMessageHandler, serverParams.accountId, this.browserStorage, correlationId);
|
|
98
112
|
const { userRequestState } = ProtocolUtils.parseRequestState(this.browserCrypto, state);
|
|
99
|
-
return invokeAsync(nativeInteractionClient.acquireToken.bind(nativeInteractionClient), PerformanceEvents.NativeInteractionClientAcquireToken, this.logger, this.performanceClient,
|
|
113
|
+
return invokeAsync(nativeInteractionClient.acquireToken.bind(nativeInteractionClient), PerformanceEvents.NativeInteractionClientAcquireToken, this.logger, this.performanceClient, correlationId)({
|
|
100
114
|
...silentRequest,
|
|
101
115
|
state: userRequestState,
|
|
102
116
|
prompt: silentRequest.prompt || PromptValue.NONE,
|
|
@@ -105,7 +119,7 @@ class SilentIframeClient extends StandardInteractionClient {
|
|
|
105
119
|
});
|
|
106
120
|
}
|
|
107
121
|
// Handle response from hash string
|
|
108
|
-
return invokeAsync(
|
|
122
|
+
return invokeAsync(interactionHandler.handleCodeResponseFromHash.bind(interactionHandler), PerformanceEvents.HandleCodeResponseFromHash, this.logger, this.performanceClient, correlationId)(hash, state, authClient.authority, this.networkClient);
|
|
109
123
|
}
|
|
110
124
|
}
|
|
111
125
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentIframeClient.mjs","sources":["../../src/interaction_client/SilentIframeClient.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SilentIframeClient.mjs","sources":["../../src/interaction_client/SilentIframeClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;AAKA;AAeA;AACA;AACA;AAsBI,MAAS,kBAAgB,SAAA,yBAAoB,CAAA;AAGzC,IAAA,WAAA,CAAA,MAAM,EAAE,WAAoB,EAAA,qBACf,EAAA,YAAA,EAAA,gBACA,EAAA,wBACC,EAAA,iBACA,EAAA,oBACE,EAAA;AAsBpB,QAAA,KAAA,CAAA,MAAA,EAAA,WAAA,EAAA,aAAA,EAAA,MAAA,EAAA,YAAA,EAAA,gBAAA,EAAA,iBAAA,EAAA,oBAAA,EAAA,aAAA,CAAA,CAAA;;;AAGG,KAAA;;AAwFH;;AAEG;AACH,IAAA,MAAM,YAAY,CAAA,OAAK,EAAA;AASvB,QAAA,IAAA,CAAA,iBAAA,CAAA,mBAAA,CAAA,iBAAA,CAAA,8BAAA,EAAA,OAAA,CAAA,aAAA,CAAA,CAAA;;;;;AAKG,YAAA,IAAA,CAAA,MAAA,CAAA,OAAA,CAAA,qGAAA,CAAA,CAAA;AACa,SAAA;AAyJnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1,4 +1,4 @@
|
|
|
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
4
|
import { PerformanceEvents, invokeAsync, RefreshTokenClient } from '@azure/msal-common';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { PerformanceEvents, invokeAsync, Constants, UrlString, AuthorizationCodeClient, Authority, AuthorityFactory, ProtocolUtils } from '@azure/msal-common';
|
|
4
4
|
import { BaseInteractionClient } from './BaseInteractionClient.mjs';
|
|
@@ -6,7 +6,7 @@ import { BrowserConstants } from '../utils/BrowserConstants.mjs';
|
|
|
6
6
|
import { version } from '../packageMetadata.mjs';
|
|
7
7
|
import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
|
|
8
8
|
import { BrowserProtocolUtils } from '../utils/BrowserProtocolUtils.mjs';
|
|
9
|
-
import {
|
|
9
|
+
import { getCurrentUri } from '../utils/BrowserUtils.mjs';
|
|
10
10
|
import { generatePkceCodes } from '../crypto/PkceGenerator.mjs';
|
|
11
11
|
import { createNewGuid } from '../crypto/BrowserCrypto.mjs';
|
|
12
12
|
import { noStateInHash, unableToParseState, stateInteractionTypeMismatch } from '../error/BrowserAuthErrorCodes.mjs';
|
|
@@ -79,7 +79,7 @@ class StandardInteractionClient extends BaseInteractionClient {
|
|
|
79
79
|
if (logoutRequest && logoutRequest.postLogoutRedirectUri) {
|
|
80
80
|
this.logger.verbose("Setting postLogoutRedirectUri to uri set on logout request", validLogoutRequest.correlationId);
|
|
81
81
|
validLogoutRequest.postLogoutRedirectUri =
|
|
82
|
-
UrlString.getAbsoluteUrl(logoutRequest.postLogoutRedirectUri,
|
|
82
|
+
UrlString.getAbsoluteUrl(logoutRequest.postLogoutRedirectUri, getCurrentUri());
|
|
83
83
|
}
|
|
84
84
|
else if (this.config.auth.postLogoutRedirectUri === null) {
|
|
85
85
|
this.logger.verbose("postLogoutRedirectUri configured as null and no uri set on request, not passing post logout redirect", validLogoutRequest.correlationId);
|
|
@@ -87,12 +87,12 @@ class StandardInteractionClient extends BaseInteractionClient {
|
|
|
87
87
|
else if (this.config.auth.postLogoutRedirectUri) {
|
|
88
88
|
this.logger.verbose("Setting postLogoutRedirectUri to configured uri", validLogoutRequest.correlationId);
|
|
89
89
|
validLogoutRequest.postLogoutRedirectUri =
|
|
90
|
-
UrlString.getAbsoluteUrl(this.config.auth.postLogoutRedirectUri,
|
|
90
|
+
UrlString.getAbsoluteUrl(this.config.auth.postLogoutRedirectUri, getCurrentUri());
|
|
91
91
|
}
|
|
92
92
|
else {
|
|
93
93
|
this.logger.verbose("Setting postLogoutRedirectUri to current page", validLogoutRequest.correlationId);
|
|
94
94
|
validLogoutRequest.postLogoutRedirectUri =
|
|
95
|
-
UrlString.getAbsoluteUrl(
|
|
95
|
+
UrlString.getAbsoluteUrl(getCurrentUri(), getCurrentUri());
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
else {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { PerformanceEvents, createClientAuthError, ClientAuthErrorCodes, ServerError, invokeAsync, AuthorityFactory } from '@azure/msal-common';
|
|
4
4
|
import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-browser v3.
|
|
1
|
+
/*! @azure/msal-browser v3.3.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { createClientAuthError, ClientAuthErrorCodes, ServerError } from '@azure/msal-common';
|
|
4
4
|
import { createBrowserAuthError } from '../error/BrowserAuthError.mjs';
|
|
@@ -1,48 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
initiateAuthRequest(requestUrl: string): Promise<HTMLIFrameElement>;
|
|
15
|
-
/**
|
|
16
|
-
* Monitors an iframe content window until it loads a url with a known hash, or hits a specified timeout.
|
|
17
|
-
* @param iframe
|
|
18
|
-
* @param timeout
|
|
19
|
-
*/
|
|
20
|
-
monitorIframeForHash(iframe: HTMLIFrameElement, timeout: number): Promise<string>;
|
|
21
|
-
/**
|
|
22
|
-
* @hidden
|
|
23
|
-
* Loads iframe with authorization endpoint URL
|
|
24
|
-
* @ignore
|
|
25
|
-
*/
|
|
26
|
-
private loadFrame;
|
|
27
|
-
/**
|
|
28
|
-
* @hidden
|
|
29
|
-
* Loads the iframe synchronously when the navigateTimeFrame is set to `0`
|
|
30
|
-
* @param urlNavigate
|
|
31
|
-
* @param frameName
|
|
32
|
-
* @param logger
|
|
33
|
-
*/
|
|
34
|
-
private loadFrameSync;
|
|
35
|
-
/**
|
|
36
|
-
* @hidden
|
|
37
|
-
* Creates a new hidden iframe or gets an existing one for silent token renewal.
|
|
38
|
-
* @ignore
|
|
39
|
-
*/
|
|
40
|
-
private createHiddenIframe;
|
|
41
|
-
/**
|
|
42
|
-
* @hidden
|
|
43
|
-
* Removes a hidden iframe from the page.
|
|
44
|
-
* @ignore
|
|
45
|
-
*/
|
|
46
|
-
private removeHiddenIframe;
|
|
47
|
-
}
|
|
1
|
+
import { Logger, IPerformanceClient } from "@azure/msal-common";
|
|
2
|
+
/**
|
|
3
|
+
* Creates a hidden iframe to given URL using user-requested scopes as an id.
|
|
4
|
+
* @param urlNavigate
|
|
5
|
+
* @param userRequestScopes
|
|
6
|
+
*/
|
|
7
|
+
export declare function initiateAuthRequest(requestUrl: string, performanceClient: IPerformanceClient, logger: Logger, correlationId: string, navigateFrameWait?: number): Promise<HTMLIFrameElement>;
|
|
8
|
+
/**
|
|
9
|
+
* Monitors an iframe content window until it loads a url with a known hash, or hits a specified timeout.
|
|
10
|
+
* @param iframe
|
|
11
|
+
* @param timeout
|
|
12
|
+
*/
|
|
13
|
+
export declare function monitorIframeForHash(iframe: HTMLIFrameElement, timeout: number, pollIntervalMilliseconds: number, performanceClient: IPerformanceClient, logger: Logger, correlationId: string): Promise<string>;
|
|
48
14
|
//# sourceMappingURL=SilentHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SilentHandler.d.ts","sourceRoot":"","sources":["../../src/interaction_handler/SilentHandler.ts"],"names":[],"mappings":"AAKA,OAAO,
|
|
1
|
+
{"version":3,"file":"SilentHandler.d.ts","sourceRoot":"","sources":["../../src/interaction_handler/SilentHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,MAAM,EACN,kBAAkB,EAIrB,MAAM,oBAAoB,CAAC;AAO5B;;;;GAIG;AACH,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,kBAAkB,EACrC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CA2B5B;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,MAAM,EACf,wBAAwB,EAAE,MAAM,EAChC,iBAAiB,EAAE,kBAAkB,EACrC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC,CA0DjB"}
|