@azure/msal-browser 2.38.3 → 2.39.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/_virtual/_tslib.js +1 -1
- package/dist/app/ClientApplication.js +3 -3
- package/dist/app/ClientApplication.js.map +1 -1
- package/dist/app/IPublicClientApplication.d.ts +1 -0
- package/dist/app/IPublicClientApplication.d.ts.map +1 -1
- package/dist/app/IPublicClientApplication.js +5 -2
- package/dist/app/IPublicClientApplication.js.map +1 -1
- package/dist/app/PublicClientApplication.d.ts +8 -0
- package/dist/app/PublicClientApplication.d.ts.map +1 -1
- package/dist/app/PublicClientApplication.js +30 -3
- package/dist/app/PublicClientApplication.js.map +1 -1
- package/dist/broker/nativeBroker/NativeMessageHandler.js +1 -1
- package/dist/broker/nativeBroker/NativeMessageHandler.js.map +1 -1
- package/dist/cache/AsyncMemoryStorage.js +1 -1
- package/dist/cache/AsyncMemoryStorage.js.map +1 -1
- package/dist/cache/BrowserCacheManager.d.ts +11 -1
- package/dist/cache/BrowserCacheManager.d.ts.map +1 -1
- package/dist/cache/BrowserCacheManager.js +31 -3
- package/dist/cache/BrowserCacheManager.js.map +1 -1
- package/dist/cache/BrowserStorage.js +1 -1
- package/dist/cache/BrowserStorage.js.map +1 -1
- package/dist/cache/CryptoKeyStore.js +1 -1
- package/dist/cache/CryptoKeyStore.js.map +1 -1
- package/dist/cache/DatabaseStorage.js +1 -1
- package/dist/cache/DatabaseStorage.js.map +1 -1
- package/dist/cache/MemoryStorage.js +1 -1
- package/dist/cache/MemoryStorage.js.map +1 -1
- package/dist/cache/TokenCache.d.ts +1 -0
- package/dist/cache/TokenCache.d.ts.map +1 -1
- package/dist/cache/TokenCache.js +18 -18
- package/dist/cache/TokenCache.js.map +1 -1
- package/dist/config/Configuration.js +1 -1
- package/dist/config/Configuration.js.map +1 -1
- package/dist/crypto/BrowserCrypto.js +1 -1
- package/dist/crypto/BrowserCrypto.js.map +1 -1
- package/dist/crypto/CryptoOps.js +1 -1
- package/dist/crypto/CryptoOps.js.map +1 -1
- package/dist/crypto/GuidGenerator.js +1 -1
- package/dist/crypto/GuidGenerator.js.map +1 -1
- package/dist/crypto/ModernBrowserCrypto.js +1 -1
- package/dist/crypto/ModernBrowserCrypto.js.map +1 -1
- package/dist/crypto/MsBrowserCrypto.js +1 -1
- package/dist/crypto/MsBrowserCrypto.js.map +1 -1
- package/dist/crypto/MsrBrowserCrypto.js +1 -1
- package/dist/crypto/MsrBrowserCrypto.js.map +1 -1
- package/dist/crypto/PkceGenerator.js +1 -1
- package/dist/crypto/PkceGenerator.js.map +1 -1
- package/dist/crypto/SignedHttpRequest.js +1 -1
- package/dist/crypto/SignedHttpRequest.js.map +1 -1
- package/dist/encode/Base64Decode.js +1 -1
- package/dist/encode/Base64Decode.js.map +1 -1
- package/dist/encode/Base64Encode.js +1 -1
- package/dist/encode/Base64Encode.js.map +1 -1
- package/dist/error/BrowserAuthError.js +1 -1
- package/dist/error/BrowserAuthError.js.map +1 -1
- package/dist/error/BrowserConfigurationAuthError.js +1 -1
- package/dist/error/BrowserConfigurationAuthError.js.map +1 -1
- package/dist/error/NativeAuthError.js +1 -1
- package/dist/error/NativeAuthError.js.map +1 -1
- package/dist/event/EventHandler.js +1 -1
- package/dist/event/EventHandler.js.map +1 -1
- package/dist/event/EventMessage.js +1 -1
- package/dist/event/EventMessage.js.map +1 -1
- package/dist/event/EventType.js +1 -1
- package/dist/event/EventType.js.map +1 -1
- package/dist/index.cjs.js +229 -214
- package/dist/index.cjs.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/interaction_client/BaseInteractionClient.js +2 -2
- package/dist/interaction_client/BaseInteractionClient.js.map +1 -1
- package/dist/interaction_client/HybridSpaAuthorizationCodeClient.js +1 -1
- package/dist/interaction_client/HybridSpaAuthorizationCodeClient.js.map +1 -1
- package/dist/interaction_client/NativeInteractionClient.d.ts +1 -10
- package/dist/interaction_client/NativeInteractionClient.d.ts.map +1 -1
- package/dist/interaction_client/NativeInteractionClient.js +17 -23
- package/dist/interaction_client/NativeInteractionClient.js.map +1 -1
- package/dist/interaction_client/PopupClient.js +1 -1
- package/dist/interaction_client/PopupClient.js.map +1 -1
- package/dist/interaction_client/RedirectClient.js +1 -1
- package/dist/interaction_client/RedirectClient.js.map +1 -1
- package/dist/interaction_client/SilentAuthCodeClient.js +1 -1
- package/dist/interaction_client/SilentAuthCodeClient.js.map +1 -1
- package/dist/interaction_client/SilentCacheClient.js +1 -1
- package/dist/interaction_client/SilentCacheClient.js.map +1 -1
- package/dist/interaction_client/SilentIframeClient.js +1 -1
- package/dist/interaction_client/SilentIframeClient.js.map +1 -1
- package/dist/interaction_client/SilentRefreshClient.js +1 -1
- package/dist/interaction_client/SilentRefreshClient.js.map +1 -1
- package/dist/interaction_client/StandardInteractionClient.js +2 -2
- package/dist/interaction_client/StandardInteractionClient.js.map +1 -1
- package/dist/interaction_handler/InteractionHandler.js +1 -1
- package/dist/interaction_handler/InteractionHandler.js.map +1 -1
- package/dist/interaction_handler/RedirectHandler.js +1 -1
- package/dist/interaction_handler/RedirectHandler.js.map +1 -1
- package/dist/interaction_handler/SilentHandler.d.ts.map +1 -1
- package/dist/interaction_handler/SilentHandler.js +2 -1
- package/dist/interaction_handler/SilentHandler.js.map +1 -1
- package/dist/internals.js +1 -1
- package/dist/internals.js.map +1 -1
- package/dist/navigation/NavigationClient.js +1 -1
- package/dist/navigation/NavigationClient.js.map +1 -1
- package/dist/network/FetchClient.js +1 -1
- package/dist/network/FetchClient.js.map +1 -1
- package/dist/network/XhrClient.js +1 -1
- package/dist/network/XhrClient.js.map +1 -1
- package/dist/packageMetadata.d.ts +1 -1
- package/dist/packageMetadata.js +2 -2
- package/dist/packageMetadata.js.map +1 -1
- package/dist/telemetry/BrowserPerformanceClient.js +1 -1
- package/dist/telemetry/BrowserPerformanceClient.js.map +1 -1
- package/dist/telemetry/BrowserPerformanceMeasurement.js +1 -1
- package/dist/telemetry/BrowserPerformanceMeasurement.js.map +1 -1
- package/dist/utils/BrowserConstants.js +1 -1
- package/dist/utils/BrowserConstants.js.map +1 -1
- package/dist/utils/BrowserProtocolUtils.js +1 -1
- package/dist/utils/BrowserProtocolUtils.js.map +1 -1
- package/dist/utils/BrowserStringUtils.js +1 -1
- package/dist/utils/BrowserStringUtils.js.map +1 -1
- package/dist/utils/BrowserUtils.js +1 -1
- package/dist/utils/BrowserUtils.js.map +1 -1
- package/dist/utils/MathUtils.js +1 -1
- package/dist/utils/MathUtils.js.map +1 -1
- package/lib/msal-browser.js +231 -216
- package/lib/msal-browser.js.map +1 -1
- package/lib/msal-browser.min.js +37 -38
- package/package.json +95 -95
package/dist/index.cjs.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-browser v2.
|
|
1
|
+
/*! @azure/msal-browser v2.39.0 2024-06-06 */
|
|
2
2
|
'use strict';
|
|
3
3
|
'use strict';
|
|
4
4
|
|
|
@@ -117,7 +117,7 @@ function __spread() {
|
|
|
117
117
|
return ar;
|
|
118
118
|
}
|
|
119
119
|
|
|
120
|
-
/*! @azure/msal-common v13.3.
|
|
120
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
121
121
|
/*! *****************************************************************************
|
|
122
122
|
Copyright (c) Microsoft Corporation.
|
|
123
123
|
|
|
@@ -204,7 +204,7 @@ function __spreadArrays() {
|
|
|
204
204
|
return r;
|
|
205
205
|
}
|
|
206
206
|
|
|
207
|
-
/*! @azure/msal-common v13.3.
|
|
207
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
208
208
|
|
|
209
209
|
/*
|
|
210
210
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -577,7 +577,7 @@ var JsonTypes;
|
|
|
577
577
|
JsonTypes["Pop"] = "pop";
|
|
578
578
|
})(JsonTypes || (JsonTypes = {}));
|
|
579
579
|
|
|
580
|
-
/*! @azure/msal-common v13.3.
|
|
580
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
581
581
|
|
|
582
582
|
/*
|
|
583
583
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -633,7 +633,7 @@ var AuthError = /** @class */ (function (_super) {
|
|
|
633
633
|
return AuthError;
|
|
634
634
|
}(Error));
|
|
635
635
|
|
|
636
|
-
/*! @azure/msal-common v13.3.
|
|
636
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
637
637
|
|
|
638
638
|
/*
|
|
639
639
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -708,7 +708,7 @@ var DEFAULT_CRYPTO_IMPLEMENTATION = {
|
|
|
708
708
|
}
|
|
709
709
|
};
|
|
710
710
|
|
|
711
|
-
/*! @azure/msal-common v13.3.
|
|
711
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
712
712
|
|
|
713
713
|
/*
|
|
714
714
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -1223,7 +1223,7 @@ var ClientAuthError = /** @class */ (function (_super) {
|
|
|
1223
1223
|
return ClientAuthError;
|
|
1224
1224
|
}(AuthError));
|
|
1225
1225
|
|
|
1226
|
-
/*! @azure/msal-common v13.3.
|
|
1226
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
1227
1227
|
|
|
1228
1228
|
/*
|
|
1229
1229
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -1348,7 +1348,7 @@ var StringUtils = /** @class */ (function () {
|
|
|
1348
1348
|
return StringUtils;
|
|
1349
1349
|
}());
|
|
1350
1350
|
|
|
1351
|
-
/*! @azure/msal-common v13.3.
|
|
1351
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
1352
1352
|
|
|
1353
1353
|
/*
|
|
1354
1354
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -1538,12 +1538,12 @@ var Logger = /** @class */ (function () {
|
|
|
1538
1538
|
return Logger;
|
|
1539
1539
|
}());
|
|
1540
1540
|
|
|
1541
|
-
/*! @azure/msal-common v13.3.
|
|
1541
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
1542
1542
|
/* eslint-disable header/header */
|
|
1543
1543
|
var name$1 = "@azure/msal-common";
|
|
1544
|
-
var version$1 = "13.3.
|
|
1544
|
+
var version$1 = "13.3.3";
|
|
1545
1545
|
|
|
1546
|
-
/*! @azure/msal-common v13.3.
|
|
1546
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
1547
1547
|
/*
|
|
1548
1548
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
1549
1549
|
* Licensed under the MIT License.
|
|
@@ -1564,7 +1564,7 @@ exports.AzureCloudInstance = void 0;
|
|
|
1564
1564
|
AzureCloudInstance["AzureUsGovernment"] = "https://login.microsoftonline.us";
|
|
1565
1565
|
})(exports.AzureCloudInstance || (exports.AzureCloudInstance = {}));
|
|
1566
1566
|
|
|
1567
|
-
/*! @azure/msal-common v13.3.
|
|
1567
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
1568
1568
|
|
|
1569
1569
|
/*
|
|
1570
1570
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -1829,7 +1829,7 @@ var ClientConfigurationError = /** @class */ (function (_super) {
|
|
|
1829
1829
|
return ClientConfigurationError;
|
|
1830
1830
|
}(ClientAuthError));
|
|
1831
1831
|
|
|
1832
|
-
/*! @azure/msal-common v13.3.
|
|
1832
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
1833
1833
|
|
|
1834
1834
|
/*
|
|
1835
1835
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -2028,7 +2028,7 @@ var ScopeSet = /** @class */ (function () {
|
|
|
2028
2028
|
return ScopeSet;
|
|
2029
2029
|
}());
|
|
2030
2030
|
|
|
2031
|
-
/*! @azure/msal-common v13.3.
|
|
2031
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
2032
2032
|
|
|
2033
2033
|
/*
|
|
2034
2034
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -2066,7 +2066,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
|
|
|
2066
2066
|
};
|
|
2067
2067
|
}
|
|
2068
2068
|
|
|
2069
|
-
/*! @azure/msal-common v13.3.
|
|
2069
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
2070
2070
|
/*
|
|
2071
2071
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
2072
2072
|
* Licensed under the MIT License.
|
|
@@ -2082,7 +2082,21 @@ var AuthorityType;
|
|
|
2082
2082
|
AuthorityType[AuthorityType["Ciam"] = 3] = "Ciam";
|
|
2083
2083
|
})(AuthorityType || (AuthorityType = {}));
|
|
2084
2084
|
|
|
2085
|
-
/*! @azure/msal-common v13.3.
|
|
2085
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
2086
|
+
/*
|
|
2087
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
2088
|
+
* Licensed under the MIT License.
|
|
2089
|
+
*/
|
|
2090
|
+
/**
|
|
2091
|
+
* Protocol modes supported by MSAL.
|
|
2092
|
+
*/
|
|
2093
|
+
exports.ProtocolMode = void 0;
|
|
2094
|
+
(function (ProtocolMode) {
|
|
2095
|
+
ProtocolMode["AAD"] = "AAD";
|
|
2096
|
+
ProtocolMode["OIDC"] = "OIDC";
|
|
2097
|
+
})(exports.ProtocolMode || (exports.ProtocolMode = {}));
|
|
2098
|
+
|
|
2099
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
2086
2100
|
|
|
2087
2101
|
/*
|
|
2088
2102
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -2103,8 +2117,8 @@ var AuthorityType;
|
|
|
2103
2117
|
* localAccountId: Original tenant-specific accountID, usually used for legacy cases
|
|
2104
2118
|
* username: primary username that represents the user, usually corresponds to preferred_username in the v2 endpt
|
|
2105
2119
|
* authorityType: Accounts authority type as a string
|
|
2106
|
-
* name: Full name for the account, including given name and family name,
|
|
2107
2120
|
* clientInfo: Full base64 encoded client info received from ESTS
|
|
2121
|
+
* name: Full name for the account, including given name and family name
|
|
2108
2122
|
* lastModificationTime: last time this entity was modified in the cache
|
|
2109
2123
|
* lastModificationApp:
|
|
2110
2124
|
* idTokenClaims: Object containing claims parsed from ID token
|
|
@@ -2133,24 +2147,6 @@ var AccountEntity = /** @class */ (function () {
|
|
|
2133
2147
|
localAccountId: this.localAccountId
|
|
2134
2148
|
});
|
|
2135
2149
|
};
|
|
2136
|
-
/**
|
|
2137
|
-
* returns the type of the cache (in this case account)
|
|
2138
|
-
*/
|
|
2139
|
-
AccountEntity.prototype.generateType = function () {
|
|
2140
|
-
switch (this.authorityType) {
|
|
2141
|
-
case CacheAccountType.ADFS_ACCOUNT_TYPE:
|
|
2142
|
-
return CacheType.ADFS;
|
|
2143
|
-
case CacheAccountType.MSAV1_ACCOUNT_TYPE:
|
|
2144
|
-
return CacheType.MSA;
|
|
2145
|
-
case CacheAccountType.MSSTS_ACCOUNT_TYPE:
|
|
2146
|
-
return CacheType.MSSTS;
|
|
2147
|
-
case CacheAccountType.GENERIC_ACCOUNT_TYPE:
|
|
2148
|
-
return CacheType.GENERIC;
|
|
2149
|
-
default: {
|
|
2150
|
-
throw ClientAuthError.createUnexpectedAccountTypeError();
|
|
2151
|
-
}
|
|
2152
|
-
}
|
|
2153
|
-
};
|
|
2154
2150
|
/**
|
|
2155
2151
|
* Returns the AccountInfo interface for this account.
|
|
2156
2152
|
*/
|
|
@@ -2163,7 +2159,8 @@ var AccountEntity = /** @class */ (function () {
|
|
|
2163
2159
|
localAccountId: this.localAccountId,
|
|
2164
2160
|
name: this.name,
|
|
2165
2161
|
idTokenClaims: this.idTokenClaims,
|
|
2166
|
-
nativeAccountId: this.nativeAccountId
|
|
2162
|
+
nativeAccountId: this.nativeAccountId,
|
|
2163
|
+
authorityType: this.authorityType
|
|
2167
2164
|
};
|
|
2168
2165
|
};
|
|
2169
2166
|
/**
|
|
@@ -2179,76 +2176,73 @@ var AccountEntity = /** @class */ (function () {
|
|
|
2179
2176
|
return accountKey.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
|
|
2180
2177
|
};
|
|
2181
2178
|
/**
|
|
2182
|
-
* Build Account cache from
|
|
2183
|
-
* @param
|
|
2179
|
+
* Build Account cache from account properties.
|
|
2180
|
+
* @param accountDetails
|
|
2184
2181
|
* @param authority
|
|
2185
|
-
* @param idToken
|
|
2186
|
-
* @param policy
|
|
2187
2182
|
*/
|
|
2188
|
-
AccountEntity.createAccount = function (
|
|
2189
|
-
var _a, _b, _c, _d, _e, _f;
|
|
2183
|
+
AccountEntity.createAccount = function (accountDetails, authority) {
|
|
2190
2184
|
var account = new AccountEntity();
|
|
2191
|
-
|
|
2192
|
-
|
|
2193
|
-
|
|
2194
|
-
|
|
2195
|
-
|
|
2185
|
+
if (authority.authorityType === AuthorityType.Adfs) {
|
|
2186
|
+
account.authorityType = CacheAccountType.ADFS_ACCOUNT_TYPE;
|
|
2187
|
+
}
|
|
2188
|
+
else if (authority.protocolMode === exports.ProtocolMode.AAD) {
|
|
2189
|
+
account.authorityType = CacheAccountType.MSSTS_ACCOUNT_TYPE;
|
|
2190
|
+
}
|
|
2191
|
+
else {
|
|
2192
|
+
account.authorityType = CacheAccountType.GENERIC_ACCOUNT_TYPE;
|
|
2193
|
+
}
|
|
2194
|
+
account.clientInfo = accountDetails.clientInfo;
|
|
2195
|
+
account.homeAccountId = accountDetails.homeAccountId;
|
|
2196
|
+
account.nativeAccountId = accountDetails.nativeAccountId;
|
|
2197
|
+
var env = accountDetails.environment || (authority && authority.getPreferredCache());
|
|
2196
2198
|
if (!env) {
|
|
2197
2199
|
throw ClientAuthError.createInvalidCacheEnvironmentError();
|
|
2198
2200
|
}
|
|
2199
2201
|
account.environment = env;
|
|
2200
2202
|
// non AAD scenarios can have empty realm
|
|
2201
|
-
account.realm =
|
|
2202
|
-
|
|
2203
|
-
|
|
2204
|
-
|
|
2205
|
-
|
|
2206
|
-
|
|
2207
|
-
|
|
2208
|
-
|
|
2209
|
-
|
|
2210
|
-
|
|
2211
|
-
var preferredUsername =
|
|
2212
|
-
var email = (
|
|
2213
|
-
account.username = preferredUsername || email ||
|
|
2214
|
-
account.name = (_f = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _f === void 0 ? void 0 : _f.name;
|
|
2203
|
+
account.realm = accountDetails.idTokenClaims.tid || Constants.EMPTY_STRING;
|
|
2204
|
+
account.idTokenClaims = accountDetails.idTokenClaims;
|
|
2205
|
+
// How do you account for MSA CID here?
|
|
2206
|
+
account.localAccountId = accountDetails.idTokenClaims.oid || accountDetails.idTokenClaims.sub || Constants.EMPTY_STRING;
|
|
2207
|
+
/*
|
|
2208
|
+
* In B2C scenarios the emails claim is used instead of preferred_username and it is an array.
|
|
2209
|
+
* In most cases it will contain a single email. This field should not be relied upon if a custom
|
|
2210
|
+
* policy is configured to return more than 1 email.
|
|
2211
|
+
*/
|
|
2212
|
+
if (account.authorityType === CacheAccountType.MSSTS_ACCOUNT_TYPE) {
|
|
2213
|
+
var preferredUsername = accountDetails.idTokenClaims.preferred_username;
|
|
2214
|
+
var email = (accountDetails.idTokenClaims.emails) ? accountDetails.idTokenClaims.emails[0] : null;
|
|
2215
|
+
account.username = preferredUsername || email || "";
|
|
2215
2216
|
}
|
|
2216
|
-
|
|
2217
|
-
|
|
2217
|
+
else {
|
|
2218
|
+
account.username = accountDetails.idTokenClaims.upn || "";
|
|
2219
|
+
}
|
|
2220
|
+
account.name = accountDetails.idTokenClaims.name;
|
|
2221
|
+
account.cloudGraphHostName = accountDetails.cloudGraphHostName;
|
|
2222
|
+
account.msGraphHost = accountDetails.msGraphHost;
|
|
2218
2223
|
return account;
|
|
2219
2224
|
};
|
|
2220
2225
|
/**
|
|
2221
|
-
*
|
|
2222
|
-
* @param
|
|
2223
|
-
* @param
|
|
2226
|
+
* Creates an account object from AccountInfo
|
|
2227
|
+
* @param accountInfo
|
|
2228
|
+
* @param cloudGraphHostName
|
|
2229
|
+
* @param msGraphHost
|
|
2230
|
+
* @returns AccountEntity
|
|
2224
2231
|
*/
|
|
2225
|
-
AccountEntity.
|
|
2226
|
-
var _a, _b, _c, _d;
|
|
2232
|
+
AccountEntity.createFromAccountInfo = function (accountInfo, cloudGraphHostName, msGraphHost) {
|
|
2227
2233
|
var account = new AccountEntity();
|
|
2228
|
-
account.authorityType =
|
|
2229
|
-
|
|
2230
|
-
account.homeAccountId = homeAccountId;
|
|
2231
|
-
|
|
2232
|
-
account.
|
|
2233
|
-
|
|
2234
|
-
|
|
2235
|
-
|
|
2236
|
-
|
|
2237
|
-
|
|
2238
|
-
// How do you account for MSA CID here?
|
|
2239
|
-
account.localAccountId = ((_a = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _a === void 0 ? void 0 : _a.oid) || ((_b = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _b === void 0 ? void 0 : _b.sub) || Constants.EMPTY_STRING;
|
|
2240
|
-
// upn claim for most ADFS scenarios
|
|
2241
|
-
account.username = ((_c = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _c === void 0 ? void 0 : _c.upn) || Constants.EMPTY_STRING;
|
|
2242
|
-
account.name = ((_d = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _d === void 0 ? void 0 : _d.name) || Constants.EMPTY_STRING;
|
|
2243
|
-
account.idTokenClaims = idToken === null || idToken === void 0 ? void 0 : idToken.claims;
|
|
2244
|
-
}
|
|
2245
|
-
account.environment = env;
|
|
2234
|
+
account.authorityType =
|
|
2235
|
+
accountInfo.authorityType || CacheAccountType.GENERIC_ACCOUNT_TYPE;
|
|
2236
|
+
account.homeAccountId = accountInfo.homeAccountId;
|
|
2237
|
+
account.localAccountId = accountInfo.localAccountId;
|
|
2238
|
+
account.nativeAccountId = accountInfo.nativeAccountId;
|
|
2239
|
+
account.realm = accountInfo.tenantId;
|
|
2240
|
+
account.environment = accountInfo.environment;
|
|
2241
|
+
account.username = accountInfo.username;
|
|
2242
|
+
account.name = accountInfo.name;
|
|
2243
|
+
account.idTokenClaims = accountInfo.idTokenClaims;
|
|
2246
2244
|
account.cloudGraphHostName = cloudGraphHostName;
|
|
2247
2245
|
account.msGraphHost = msGraphHost;
|
|
2248
|
-
/*
|
|
2249
|
-
* add uniqueName to claims
|
|
2250
|
-
* account.name = idToken.claims.uniqueName;
|
|
2251
|
-
*/
|
|
2252
2246
|
return account;
|
|
2253
2247
|
};
|
|
2254
2248
|
/**
|
|
@@ -2256,9 +2250,8 @@ var AccountEntity = /** @class */ (function () {
|
|
|
2256
2250
|
* @param serverClientInfo
|
|
2257
2251
|
* @param authType
|
|
2258
2252
|
*/
|
|
2259
|
-
AccountEntity.generateHomeAccountId = function (serverClientInfo, authType, logger, cryptoObj,
|
|
2260
|
-
var
|
|
2261
|
-
var accountId = ((_a = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _a === void 0 ? void 0 : _a.sub) ? idToken.claims.sub : Constants.EMPTY_STRING;
|
|
2253
|
+
AccountEntity.generateHomeAccountId = function (serverClientInfo, authType, logger, cryptoObj, idTokenClaims) {
|
|
2254
|
+
var accountId = (idTokenClaims === null || idTokenClaims === void 0 ? void 0 : idTokenClaims.sub) ? idTokenClaims.sub : Constants.EMPTY_STRING;
|
|
2262
2255
|
// since ADFS does not have tid and does not set client_info
|
|
2263
2256
|
if (authType === AuthorityType.Adfs || authType === AuthorityType.Dsts) {
|
|
2264
2257
|
return accountId;
|
|
@@ -2321,7 +2314,7 @@ var AccountEntity = /** @class */ (function () {
|
|
|
2321
2314
|
return AccountEntity;
|
|
2322
2315
|
}());
|
|
2323
2316
|
|
|
2324
|
-
/*! @azure/msal-common v13.3.
|
|
2317
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
2325
2318
|
|
|
2326
2319
|
/*
|
|
2327
2320
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -2373,7 +2366,7 @@ var AuthToken = /** @class */ (function () {
|
|
|
2373
2366
|
return AuthToken;
|
|
2374
2367
|
}());
|
|
2375
2368
|
|
|
2376
|
-
/*! @azure/msal-common v13.3.
|
|
2369
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
2377
2370
|
|
|
2378
2371
|
/*
|
|
2379
2372
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -3430,7 +3423,7 @@ var DefaultStorageClass = /** @class */ (function (_super) {
|
|
|
3430
3423
|
return DefaultStorageClass;
|
|
3431
3424
|
}(CacheManager));
|
|
3432
3425
|
|
|
3433
|
-
/*! @azure/msal-common v13.3.
|
|
3426
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
3434
3427
|
|
|
3435
3428
|
/*
|
|
3436
3429
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -3527,7 +3520,7 @@ function buildAuthOptions(authOptions) {
|
|
|
3527
3520
|
return __assign({ clientCapabilities: [], azureCloudOptions: DEFAULT_AZURE_CLOUD_OPTIONS, skipAuthorityMetadataCache: false }, authOptions);
|
|
3528
3521
|
}
|
|
3529
3522
|
|
|
3530
|
-
/*! @azure/msal-common v13.3.
|
|
3523
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
3531
3524
|
|
|
3532
3525
|
/*
|
|
3533
3526
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -3547,7 +3540,7 @@ var ServerError = /** @class */ (function (_super) {
|
|
|
3547
3540
|
return ServerError;
|
|
3548
3541
|
}(AuthError));
|
|
3549
3542
|
|
|
3550
|
-
/*! @azure/msal-common v13.3.
|
|
3543
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
3551
3544
|
|
|
3552
3545
|
/*
|
|
3553
3546
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -3643,7 +3636,7 @@ var ThrottlingUtils = /** @class */ (function () {
|
|
|
3643
3636
|
return ThrottlingUtils;
|
|
3644
3637
|
}());
|
|
3645
3638
|
|
|
3646
|
-
/*! @azure/msal-common v13.3.
|
|
3639
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
3647
3640
|
|
|
3648
3641
|
/*
|
|
3649
3642
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -3692,7 +3685,7 @@ var NetworkManager = /** @class */ (function () {
|
|
|
3692
3685
|
return NetworkManager;
|
|
3693
3686
|
}());
|
|
3694
3687
|
|
|
3695
|
-
/*! @azure/msal-common v13.3.
|
|
3688
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
3696
3689
|
/*
|
|
3697
3690
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3698
3691
|
* Licensed under the MIT License.
|
|
@@ -3703,7 +3696,7 @@ var CcsCredentialType;
|
|
|
3703
3696
|
CcsCredentialType["UPN"] = "UPN";
|
|
3704
3697
|
})(CcsCredentialType || (CcsCredentialType = {}));
|
|
3705
3698
|
|
|
3706
|
-
/*! @azure/msal-common v13.3.
|
|
3699
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
3707
3700
|
|
|
3708
3701
|
/*
|
|
3709
3702
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -3794,7 +3787,7 @@ var RequestValidator = /** @class */ (function () {
|
|
|
3794
3787
|
return RequestValidator;
|
|
3795
3788
|
}());
|
|
3796
3789
|
|
|
3797
|
-
/*! @azure/msal-common v13.3.
|
|
3790
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
3798
3791
|
|
|
3799
3792
|
/*
|
|
3800
3793
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -4172,7 +4165,7 @@ var RequestParameterBuilder = /** @class */ (function () {
|
|
|
4172
4165
|
return RequestParameterBuilder;
|
|
4173
4166
|
}());
|
|
4174
4167
|
|
|
4175
|
-
/*! @azure/msal-common v13.3.
|
|
4168
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4176
4169
|
|
|
4177
4170
|
/*
|
|
4178
4171
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -4274,7 +4267,7 @@ var BaseClient = /** @class */ (function () {
|
|
|
4274
4267
|
return BaseClient;
|
|
4275
4268
|
}());
|
|
4276
4269
|
|
|
4277
|
-
/*! @azure/msal-common v13.3.
|
|
4270
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4278
4271
|
|
|
4279
4272
|
/*
|
|
4280
4273
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -4412,7 +4405,7 @@ var CredentialEntity = /** @class */ (function () {
|
|
|
4412
4405
|
return CredentialEntity;
|
|
4413
4406
|
}());
|
|
4414
4407
|
|
|
4415
|
-
/*! @azure/msal-common v13.3.
|
|
4408
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4416
4409
|
|
|
4417
4410
|
/*
|
|
4418
4411
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -4476,7 +4469,7 @@ var IdTokenEntity = /** @class */ (function (_super) {
|
|
|
4476
4469
|
return IdTokenEntity;
|
|
4477
4470
|
}(CredentialEntity));
|
|
4478
4471
|
|
|
4479
|
-
/*! @azure/msal-common v13.3.
|
|
4472
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4480
4473
|
/*
|
|
4481
4474
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4482
4475
|
* Licensed under the MIT License.
|
|
@@ -4526,7 +4519,7 @@ var TimeUtils = /** @class */ (function () {
|
|
|
4526
4519
|
return TimeUtils;
|
|
4527
4520
|
}());
|
|
4528
4521
|
|
|
4529
|
-
/*! @azure/msal-common v13.3.
|
|
4522
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4530
4523
|
|
|
4531
4524
|
/*
|
|
4532
4525
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -4640,7 +4633,7 @@ var AccessTokenEntity = /** @class */ (function (_super) {
|
|
|
4640
4633
|
return AccessTokenEntity;
|
|
4641
4634
|
}(CredentialEntity));
|
|
4642
4635
|
|
|
4643
|
-
/*! @azure/msal-common v13.3.
|
|
4636
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4644
4637
|
|
|
4645
4638
|
/*
|
|
4646
4639
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -4707,7 +4700,7 @@ var RefreshTokenEntity = /** @class */ (function (_super) {
|
|
|
4707
4700
|
return RefreshTokenEntity;
|
|
4708
4701
|
}(CredentialEntity));
|
|
4709
4702
|
|
|
4710
|
-
/*! @azure/msal-common v13.3.
|
|
4703
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4711
4704
|
|
|
4712
4705
|
/*
|
|
4713
4706
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -4786,7 +4779,7 @@ var InteractionRequiredAuthError = /** @class */ (function (_super) {
|
|
|
4786
4779
|
return InteractionRequiredAuthError;
|
|
4787
4780
|
}(AuthError));
|
|
4788
4781
|
|
|
4789
|
-
/*! @azure/msal-common v13.3.
|
|
4782
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4790
4783
|
/*
|
|
4791
4784
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4792
4785
|
* Licensed under the MIT License.
|
|
@@ -4802,7 +4795,7 @@ var CacheRecord = /** @class */ (function () {
|
|
|
4802
4795
|
return CacheRecord;
|
|
4803
4796
|
}());
|
|
4804
4797
|
|
|
4805
|
-
/*! @azure/msal-common v13.3.
|
|
4798
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4806
4799
|
|
|
4807
4800
|
/*
|
|
4808
4801
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -4873,7 +4866,7 @@ var ProtocolUtils = /** @class */ (function () {
|
|
|
4873
4866
|
return ProtocolUtils;
|
|
4874
4867
|
}());
|
|
4875
4868
|
|
|
4876
|
-
/*! @azure/msal-common v13.3.
|
|
4869
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
4877
4870
|
|
|
4878
4871
|
/*
|
|
4879
4872
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -5107,7 +5100,7 @@ var UrlString = /** @class */ (function () {
|
|
|
5107
5100
|
return UrlString;
|
|
5108
5101
|
}());
|
|
5109
5102
|
|
|
5110
|
-
/*! @azure/msal-common v13.3.
|
|
5103
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
5111
5104
|
/*
|
|
5112
5105
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
5113
5106
|
* Licensed under the MIT License.
|
|
@@ -5340,7 +5333,7 @@ var IntFields = new Set([
|
|
|
5340
5333
|
"status",
|
|
5341
5334
|
]);
|
|
5342
5335
|
|
|
5343
|
-
/*! @azure/msal-common v13.3.
|
|
5336
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
5344
5337
|
|
|
5345
5338
|
/*
|
|
5346
5339
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -5449,7 +5442,7 @@ var PopTokenGenerator = /** @class */ (function () {
|
|
|
5449
5442
|
return PopTokenGenerator;
|
|
5450
5443
|
}());
|
|
5451
5444
|
|
|
5452
|
-
/*! @azure/msal-common v13.3.
|
|
5445
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
5453
5446
|
|
|
5454
5447
|
/*
|
|
5455
5448
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -5519,7 +5512,7 @@ var AppMetadataEntity = /** @class */ (function () {
|
|
|
5519
5512
|
return AppMetadataEntity;
|
|
5520
5513
|
}());
|
|
5521
5514
|
|
|
5522
|
-
/*! @azure/msal-common v13.3.
|
|
5515
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
5523
5516
|
/*
|
|
5524
5517
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
5525
5518
|
* Licensed under the MIT License.
|
|
@@ -5555,7 +5548,7 @@ var AppMetadataEntity = /** @class */ (function () {
|
|
|
5555
5548
|
return TokenCacheContext;
|
|
5556
5549
|
}());
|
|
5557
5550
|
|
|
5558
|
-
/*! @azure/msal-common v13.3.
|
|
5551
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
5559
5552
|
|
|
5560
5553
|
/*
|
|
5561
5554
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -5643,7 +5636,7 @@ var ResponseHandler = /** @class */ (function () {
|
|
|
5643
5636
|
}
|
|
5644
5637
|
}
|
|
5645
5638
|
// generate homeAccountId
|
|
5646
|
-
this.homeAccountIdentifier = AccountEntity.generateHomeAccountId(serverTokenResponse.client_info || Constants.EMPTY_STRING, authority.authorityType, this.logger, this.cryptoObj, idTokenObj);
|
|
5639
|
+
this.homeAccountIdentifier = AccountEntity.generateHomeAccountId(serverTokenResponse.client_info || Constants.EMPTY_STRING, authority.authorityType, this.logger, this.cryptoObj, idTokenObj === null || idTokenObj === void 0 ? void 0 : idTokenObj.claims);
|
|
5647
5640
|
if (!!authCodePayload && !!authCodePayload.state) {
|
|
5648
5641
|
requestStateObj = ProtocolUtils.parseRequestState(this.cryptoObj, authCodePayload.state);
|
|
5649
5642
|
}
|
|
@@ -5708,7 +5701,13 @@ var ResponseHandler = /** @class */ (function () {
|
|
|
5708
5701
|
var cachedAccount;
|
|
5709
5702
|
if (!StringUtils.isEmpty(serverTokenResponse.id_token) && !!idTokenObj) {
|
|
5710
5703
|
cachedIdToken = IdTokenEntity.createIdTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.id_token || Constants.EMPTY_STRING, this.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
|
|
5711
|
-
cachedAccount =
|
|
5704
|
+
cachedAccount = AccountEntity.createAccount({
|
|
5705
|
+
homeAccountId: this.homeAccountIdentifier,
|
|
5706
|
+
idTokenClaims: idTokenObj.claims,
|
|
5707
|
+
clientInfo: serverTokenResponse.client_info || Constants.EMPTY_STRING,
|
|
5708
|
+
cloudGraphHostName: authCodePayload === null || authCodePayload === void 0 ? void 0 : authCodePayload.cloud_graph_host_name,
|
|
5709
|
+
msGraphHost: authCodePayload === null || authCodePayload === void 0 ? void 0 : authCodePayload.msgraph_host,
|
|
5710
|
+
}, authority);
|
|
5712
5711
|
}
|
|
5713
5712
|
// AccessToken
|
|
5714
5713
|
var cachedAccessToken = null;
|
|
@@ -5740,29 +5739,6 @@ var ResponseHandler = /** @class */ (function () {
|
|
|
5740
5739
|
}
|
|
5741
5740
|
return new CacheRecord(cachedAccount, cachedIdToken, cachedAccessToken, cachedRefreshToken, cachedAppMetadata);
|
|
5742
5741
|
};
|
|
5743
|
-
/**
|
|
5744
|
-
* Generate Account
|
|
5745
|
-
* @param serverTokenResponse
|
|
5746
|
-
* @param idToken
|
|
5747
|
-
* @param authority
|
|
5748
|
-
*/
|
|
5749
|
-
ResponseHandler.prototype.generateAccountEntity = function (serverTokenResponse, idToken, authority, authCodePayload) {
|
|
5750
|
-
var authorityType = authority.authorityType;
|
|
5751
|
-
var cloudGraphHostName = authCodePayload ? authCodePayload.cloud_graph_host_name : Constants.EMPTY_STRING;
|
|
5752
|
-
var msGraphhost = authCodePayload ? authCodePayload.msgraph_host : Constants.EMPTY_STRING;
|
|
5753
|
-
// ADFS does not require client_info in the response
|
|
5754
|
-
if (authorityType === AuthorityType.Adfs) {
|
|
5755
|
-
this.logger.verbose("Authority type is ADFS, creating ADFS account");
|
|
5756
|
-
return AccountEntity.createGenericAccount(this.homeAccountIdentifier, idToken, authority, cloudGraphHostName, msGraphhost);
|
|
5757
|
-
}
|
|
5758
|
-
// This fallback applies to B2C as well as they fall under an AAD account type.
|
|
5759
|
-
if (StringUtils.isEmpty(serverTokenResponse.client_info) && authority.protocolMode === "AAD") {
|
|
5760
|
-
throw ClientAuthError.createClientInfoEmptyError();
|
|
5761
|
-
}
|
|
5762
|
-
return serverTokenResponse.client_info ?
|
|
5763
|
-
AccountEntity.createAccount(serverTokenResponse.client_info, this.homeAccountIdentifier, idToken, authority, cloudGraphHostName, msGraphhost) :
|
|
5764
|
-
AccountEntity.createGenericAccount(this.homeAccountIdentifier, idToken, authority, cloudGraphHostName, msGraphhost);
|
|
5765
|
-
};
|
|
5766
5742
|
/**
|
|
5767
5743
|
* Creates an @AuthenticationResult from @CacheRecord , @IdToken , and a boolean that states whether or not the result is from cache.
|
|
5768
5744
|
*
|
|
@@ -5842,7 +5818,7 @@ var ResponseHandler = /** @class */ (function () {
|
|
|
5842
5818
|
return ResponseHandler;
|
|
5843
5819
|
}());
|
|
5844
5820
|
|
|
5845
|
-
/*! @azure/msal-common v13.3.
|
|
5821
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
5846
5822
|
|
|
5847
5823
|
/*
|
|
5848
5824
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -6320,7 +6296,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
|
|
|
6320
6296
|
return AuthorizationCodeClient;
|
|
6321
6297
|
}(BaseClient));
|
|
6322
6298
|
|
|
6323
|
-
/*! @azure/msal-common v13.3.
|
|
6299
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
6324
6300
|
|
|
6325
6301
|
/*
|
|
6326
6302
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -6594,7 +6570,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
|
|
|
6594
6570
|
return RefreshTokenClient;
|
|
6595
6571
|
}(BaseClient));
|
|
6596
6572
|
|
|
6597
|
-
/*! @azure/msal-common v13.3.
|
|
6573
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
6598
6574
|
|
|
6599
6575
|
/*
|
|
6600
6576
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -6724,7 +6700,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
|
|
|
6724
6700
|
return SilentFlowClient;
|
|
6725
6701
|
}(BaseClient));
|
|
6726
6702
|
|
|
6727
|
-
/*! @azure/msal-common v13.3.
|
|
6703
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
6728
6704
|
/*
|
|
6729
6705
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
6730
6706
|
* Licensed under the MIT License.
|
|
@@ -6736,7 +6712,7 @@ function isOpenIdConfigResponse(response) {
|
|
|
6736
6712
|
response.hasOwnProperty("jwks_uri"));
|
|
6737
6713
|
}
|
|
6738
6714
|
|
|
6739
|
-
/*! @azure/msal-common v13.3.
|
|
6715
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
6740
6716
|
/*
|
|
6741
6717
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
6742
6718
|
* Licensed under the MIT License.
|
|
@@ -6745,21 +6721,7 @@ var rawMetdataJSON = { "endpointMetadata": { "https://login.microsoftonline.com/
|
|
|
6745
6721
|
var EndpointMetadata = rawMetdataJSON.endpointMetadata;
|
|
6746
6722
|
var InstanceDiscoveryMetadata = rawMetdataJSON.instanceDiscoveryMetadata;
|
|
6747
6723
|
|
|
6748
|
-
/*! @azure/msal-common v13.3.
|
|
6749
|
-
/*
|
|
6750
|
-
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
6751
|
-
* Licensed under the MIT License.
|
|
6752
|
-
*/
|
|
6753
|
-
/**
|
|
6754
|
-
* Protocol modes supported by MSAL.
|
|
6755
|
-
*/
|
|
6756
|
-
exports.ProtocolMode = void 0;
|
|
6757
|
-
(function (ProtocolMode) {
|
|
6758
|
-
ProtocolMode["AAD"] = "AAD";
|
|
6759
|
-
ProtocolMode["OIDC"] = "OIDC";
|
|
6760
|
-
})(exports.ProtocolMode || (exports.ProtocolMode = {}));
|
|
6761
|
-
|
|
6762
|
-
/*! @azure/msal-common v13.3.1 2023-10-27 */
|
|
6724
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
6763
6725
|
|
|
6764
6726
|
/*
|
|
6765
6727
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -6836,7 +6798,7 @@ var AuthorityMetadataEntity = /** @class */ (function () {
|
|
|
6836
6798
|
return AuthorityMetadataEntity;
|
|
6837
6799
|
}());
|
|
6838
6800
|
|
|
6839
|
-
/*! @azure/msal-common v13.3.
|
|
6801
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
6840
6802
|
/*
|
|
6841
6803
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
6842
6804
|
* Licensed under the MIT License.
|
|
@@ -6846,7 +6808,7 @@ function isCloudInstanceDiscoveryResponse(response) {
|
|
|
6846
6808
|
response.hasOwnProperty("metadata"));
|
|
6847
6809
|
}
|
|
6848
6810
|
|
|
6849
|
-
/*! @azure/msal-common v13.3.
|
|
6811
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
6850
6812
|
/*
|
|
6851
6813
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
6852
6814
|
* Licensed under the MIT License.
|
|
@@ -6856,7 +6818,7 @@ function isCloudInstanceDiscoveryErrorResponse(response) {
|
|
|
6856
6818
|
response.hasOwnProperty("error_description"));
|
|
6857
6819
|
}
|
|
6858
6820
|
|
|
6859
|
-
/*! @azure/msal-common v13.3.
|
|
6821
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
6860
6822
|
|
|
6861
6823
|
/*
|
|
6862
6824
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -6988,7 +6950,7 @@ var RegionDiscovery = /** @class */ (function () {
|
|
|
6988
6950
|
return RegionDiscovery;
|
|
6989
6951
|
}());
|
|
6990
6952
|
|
|
6991
|
-
/*! @azure/msal-common v13.3.
|
|
6953
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
6992
6954
|
|
|
6993
6955
|
/*
|
|
6994
6956
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -7781,7 +7743,7 @@ var Authority = /** @class */ (function () {
|
|
|
7781
7743
|
return Authority;
|
|
7782
7744
|
}());
|
|
7783
7745
|
|
|
7784
|
-
/*! @azure/msal-common v13.3.
|
|
7746
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
7785
7747
|
|
|
7786
7748
|
/*
|
|
7787
7749
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -7845,7 +7807,7 @@ var AuthorityFactory = /** @class */ (function () {
|
|
|
7845
7807
|
return AuthorityFactory;
|
|
7846
7808
|
}());
|
|
7847
7809
|
|
|
7848
|
-
/*! @azure/msal-common v13.3.
|
|
7810
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
7849
7811
|
|
|
7850
7812
|
/*
|
|
7851
7813
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -7876,7 +7838,7 @@ var ServerTelemetryEntity = /** @class */ (function () {
|
|
|
7876
7838
|
return ServerTelemetryEntity;
|
|
7877
7839
|
}());
|
|
7878
7840
|
|
|
7879
|
-
/*! @azure/msal-common v13.3.
|
|
7841
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
7880
7842
|
|
|
7881
7843
|
/*
|
|
7882
7844
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -7904,7 +7866,7 @@ var ThrottlingEntity = /** @class */ (function () {
|
|
|
7904
7866
|
return ThrottlingEntity;
|
|
7905
7867
|
}());
|
|
7906
7868
|
|
|
7907
|
-
/*! @azure/msal-common v13.3.
|
|
7869
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
7908
7870
|
|
|
7909
7871
|
/*
|
|
7910
7872
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -7921,7 +7883,7 @@ var StubbedNetworkModule = {
|
|
|
7921
7883
|
}
|
|
7922
7884
|
};
|
|
7923
7885
|
|
|
7924
|
-
/*! @azure/msal-common v13.3.
|
|
7886
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
7925
7887
|
|
|
7926
7888
|
/*
|
|
7927
7889
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -7966,7 +7928,7 @@ var JoseHeaderError = /** @class */ (function (_super) {
|
|
|
7966
7928
|
return JoseHeaderError;
|
|
7967
7929
|
}(AuthError));
|
|
7968
7930
|
|
|
7969
|
-
/*! @azure/msal-common v13.3.
|
|
7931
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
7970
7932
|
|
|
7971
7933
|
/*
|
|
7972
7934
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -8006,7 +7968,7 @@ var JoseHeader = /** @class */ (function () {
|
|
|
8006
7968
|
return JoseHeader;
|
|
8007
7969
|
}());
|
|
8008
7970
|
|
|
8009
|
-
/*! @azure/msal-common v13.3.
|
|
7971
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
8010
7972
|
|
|
8011
7973
|
/*
|
|
8012
7974
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -8065,7 +8027,7 @@ var AuthenticationHeaderParser = /** @class */ (function () {
|
|
|
8065
8027
|
return AuthenticationHeaderParser;
|
|
8066
8028
|
}());
|
|
8067
8029
|
|
|
8068
|
-
/*! @azure/msal-common v13.3.
|
|
8030
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
8069
8031
|
|
|
8070
8032
|
/*
|
|
8071
8033
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -8227,7 +8189,7 @@ var ServerTelemetryManager = /** @class */ (function () {
|
|
|
8227
8189
|
return ServerTelemetryManager;
|
|
8228
8190
|
}());
|
|
8229
8191
|
|
|
8230
|
-
/*! @azure/msal-common v13.3.
|
|
8192
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
8231
8193
|
|
|
8232
8194
|
/*
|
|
8233
8195
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -8630,7 +8592,7 @@ var PerformanceClient = /** @class */ (function () {
|
|
|
8630
8592
|
return PerformanceClient;
|
|
8631
8593
|
}());
|
|
8632
8594
|
|
|
8633
|
-
/*! @azure/msal-common v13.3.
|
|
8595
|
+
/*! @azure/msal-common v13.3.3 2024-06-06 */
|
|
8634
8596
|
|
|
8635
8597
|
/*
|
|
8636
8598
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -10874,6 +10836,34 @@ var BrowserCacheManager = /** @class */ (function (_super) {
|
|
|
10874
10836
|
BrowserCacheManager.prototype.setRedirectRequestContext = function (value) {
|
|
10875
10837
|
this.setTemporaryCache(TemporaryCacheKeys.REDIRECT_CONTEXT, value, true);
|
|
10876
10838
|
};
|
|
10839
|
+
/**
|
|
10840
|
+
* Builds credential entities from AuthenticationResult object and saves the resulting credentials to the cache
|
|
10841
|
+
* @param result
|
|
10842
|
+
* @param request
|
|
10843
|
+
*/
|
|
10844
|
+
BrowserCacheManager.prototype.hydrateCache = function (result, request) {
|
|
10845
|
+
var _a, _b, _c, _d, _e, _f;
|
|
10846
|
+
return __awaiter$1(this, void 0, void 0, function () {
|
|
10847
|
+
var idTokenEntity, claimsHash, accessTokenEntity, cacheRecord;
|
|
10848
|
+
return __generator$1(this, function (_g) {
|
|
10849
|
+
switch (_g.label) {
|
|
10850
|
+
case 0:
|
|
10851
|
+
idTokenEntity = IdTokenEntity.createIdTokenEntity(((_a = result.account) === null || _a === void 0 ? void 0 : _a.homeAccountId) || "", ((_b = result.account) === null || _b === void 0 ? void 0 : _b.environment) || "", result.idToken, this.clientId, result.tenantId);
|
|
10852
|
+
if (!request.claims) return [3 /*break*/, 2];
|
|
10853
|
+
return [4 /*yield*/, this.cryptoImpl.hashString(request.claims)];
|
|
10854
|
+
case 1:
|
|
10855
|
+
claimsHash = _g.sent();
|
|
10856
|
+
_g.label = 2;
|
|
10857
|
+
case 2:
|
|
10858
|
+
accessTokenEntity = AccessTokenEntity.createAccessTokenEntity(((_c = result.account) === null || _c === void 0 ? void 0 : _c.homeAccountId) || "", ((_d = result.account) === null || _d === void 0 ? void 0 : _d.environment) || "", result.accessToken, this.clientId, result.tenantId, result.scopes.join(" "), ((_e = result.expiresOn) === null || _e === void 0 ? void 0 : _e.getTime()) || 0, ((_f = result.extExpiresOn) === null || _f === void 0 ? void 0 : _f.getTime()) || 0, this.cryptoImpl, undefined, // refreshOn
|
|
10859
|
+
result.tokenType, undefined, // userAssertionHash
|
|
10860
|
+
request.sshKid, request.claims, claimsHash);
|
|
10861
|
+
cacheRecord = new CacheRecord(undefined, idTokenEntity, accessTokenEntity);
|
|
10862
|
+
return [2 /*return*/, this.saveCacheRecord(cacheRecord)];
|
|
10863
|
+
}
|
|
10864
|
+
});
|
|
10865
|
+
});
|
|
10866
|
+
};
|
|
10877
10867
|
return BrowserCacheManager;
|
|
10878
10868
|
}(CacheManager));
|
|
10879
10869
|
var DEFAULT_BROWSER_CACHE_MANAGER = function (clientId, logger) {
|
|
@@ -10890,7 +10880,7 @@ var DEFAULT_BROWSER_CACHE_MANAGER = function (clientId, logger) {
|
|
|
10890
10880
|
|
|
10891
10881
|
/* eslint-disable header/header */
|
|
10892
10882
|
var name = "@azure/msal-browser";
|
|
10893
|
-
var version = "2.
|
|
10883
|
+
var version = "2.39.0";
|
|
10894
10884
|
|
|
10895
10885
|
/*
|
|
10896
10886
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
@@ -12391,7 +12381,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
|
|
|
12391
12381
|
*/
|
|
12392
12382
|
NativeInteractionClient.prototype.acquireTokensFromCache = function (nativeAccountId, request) {
|
|
12393
12383
|
return __awaiter$1(this, void 0, void 0, function () {
|
|
12394
|
-
var account, silentRequest, result, e_2;
|
|
12384
|
+
var account, silentRequest, result, fullAccount, e_2;
|
|
12395
12385
|
return __generator$1(this, function (_a) {
|
|
12396
12386
|
switch (_a.label) {
|
|
12397
12387
|
case 0:
|
|
@@ -12410,7 +12400,8 @@ var NativeInteractionClient = /** @class */ (function (_super) {
|
|
|
12410
12400
|
return [4 /*yield*/, this.silentCacheClient.acquireToken(silentRequest)];
|
|
12411
12401
|
case 2:
|
|
12412
12402
|
result = _a.sent();
|
|
12413
|
-
|
|
12403
|
+
fullAccount = __assign$1(__assign$1({}, account), { idTokenClaims: result.idTokenClaims });
|
|
12404
|
+
return [2 /*return*/, __assign$1(__assign$1({}, result), { account: fullAccount })];
|
|
12414
12405
|
case 3:
|
|
12415
12406
|
e_2 = _a.sent();
|
|
12416
12407
|
throw e_2;
|
|
@@ -12533,7 +12524,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
|
|
|
12533
12524
|
*/
|
|
12534
12525
|
NativeInteractionClient.prototype.handleNativeResponse = function (response, request, reqTimestamp) {
|
|
12535
12526
|
return __awaiter$1(this, void 0, void 0, function () {
|
|
12536
|
-
var authority,
|
|
12527
|
+
var authority, idTokenObj, homeAccountIdentifier, accountEntity, result;
|
|
12537
12528
|
return __generator$1(this, function (_a) {
|
|
12538
12529
|
switch (_a.label) {
|
|
12539
12530
|
case 0:
|
|
@@ -12545,16 +12536,20 @@ var NativeInteractionClient = /** @class */ (function (_super) {
|
|
|
12545
12536
|
return [4 /*yield*/, this.getDiscoveredAuthority(request.authority)];
|
|
12546
12537
|
case 1:
|
|
12547
12538
|
authority = _a.sent();
|
|
12548
|
-
authorityPreferredCache = authority.getPreferredCache();
|
|
12549
12539
|
idTokenObj = this.createIdTokenObj(response);
|
|
12550
12540
|
homeAccountIdentifier = this.createHomeAccountIdentifier(response, idTokenObj);
|
|
12551
|
-
accountEntity =
|
|
12541
|
+
accountEntity = AccountEntity.createAccount({
|
|
12542
|
+
homeAccountId: homeAccountIdentifier,
|
|
12543
|
+
idTokenClaims: idTokenObj.claims,
|
|
12544
|
+
clientInfo: response.client_info,
|
|
12545
|
+
nativeAccountId: response.account.id,
|
|
12546
|
+
}, authority);
|
|
12552
12547
|
return [4 /*yield*/, this.generateAuthenticationResult(response, request, idTokenObj, accountEntity, authority.canonicalAuthority, reqTimestamp)];
|
|
12553
12548
|
case 2:
|
|
12554
12549
|
result = _a.sent();
|
|
12555
12550
|
// cache accounts and tokens in the appropriate storage
|
|
12556
12551
|
this.cacheAccount(accountEntity);
|
|
12557
|
-
this.cacheNativeTokens(response, request, homeAccountIdentifier,
|
|
12552
|
+
this.cacheNativeTokens(response, request, homeAccountIdentifier, idTokenObj, result.accessToken, result.tenantId, reqTimestamp);
|
|
12558
12553
|
return [2 /*return*/, result];
|
|
12559
12554
|
}
|
|
12560
12555
|
});
|
|
@@ -12576,20 +12571,9 @@ var NativeInteractionClient = /** @class */ (function (_super) {
|
|
|
12576
12571
|
*/
|
|
12577
12572
|
NativeInteractionClient.prototype.createHomeAccountIdentifier = function (response, idTokenObj) {
|
|
12578
12573
|
// Save account in browser storage
|
|
12579
|
-
var homeAccountIdentifier = AccountEntity.generateHomeAccountId(response.client_info || Constants.EMPTY_STRING, AuthorityType.Default, this.logger, this.browserCrypto, idTokenObj);
|
|
12574
|
+
var homeAccountIdentifier = AccountEntity.generateHomeAccountId(response.client_info || Constants.EMPTY_STRING, AuthorityType.Default, this.logger, this.browserCrypto, idTokenObj.claims);
|
|
12580
12575
|
return homeAccountIdentifier;
|
|
12581
12576
|
};
|
|
12582
|
-
/**
|
|
12583
|
-
* Creates account entity
|
|
12584
|
-
* @param response
|
|
12585
|
-
* @param homeAccountIdentifier
|
|
12586
|
-
* @param idTokenObj
|
|
12587
|
-
* @param authority
|
|
12588
|
-
* @returns
|
|
12589
|
-
*/
|
|
12590
|
-
NativeInteractionClient.prototype.createAccountEntity = function (response, homeAccountIdentifier, idTokenObj, authority) {
|
|
12591
|
-
return AccountEntity.createAccount(response.client_info, homeAccountIdentifier, idTokenObj, undefined, undefined, undefined, authority, response.account.id);
|
|
12592
|
-
};
|
|
12593
12577
|
/**
|
|
12594
12578
|
* Helper to generate scopes
|
|
12595
12579
|
* @param response
|
|
@@ -12710,7 +12694,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
|
|
|
12710
12694
|
* @param tenantId
|
|
12711
12695
|
* @param reqTimestamp
|
|
12712
12696
|
*/
|
|
12713
|
-
NativeInteractionClient.prototype.cacheNativeTokens = function (response, request, homeAccountIdentifier,
|
|
12697
|
+
NativeInteractionClient.prototype.cacheNativeTokens = function (response, request, homeAccountIdentifier, idTokenObj, responseAccessToken, tenantId, reqTimestamp) {
|
|
12714
12698
|
var cachedIdToken = IdTokenEntity.createIdTokenEntity(homeAccountIdentifier, request.authority, response.id_token || Constants.EMPTY_STRING, request.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
|
|
12715
12699
|
// cache accessToken in inmemory storage
|
|
12716
12700
|
var expiresIn = (request.tokenType === exports.AuthenticationScheme.POP)
|
|
@@ -12723,7 +12707,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
|
|
|
12723
12707
|
var cachedAccessToken = AccessTokenEntity.createAccessTokenEntity(homeAccountIdentifier, request.authority, responseAccessToken, request.clientId, idTokenObj
|
|
12724
12708
|
? idTokenObj.claims.tid || Constants.EMPTY_STRING
|
|
12725
12709
|
: tenantId, responseScopes.printScopes(), tokenExpirationSeconds, 0, this.browserCrypto);
|
|
12726
|
-
var nativeCacheRecord = new CacheRecord(
|
|
12710
|
+
var nativeCacheRecord = new CacheRecord(undefined, cachedIdToken, cachedAccessToken);
|
|
12727
12711
|
this.nativeStorageManager.saveCacheRecord(nativeCacheRecord);
|
|
12728
12712
|
};
|
|
12729
12713
|
NativeInteractionClient.prototype.addTelemetryFromNativeResponse = function (response) {
|
|
@@ -14221,6 +14205,7 @@ var SilentHandler = /** @class */ (function (_super) {
|
|
|
14221
14205
|
*/
|
|
14222
14206
|
SilentHandler.prototype.createHiddenIframe = function () {
|
|
14223
14207
|
var authFrame = document.createElement("iframe");
|
|
14208
|
+
authFrame.className = "msalSilentIframe";
|
|
14224
14209
|
authFrame.style.visibility = "hidden";
|
|
14225
14210
|
authFrame.style.position = "absolute";
|
|
14226
14211
|
authFrame.style.width = authFrame.style.height = "0";
|
|
@@ -16401,8 +16386,9 @@ var TokenCache = /** @class */ (function () {
|
|
|
16401
16386
|
var idToken = new AuthToken(response.id_token, this.cryptoObj);
|
|
16402
16387
|
var cacheRecord;
|
|
16403
16388
|
var authority;
|
|
16389
|
+
var cacheRecordAccount;
|
|
16404
16390
|
if (request.account) {
|
|
16405
|
-
|
|
16391
|
+
cacheRecordAccount = AccountEntity.createFromAccountInfo(request.account);
|
|
16406
16392
|
cacheRecord = new CacheRecord(cacheRecordAccount, this.loadIdToken(idToken, cacheRecordAccount.homeAccountId, request.account.environment, request.account.tenantId), this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, request.account.environment, request.account.tenantId, options), this.loadRefreshToken(request, response, cacheRecordAccount.homeAccountId, request.account.environment));
|
|
16407
16393
|
}
|
|
16408
16394
|
else if (request.authority) {
|
|
@@ -16418,12 +16404,12 @@ var TokenCache = /** @class */ (function () {
|
|
|
16418
16404
|
// "clientInfo" from options takes precedence over "clientInfo" in response
|
|
16419
16405
|
if (options.clientInfo) {
|
|
16420
16406
|
this.logger.trace("TokenCache - homeAccountId from options");
|
|
16421
|
-
|
|
16407
|
+
cacheRecordAccount = this.loadAccount(idToken, authority, options.clientInfo);
|
|
16422
16408
|
cacheRecord = new CacheRecord(cacheRecordAccount, this.loadIdToken(idToken, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant), this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant, options), this.loadRefreshToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort));
|
|
16423
16409
|
}
|
|
16424
16410
|
else if (response.client_info) {
|
|
16425
16411
|
this.logger.trace("TokenCache - homeAccountId from response");
|
|
16426
|
-
|
|
16412
|
+
cacheRecordAccount = this.loadAccount(idToken, authority, response.client_info);
|
|
16427
16413
|
cacheRecord = new CacheRecord(cacheRecordAccount, this.loadIdToken(idToken, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant), this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant, options), this.loadRefreshToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort));
|
|
16428
16414
|
}
|
|
16429
16415
|
else {
|
|
@@ -16433,7 +16419,7 @@ var TokenCache = /** @class */ (function () {
|
|
|
16433
16419
|
else {
|
|
16434
16420
|
throw BrowserAuthError.createUnableToLoadTokenError("Please provide a request with an account or a request with authority.");
|
|
16435
16421
|
}
|
|
16436
|
-
return this.generateAuthenticationResult(request, idToken, cacheRecord, authority);
|
|
16422
|
+
return this.generateAuthenticationResult(request, idToken, cacheRecord, cacheRecordAccount, authority);
|
|
16437
16423
|
};
|
|
16438
16424
|
/**
|
|
16439
16425
|
* Helper function to load account to msal-browser cache
|
|
@@ -16444,20 +16430,18 @@ var TokenCache = /** @class */ (function () {
|
|
|
16444
16430
|
* @param requestHomeAccountId
|
|
16445
16431
|
* @returns `AccountEntity`
|
|
16446
16432
|
*/
|
|
16447
|
-
TokenCache.prototype.loadAccount = function (idToken,
|
|
16433
|
+
TokenCache.prototype.loadAccount = function (idToken, authority, clientInfo, requestHomeAccountId) {
|
|
16448
16434
|
var homeAccountId;
|
|
16449
16435
|
if (requestHomeAccountId) {
|
|
16450
16436
|
homeAccountId = requestHomeAccountId;
|
|
16451
16437
|
}
|
|
16452
|
-
else if (authorityType !== undefined && clientInfo) {
|
|
16453
|
-
homeAccountId = AccountEntity.generateHomeAccountId(clientInfo, authorityType, this.logger, this.cryptoObj, idToken);
|
|
16438
|
+
else if (authority.authorityType !== undefined && clientInfo) {
|
|
16439
|
+
homeAccountId = AccountEntity.generateHomeAccountId(clientInfo, authority.authorityType, this.logger, this.cryptoObj, idToken.claims);
|
|
16454
16440
|
}
|
|
16455
16441
|
if (!homeAccountId) {
|
|
16456
16442
|
throw BrowserAuthError.createUnableToLoadTokenError("Unexpected missing homeAccountId");
|
|
16457
16443
|
}
|
|
16458
|
-
var accountEntity = clientInfo
|
|
16459
|
-
AccountEntity.createAccount(clientInfo, homeAccountId, idToken, undefined, undefined, undefined, environment) :
|
|
16460
|
-
AccountEntity.createGenericAccount(homeAccountId, idToken, undefined, undefined, undefined, environment);
|
|
16444
|
+
var accountEntity = AccountEntity.createAccount({ homeAccountId: homeAccountId, idTokenClaims: idToken.claims, clientInfo: clientInfo, environment: authority.hostnameAndPort }, authority);
|
|
16461
16445
|
if (this.isBrowserEnvironment) {
|
|
16462
16446
|
this.logger.verbose("TokenCache - loading account");
|
|
16463
16447
|
this.storage.setAccount(accountEntity);
|
|
@@ -16547,16 +16531,17 @@ var TokenCache = /** @class */ (function () {
|
|
|
16547
16531
|
* @param request
|
|
16548
16532
|
* @param idTokenObj
|
|
16549
16533
|
* @param cacheRecord
|
|
16534
|
+
* @param accountEntity
|
|
16550
16535
|
* @param authority
|
|
16551
16536
|
* @returns `AuthenticationResult`
|
|
16552
16537
|
*/
|
|
16553
|
-
TokenCache.prototype.generateAuthenticationResult = function (request, idTokenObj, cacheRecord, authority) {
|
|
16554
|
-
var _a
|
|
16538
|
+
TokenCache.prototype.generateAuthenticationResult = function (request, idTokenObj, cacheRecord, accountEntity, authority) {
|
|
16539
|
+
var _a;
|
|
16555
16540
|
var accessToken = Constants.EMPTY_STRING;
|
|
16556
16541
|
var responseScopes = [];
|
|
16557
16542
|
var expiresOn = null;
|
|
16558
16543
|
var extExpiresOn;
|
|
16559
|
-
if (cacheRecord
|
|
16544
|
+
if (cacheRecord.accessToken) {
|
|
16560
16545
|
accessToken = cacheRecord.accessToken.secret;
|
|
16561
16546
|
responseScopes = ScopeSet.fromString(cacheRecord.accessToken.target).asArray();
|
|
16562
16547
|
expiresOn = new Date(Number(cacheRecord.accessToken.expiresOn) * 1000);
|
|
@@ -16569,7 +16554,7 @@ var TokenCache = /** @class */ (function () {
|
|
|
16569
16554
|
uniqueId: uid,
|
|
16570
16555
|
tenantId: tid,
|
|
16571
16556
|
scopes: responseScopes,
|
|
16572
|
-
account:
|
|
16557
|
+
account: accountEntity ? accountEntity.getAccountInfo() : null,
|
|
16573
16558
|
idToken: idTokenObj ? idTokenObj.rawToken : Constants.EMPTY_STRING,
|
|
16574
16559
|
idTokenClaims: idTokenObj ? idTokenObj.claims : {},
|
|
16575
16560
|
accessToken: accessToken,
|
|
@@ -16581,8 +16566,8 @@ var TokenCache = /** @class */ (function () {
|
|
|
16581
16566
|
familyId: Constants.EMPTY_STRING,
|
|
16582
16567
|
tokenType: ((_a = cacheRecord === null || cacheRecord === void 0 ? void 0 : cacheRecord.accessToken) === null || _a === void 0 ? void 0 : _a.tokenType) || Constants.EMPTY_STRING,
|
|
16583
16568
|
state: Constants.EMPTY_STRING,
|
|
16584
|
-
cloudGraphHostName:
|
|
16585
|
-
msGraphHost:
|
|
16569
|
+
cloudGraphHostName: accountEntity.cloudGraphHostName || Constants.EMPTY_STRING,
|
|
16570
|
+
msGraphHost: accountEntity.msGraphHost || Constants.EMPTY_STRING,
|
|
16586
16571
|
code: undefined,
|
|
16587
16572
|
fromNativeBroker: false
|
|
16588
16573
|
};
|
|
@@ -17972,6 +17957,33 @@ var PublicClientApplication = /** @class */ (function (_super) {
|
|
|
17972
17957
|
});
|
|
17973
17958
|
});
|
|
17974
17959
|
};
|
|
17960
|
+
/**
|
|
17961
|
+
* Hydrates cache with the tokens and account in the AuthenticationResult object
|
|
17962
|
+
* @param result
|
|
17963
|
+
* @param request - The request object that was used to obtain the AuthenticationResult
|
|
17964
|
+
* @returns
|
|
17965
|
+
*/
|
|
17966
|
+
PublicClientApplication.prototype.hydrateCache = function (result, request) {
|
|
17967
|
+
return __awaiter$1(this, void 0, void 0, function () {
|
|
17968
|
+
var accountEntity;
|
|
17969
|
+
return __generator$1(this, function (_a) {
|
|
17970
|
+
this.logger.verbose("hydrateCache called");
|
|
17971
|
+
if (result.account) {
|
|
17972
|
+
accountEntity = AccountEntity.createFromAccountInfo(result.account, result.cloudGraphHostName, result.msGraphHost);
|
|
17973
|
+
this.browserStorage.setAccount(accountEntity);
|
|
17974
|
+
if (result.fromNativeBroker) {
|
|
17975
|
+
this.logger.verbose("Response was from native broker, storing in-memory");
|
|
17976
|
+
// Tokens from native broker are stored in-memory
|
|
17977
|
+
return [2 /*return*/, this.nativeInternalStorage.hydrateCache(result, request)];
|
|
17978
|
+
}
|
|
17979
|
+
else {
|
|
17980
|
+
return [2 /*return*/, this.browserStorage.hydrateCache(result, request)];
|
|
17981
|
+
}
|
|
17982
|
+
}
|
|
17983
|
+
return [2 /*return*/];
|
|
17984
|
+
});
|
|
17985
|
+
});
|
|
17986
|
+
};
|
|
17975
17987
|
return PublicClientApplication;
|
|
17976
17988
|
}(ClientApplication));
|
|
17977
17989
|
|
|
@@ -18069,7 +18081,10 @@ var stubbedPublicClientApplication = {
|
|
|
18069
18081
|
},
|
|
18070
18082
|
getConfiguration: function () {
|
|
18071
18083
|
throw BrowserConfigurationAuthError.createStubPcaInstanceCalledError();
|
|
18072
|
-
}
|
|
18084
|
+
},
|
|
18085
|
+
hydrateCache: function () {
|
|
18086
|
+
return Promise.reject(BrowserConfigurationAuthError.createStubPcaInstanceCalledError());
|
|
18087
|
+
},
|
|
18073
18088
|
};
|
|
18074
18089
|
|
|
18075
18090
|
/*
|