@azure/msal-browser 3.0.0-beta.1 → 3.0.1

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.
Files changed (237) hide show
  1. package/README.md +19 -80
  2. package/dist/app/IPublicClientApplication.d.ts +1 -0
  3. package/dist/app/IPublicClientApplication.d.ts.map +1 -1
  4. package/dist/app/{IPublicClientApplication.js → IPublicClientApplication.mjs} +6 -3
  5. package/dist/app/IPublicClientApplication.mjs.map +1 -0
  6. package/dist/app/PublicClientApplication.d.ts +7 -0
  7. package/dist/app/PublicClientApplication.d.ts.map +1 -1
  8. package/dist/app/{PublicClientApplication.js → PublicClientApplication.mjs} +14 -5
  9. package/dist/app/PublicClientApplication.mjs.map +1 -0
  10. package/dist/broker/nativeBroker/NativeMessageHandler.d.ts.map +1 -1
  11. package/dist/broker/nativeBroker/{NativeMessageHandler.js → NativeMessageHandler.mjs} +9 -9
  12. package/dist/broker/nativeBroker/NativeMessageHandler.mjs.map +1 -0
  13. package/dist/broker/nativeBroker/NativeRequest.d.ts +2 -1
  14. package/dist/broker/nativeBroker/NativeRequest.d.ts.map +1 -1
  15. package/dist/cache/{AsyncMemoryStorage.js → AsyncMemoryStorage.mjs} +5 -5
  16. package/dist/cache/AsyncMemoryStorage.mjs.map +1 -0
  17. package/dist/cache/BrowserCacheManager.d.ts +8 -0
  18. package/dist/cache/BrowserCacheManager.d.ts.map +1 -1
  19. package/dist/cache/{BrowserCacheManager.js → BrowserCacheManager.mjs} +25 -8
  20. package/dist/cache/BrowserCacheManager.mjs.map +1 -0
  21. package/dist/cache/{BrowserStorage.js → BrowserStorage.mjs} +4 -4
  22. package/dist/cache/BrowserStorage.mjs.map +1 -0
  23. package/dist/cache/CryptoKeyStore.d.ts +1 -1
  24. package/dist/cache/CryptoKeyStore.d.ts.map +1 -1
  25. package/dist/cache/{CryptoKeyStore.js → CryptoKeyStore.mjs} +3 -3
  26. package/dist/cache/CryptoKeyStore.mjs.map +1 -0
  27. package/dist/cache/{DatabaseStorage.js → DatabaseStorage.mjs} +4 -4
  28. package/dist/cache/DatabaseStorage.mjs.map +1 -0
  29. package/dist/cache/ITokenCache.d.ts.map +1 -1
  30. package/dist/cache/{MemoryStorage.js → MemoryStorage.mjs} +2 -2
  31. package/dist/cache/MemoryStorage.mjs.map +1 -0
  32. package/dist/cache/TokenCache.d.ts.map +1 -1
  33. package/dist/cache/{TokenCache.js → TokenCache.mjs} +22 -20
  34. package/dist/cache/TokenCache.mjs.map +1 -0
  35. package/dist/config/Configuration.d.ts +10 -2
  36. package/dist/config/Configuration.d.ts.map +1 -1
  37. package/dist/config/{Configuration.js → Configuration.mjs} +41 -8
  38. package/dist/config/Configuration.mjs.map +1 -0
  39. package/dist/controllers/{ControllerFactory.js → ControllerFactory.mjs} +7 -7
  40. package/dist/controllers/ControllerFactory.mjs.map +1 -0
  41. package/dist/controllers/IController.d.ts +1 -0
  42. package/dist/controllers/IController.d.ts.map +1 -1
  43. package/dist/controllers/StandardController.d.ts +7 -0
  44. package/dist/controllers/StandardController.d.ts.map +1 -1
  45. package/dist/controllers/{StandardController.js → StandardController.mjs} +77 -60
  46. package/dist/controllers/StandardController.mjs.map +1 -0
  47. package/dist/crypto/{BrowserCrypto.js → BrowserCrypto.mjs} +5 -5
  48. package/dist/crypto/BrowserCrypto.mjs.map +1 -0
  49. package/dist/crypto/CryptoOps.d.ts.map +1 -1
  50. package/dist/crypto/{CryptoOps.js → CryptoOps.mjs} +12 -12
  51. package/dist/crypto/CryptoOps.mjs.map +1 -0
  52. package/dist/crypto/{GuidGenerator.js → GuidGenerator.mjs} +3 -3
  53. package/dist/crypto/GuidGenerator.mjs.map +1 -0
  54. package/dist/crypto/{ModernBrowserCrypto.js → ModernBrowserCrypto.mjs} +3 -3
  55. package/dist/crypto/ModernBrowserCrypto.mjs.map +1 -0
  56. package/dist/crypto/{PkceGenerator.js → PkceGenerator.mjs} +4 -4
  57. package/dist/crypto/PkceGenerator.mjs.map +1 -0
  58. package/dist/crypto/{SignedHttpRequest.js → SignedHttpRequest.mjs} +4 -4
  59. package/dist/crypto/SignedHttpRequest.mjs.map +1 -0
  60. package/dist/encode/{Base64Decode.js → Base64Decode.mjs} +3 -3
  61. package/dist/encode/Base64Decode.mjs.map +1 -0
  62. package/dist/encode/{Base64Encode.js → Base64Encode.mjs} +3 -3
  63. package/dist/encode/Base64Encode.mjs.map +1 -0
  64. package/dist/error/BrowserAuthError.d.ts +2 -2
  65. package/dist/error/BrowserAuthError.d.ts.map +1 -1
  66. package/dist/error/{BrowserAuthError.js → BrowserAuthError.mjs} +7 -7
  67. package/dist/error/BrowserAuthError.mjs.map +1 -0
  68. package/dist/error/{BrowserConfigurationAuthError.js → BrowserConfigurationAuthError.mjs} +2 -2
  69. package/dist/error/BrowserConfigurationAuthError.mjs.map +1 -0
  70. package/dist/error/NativeAuthError.d.ts +1 -1
  71. package/dist/error/NativeAuthError.d.ts.map +1 -1
  72. package/dist/error/{NativeAuthError.js → NativeAuthError.mjs} +3 -3
  73. package/dist/error/NativeAuthError.mjs.map +1 -0
  74. package/dist/event/{EventHandler.js → EventHandler.mjs} +3 -3
  75. package/dist/event/EventHandler.mjs.map +1 -0
  76. package/dist/event/EventMessage.d.ts.map +1 -1
  77. package/dist/event/{EventMessage.js → EventMessage.mjs} +4 -4
  78. package/dist/event/EventMessage.mjs.map +1 -0
  79. package/dist/event/EventType.d.ts +1 -1
  80. package/dist/event/EventType.d.ts.map +1 -1
  81. package/dist/event/{EventType.js → EventType.mjs} +3 -3
  82. package/dist/event/EventType.mjs.map +1 -0
  83. package/dist/index.d.ts +3 -1
  84. package/dist/index.d.ts.map +1 -1
  85. package/dist/{index.js → index.mjs} +18 -16
  86. package/dist/index.mjs.map +1 -0
  87. package/dist/interaction_client/BaseInteractionClient.d.ts.map +1 -1
  88. package/dist/interaction_client/{BaseInteractionClient.js → BaseInteractionClient.mjs} +6 -5
  89. package/dist/interaction_client/BaseInteractionClient.mjs.map +1 -0
  90. package/dist/interaction_client/{HybridSpaAuthorizationCodeClient.js → HybridSpaAuthorizationCodeClient.mjs} +2 -2
  91. package/dist/interaction_client/HybridSpaAuthorizationCodeClient.mjs.map +1 -0
  92. package/dist/interaction_client/NativeInteractionClient.d.ts +7 -10
  93. package/dist/interaction_client/NativeInteractionClient.d.ts.map +1 -1
  94. package/dist/interaction_client/{NativeInteractionClient.js → NativeInteractionClient.mjs} +58 -33
  95. package/dist/interaction_client/NativeInteractionClient.mjs.map +1 -0
  96. package/dist/interaction_client/PopupClient.d.ts +4 -0
  97. package/dist/interaction_client/PopupClient.d.ts.map +1 -1
  98. package/dist/interaction_client/{PopupClient.js → PopupClient.mjs} +57 -18
  99. package/dist/interaction_client/PopupClient.mjs.map +1 -0
  100. package/dist/interaction_client/RedirectClient.d.ts.map +1 -1
  101. package/dist/interaction_client/{RedirectClient.js → RedirectClient.mjs} +23 -11
  102. package/dist/interaction_client/RedirectClient.mjs.map +1 -0
  103. package/dist/interaction_client/{SilentAuthCodeClient.js → SilentAuthCodeClient.mjs} +7 -7
  104. package/dist/interaction_client/SilentAuthCodeClient.mjs.map +1 -0
  105. package/dist/interaction_client/{SilentCacheClient.js → SilentCacheClient.mjs} +9 -9
  106. package/dist/interaction_client/SilentCacheClient.mjs.map +1 -0
  107. package/dist/interaction_client/{SilentIframeClient.js → SilentIframeClient.mjs} +11 -11
  108. package/dist/interaction_client/SilentIframeClient.mjs.map +1 -0
  109. package/dist/interaction_client/{SilentRefreshClient.js → SilentRefreshClient.mjs} +8 -8
  110. package/dist/interaction_client/SilentRefreshClient.mjs.map +1 -0
  111. package/dist/interaction_client/StandardInteractionClient.d.ts.map +1 -1
  112. package/dist/interaction_client/{StandardInteractionClient.js → StandardInteractionClient.mjs} +14 -12
  113. package/dist/interaction_client/StandardInteractionClient.mjs.map +1 -0
  114. package/dist/interaction_handler/{InteractionHandler.js → InteractionHandler.mjs} +5 -5
  115. package/dist/interaction_handler/InteractionHandler.mjs.map +1 -0
  116. package/dist/interaction_handler/{RedirectHandler.js → RedirectHandler.mjs} +6 -6
  117. package/dist/interaction_handler/RedirectHandler.mjs.map +1 -0
  118. package/dist/interaction_handler/{SilentHandler.js → SilentHandler.mjs} +5 -5
  119. package/dist/interaction_handler/SilentHandler.mjs.map +1 -0
  120. package/dist/internals.d.ts +1 -3
  121. package/dist/internals.d.ts.map +1 -1
  122. package/dist/internals.mjs +28 -0
  123. package/dist/internals.mjs.map +1 -0
  124. package/dist/navigation/{NavigationClient.js → NavigationClient.mjs} +2 -2
  125. package/dist/navigation/NavigationClient.mjs.map +1 -0
  126. package/dist/network/{FetchClient.js → FetchClient.mjs} +4 -4
  127. package/dist/network/FetchClient.mjs.map +1 -0
  128. package/dist/network/{XhrClient.js → XhrClient.mjs} +4 -4
  129. package/dist/network/XhrClient.mjs.map +1 -0
  130. package/dist/operatingcontext/{BaseOperatingContext.js → BaseOperatingContext.mjs} +4 -4
  131. package/dist/operatingcontext/BaseOperatingContext.mjs.map +1 -0
  132. package/dist/operatingcontext/{StandardOperatingContext.js → StandardOperatingContext.mjs} +3 -3
  133. package/dist/operatingcontext/StandardOperatingContext.mjs.map +1 -0
  134. package/dist/operatingcontext/{TeamsAppOperatingContext.js → TeamsAppOperatingContext.mjs} +3 -3
  135. package/dist/operatingcontext/TeamsAppOperatingContext.mjs.map +1 -0
  136. package/dist/packageMetadata.d.ts +1 -1
  137. package/dist/packageMetadata.d.ts.map +1 -1
  138. package/dist/packageMetadata.mjs +8 -0
  139. package/dist/packageMetadata.mjs.map +1 -0
  140. package/dist/request/PopupRequest.d.ts +3 -1
  141. package/dist/request/PopupRequest.d.ts.map +1 -1
  142. package/dist/request/RedirectRequest.d.ts +3 -1
  143. package/dist/request/RedirectRequest.d.ts.map +1 -1
  144. package/dist/request/SilentRequest.d.ts +2 -0
  145. package/dist/request/SilentRequest.d.ts.map +1 -1
  146. package/dist/request/SsoSilentRequest.d.ts +5 -2
  147. package/dist/request/SsoSilentRequest.d.ts.map +1 -1
  148. package/dist/response/AuthenticationResult.d.ts.map +1 -1
  149. package/dist/telemetry/BrowserPerformanceClient.d.ts +3 -2
  150. package/dist/telemetry/BrowserPerformanceClient.d.ts.map +1 -1
  151. package/dist/telemetry/{BrowserPerformanceClient.js → BrowserPerformanceClient.mjs} +16 -12
  152. package/dist/telemetry/BrowserPerformanceClient.mjs.map +1 -0
  153. package/dist/telemetry/{BrowserPerformanceMeasurement.js → BrowserPerformanceMeasurement.mjs} +2 -2
  154. package/dist/telemetry/BrowserPerformanceMeasurement.mjs.map +1 -0
  155. package/dist/utils/BrowserConstants.d.ts +10 -10
  156. package/dist/utils/BrowserConstants.d.ts.map +1 -1
  157. package/dist/utils/{BrowserConstants.js → BrowserConstants.mjs} +2 -2
  158. package/dist/utils/BrowserConstants.mjs.map +1 -0
  159. package/dist/utils/{BrowserProtocolUtils.js → BrowserProtocolUtils.mjs} +2 -2
  160. package/dist/utils/BrowserProtocolUtils.mjs.map +1 -0
  161. package/dist/utils/{BrowserStringUtils.js → BrowserStringUtils.mjs} +2 -2
  162. package/dist/utils/BrowserStringUtils.mjs.map +1 -0
  163. package/dist/utils/BrowserUtils.d.ts +2 -3
  164. package/dist/utils/BrowserUtils.d.ts.map +1 -1
  165. package/dist/utils/{BrowserUtils.js → BrowserUtils.mjs} +10 -11
  166. package/dist/utils/BrowserUtils.mjs.map +1 -0
  167. package/dist/utils/{MathUtils.js → MathUtils.mjs} +2 -2
  168. package/dist/utils/MathUtils.mjs.map +1 -0
  169. package/lib/{msal-browser.cjs.js → msal-browser.cjs} +989 -672
  170. package/lib/msal-browser.cjs.map +1 -0
  171. package/lib/msal-browser.js +988 -671
  172. package/lib/msal-browser.js.map +1 -1
  173. package/lib/msal-browser.min.js +62 -62
  174. package/package.json +19 -15
  175. package/dist/app/IPublicClientApplication.js.map +0 -1
  176. package/dist/app/PublicClientApplication.js.map +0 -1
  177. package/dist/broker/nativeBroker/NativeMessageHandler.js.map +0 -1
  178. package/dist/cache/AsyncMemoryStorage.js.map +0 -1
  179. package/dist/cache/BrowserCacheManager.js.map +0 -1
  180. package/dist/cache/BrowserStorage.js.map +0 -1
  181. package/dist/cache/CryptoKeyStore.js.map +0 -1
  182. package/dist/cache/DatabaseStorage.js.map +0 -1
  183. package/dist/cache/MemoryStorage.js.map +0 -1
  184. package/dist/cache/TokenCache.js.map +0 -1
  185. package/dist/cache/entities/CacheRecord.d.ts +0 -6
  186. package/dist/cache/entities/CacheRecord.d.ts.map +0 -1
  187. package/dist/cache/entities/CacheRecord.js +0 -17
  188. package/dist/cache/entities/CacheRecord.js.map +0 -1
  189. package/dist/config/Configuration.js.map +0 -1
  190. package/dist/controllers/ControllerFactory.js.map +0 -1
  191. package/dist/controllers/StandardController.js.map +0 -1
  192. package/dist/crypto/BrowserCrypto.js.map +0 -1
  193. package/dist/crypto/CryptoOps.js.map +0 -1
  194. package/dist/crypto/GuidGenerator.js.map +0 -1
  195. package/dist/crypto/ModernBrowserCrypto.js.map +0 -1
  196. package/dist/crypto/PkceGenerator.js.map +0 -1
  197. package/dist/crypto/SignedHttpRequest.js.map +0 -1
  198. package/dist/encode/Base64Decode.js.map +0 -1
  199. package/dist/encode/Base64Encode.js.map +0 -1
  200. package/dist/error/BrowserAuthError.js.map +0 -1
  201. package/dist/error/BrowserConfigurationAuthError.js.map +0 -1
  202. package/dist/error/NativeAuthError.js.map +0 -1
  203. package/dist/event/EventHandler.js.map +0 -1
  204. package/dist/event/EventMessage.js.map +0 -1
  205. package/dist/event/EventType.js.map +0 -1
  206. package/dist/index.js.map +0 -1
  207. package/dist/interaction_client/BaseInteractionClient.js.map +0 -1
  208. package/dist/interaction_client/HybridSpaAuthorizationCodeClient.js.map +0 -1
  209. package/dist/interaction_client/NativeInteractionClient.js.map +0 -1
  210. package/dist/interaction_client/PopupClient.js.map +0 -1
  211. package/dist/interaction_client/RedirectClient.js.map +0 -1
  212. package/dist/interaction_client/SilentAuthCodeClient.js.map +0 -1
  213. package/dist/interaction_client/SilentCacheClient.js.map +0 -1
  214. package/dist/interaction_client/SilentIframeClient.js.map +0 -1
  215. package/dist/interaction_client/SilentRefreshClient.js.map +0 -1
  216. package/dist/interaction_client/StandardInteractionClient.js.map +0 -1
  217. package/dist/interaction_handler/InteractionHandler.js.map +0 -1
  218. package/dist/interaction_handler/RedirectHandler.js.map +0 -1
  219. package/dist/interaction_handler/SilentHandler.js.map +0 -1
  220. package/dist/internals.js +0 -25
  221. package/dist/internals.js.map +0 -1
  222. package/dist/navigation/NavigationClient.js.map +0 -1
  223. package/dist/network/FetchClient.js.map +0 -1
  224. package/dist/network/XhrClient.js.map +0 -1
  225. package/dist/operatingcontext/BaseOperatingContext.js.map +0 -1
  226. package/dist/operatingcontext/StandardOperatingContext.js.map +0 -1
  227. package/dist/operatingcontext/TeamsAppOperatingContext.js.map +0 -1
  228. package/dist/packageMetadata.js +0 -8
  229. package/dist/packageMetadata.js.map +0 -1
  230. package/dist/telemetry/BrowserPerformanceClient.js.map +0 -1
  231. package/dist/telemetry/BrowserPerformanceMeasurement.js.map +0 -1
  232. package/dist/utils/BrowserConstants.js.map +0 -1
  233. package/dist/utils/BrowserProtocolUtils.js.map +0 -1
  234. package/dist/utils/BrowserStringUtils.js.map +0 -1
  235. package/dist/utils/BrowserUtils.js.map +0 -1
  236. package/dist/utils/MathUtils.js.map +0 -1
  237. package/lib/msal-browser.cjs.js.map +0 -1
@@ -1,17 +1,20 @@
1
- /*! @azure/msal-browser v3.0.0-beta.1 2023-07-06 */
1
+ /*! @azure/msal-browser v3.0.1 2023-08-11 */
2
2
  'use strict';
3
- import { PerformanceEvents, TimeUtils, ScopeSet, ClientAuthError, AuthToken, Constants, AccountEntity, AuthorityType, AuthenticationScheme, PopTokenGenerator, IdTokenEntity, AccessTokenEntity, UrlString, OIDC_DEFAULT_SCOPES, PromptValue } from '@azure/msal-common';
4
- import { BaseInteractionClient } from './BaseInteractionClient.js';
5
- import { TemporaryCacheKeys, NativeConstants, NativeExtensionMethod, ApiId } from '../utils/BrowserConstants.js';
6
- import { NativeAuthError } from '../error/NativeAuthError.js';
7
- import { BrowserAuthError } from '../error/BrowserAuthError.js';
8
- import { SilentCacheClient } from './SilentCacheClient.js';
9
- import { CacheRecord } from '../cache/entities/CacheRecord.js';
3
+ import { PerformanceEvents, TimeUtils, ScopeSet, ClientAuthError, AccountEntity, AuthToken, Constants, AuthorityType, AuthenticationScheme, PopTokenGenerator, IdTokenEntity, AccessTokenEntity, CacheRecord, UrlString, OIDC_DEFAULT_SCOPES, AADServerParamKeys, PromptValue } from '@azure/msal-common';
4
+ import { BaseInteractionClient } from './BaseInteractionClient.mjs';
5
+ import { TemporaryCacheKeys, NativeConstants, NativeExtensionMethod, ApiId } from '../utils/BrowserConstants.mjs';
6
+ import { NativeAuthError } from '../error/NativeAuthError.mjs';
7
+ import { BrowserAuthError } from '../error/BrowserAuthError.mjs';
8
+ import { SilentCacheClient } from './SilentCacheClient.mjs';
10
9
 
11
10
  /*
12
11
  * Copyright (c) Microsoft Corporation. All rights reserved.
13
12
  * Licensed under the MIT License.
14
13
  */
14
+ const BrokerServerParamKeys = {
15
+ BROKER_CLIENT_ID: "brk_client_id",
16
+ BROKER_REDIRECT_URI: "brk_redirect_uri",
17
+ };
15
18
  class NativeInteractionClient extends BaseInteractionClient {
16
19
  constructor(config, browserStorage, browserCrypto, logger, eventHandler, navigationClient, apiId, performanceClient, provider, accountId, nativeStorageImpl, correlationId) {
17
20
  super(config, browserStorage, browserCrypto, logger, eventHandler, navigationClient, performanceClient, provider, correlationId);
@@ -35,7 +38,7 @@ class NativeInteractionClient extends BaseInteractionClient {
35
38
  // check if the tokens can be retrieved from internal cache
36
39
  try {
37
40
  const result = await this.acquireTokensFromCache(this.accountId, nativeRequest);
38
- nativeATMeasurement.endMeasurement({
41
+ nativeATMeasurement.end({
39
42
  success: true,
40
43
  isNativeBroker: false,
41
44
  fromCache: true,
@@ -55,7 +58,7 @@ class NativeInteractionClient extends BaseInteractionClient {
55
58
  const validatedResponse = this.validateNativeResponse(response);
56
59
  return this.handleNativeResponse(validatedResponse, nativeRequest, reqTimestamp)
57
60
  .then((result) => {
58
- nativeATMeasurement.endMeasurement({
61
+ nativeATMeasurement.end({
59
62
  success: true,
60
63
  isNativeBroker: true,
61
64
  requestId: result.requestId,
@@ -63,7 +66,7 @@ class NativeInteractionClient extends BaseInteractionClient {
63
66
  return result;
64
67
  })
65
68
  .catch((error) => {
66
- nativeATMeasurement.endMeasurement({
69
+ nativeATMeasurement.end({
67
70
  success: false,
68
71
  errorCode: error.errorCode,
69
72
  subErrorCode: error.subError,
@@ -109,7 +112,10 @@ class NativeInteractionClient extends BaseInteractionClient {
109
112
  try {
110
113
  const silentRequest = this.createSilentCacheRequest(request, account);
111
114
  const result = await this.silentCacheClient.acquireToken(silentRequest);
112
- return result;
115
+ return {
116
+ ...result,
117
+ account,
118
+ };
113
119
  }
114
120
  catch (e) {
115
121
  throw e;
@@ -207,16 +213,20 @@ class NativeInteractionClient extends BaseInteractionClient {
207
213
  }
208
214
  // Get the preferred_cache domain for the given authority
209
215
  const authority = await this.getDiscoveredAuthority(request.authority);
210
- const authorityPreferredCache = authority.getPreferredCache();
211
216
  // generate identifiers
212
217
  const idTokenObj = this.createIdTokenObj(response);
213
218
  const homeAccountIdentifier = this.createHomeAccountIdentifier(response, idTokenObj);
214
- const accountEntity = this.createAccountEntity(response, homeAccountIdentifier, idTokenObj, authorityPreferredCache);
219
+ const accountEntity = AccountEntity.createAccount({
220
+ homeAccountId: homeAccountIdentifier,
221
+ idTokenClaims: idTokenObj.claims,
222
+ clientInfo: response.client_info,
223
+ nativeAccountId: response.account.id,
224
+ }, authority);
215
225
  // generate authenticationResult
216
226
  const result = await this.generateAuthenticationResult(response, request, idTokenObj, accountEntity, authority.canonicalAuthority, reqTimestamp);
217
227
  // cache accounts and tokens in the appropriate storage
218
228
  this.cacheAccount(accountEntity);
219
- this.cacheNativeTokens(response, request, homeAccountIdentifier, accountEntity, idTokenObj, result.accessToken, result.tenantId, reqTimestamp);
229
+ this.cacheNativeTokens(response, request, homeAccountIdentifier, idTokenObj, result.accessToken, result.tenantId, reqTimestamp);
220
230
  return result;
221
231
  }
222
232
  /**
@@ -235,20 +245,9 @@ class NativeInteractionClient extends BaseInteractionClient {
235
245
  */
236
246
  createHomeAccountIdentifier(response, idTokenObj) {
237
247
  // Save account in browser storage
238
- const homeAccountIdentifier = AccountEntity.generateHomeAccountId(response.client_info || Constants.EMPTY_STRING, AuthorityType.Default, this.logger, this.browserCrypto, idTokenObj);
248
+ const homeAccountIdentifier = AccountEntity.generateHomeAccountId(response.client_info || Constants.EMPTY_STRING, AuthorityType.Default, this.logger, this.browserCrypto, idTokenObj.claims);
239
249
  return homeAccountIdentifier;
240
250
  }
241
- /**
242
- * Creates account entity
243
- * @param response
244
- * @param homeAccountIdentifier
245
- * @param idTokenObj
246
- * @param authority
247
- * @returns
248
- */
249
- createAccountEntity(response, homeAccountIdentifier, idTokenObj, authority) {
250
- return AccountEntity.createAccount(response.client_info, homeAccountIdentifier, idTokenObj, undefined, undefined, undefined, authority, response.account.id);
251
- }
252
251
  /**
253
252
  * Helper to generate scopes
254
253
  * @param response
@@ -367,7 +366,7 @@ class NativeInteractionClient extends BaseInteractionClient {
367
366
  * @param tenantId
368
367
  * @param reqTimestamp
369
368
  */
370
- cacheNativeTokens(response, request, homeAccountIdentifier, accountEntity, idTokenObj, responseAccessToken, tenantId, reqTimestamp) {
369
+ cacheNativeTokens(response, request, homeAccountIdentifier, idTokenObj, responseAccessToken, tenantId, reqTimestamp) {
371
370
  const cachedIdToken = IdTokenEntity.createIdTokenEntity(homeAccountIdentifier, request.authority, response.id_token || Constants.EMPTY_STRING, request.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
372
371
  // cache accessToken in inmemory storage
373
372
  const expiresIn = request.tokenType === AuthenticationScheme.POP
@@ -380,15 +379,15 @@ class NativeInteractionClient extends BaseInteractionClient {
380
379
  const cachedAccessToken = AccessTokenEntity.createAccessTokenEntity(homeAccountIdentifier, request.authority, responseAccessToken, request.clientId, idTokenObj
381
380
  ? idTokenObj.claims.tid || Constants.EMPTY_STRING
382
381
  : tenantId, responseScopes.printScopes(), tokenExpirationSeconds, 0, this.browserCrypto);
383
- const nativeCacheRecord = new CacheRecord(accountEntity, cachedIdToken, cachedAccessToken);
384
- this.nativeStorageManager.saveCacheRecord(nativeCacheRecord);
382
+ const nativeCacheRecord = new CacheRecord(undefined, cachedIdToken, cachedAccessToken);
383
+ this.nativeStorageManager.saveCacheRecord(nativeCacheRecord, request.storeInCache);
385
384
  }
386
385
  addTelemetryFromNativeResponse(response) {
387
386
  const mats = this.getMATSFromResponse(response);
388
387
  if (!mats) {
389
388
  return null;
390
389
  }
391
- this.performanceClient.addStaticFields({
390
+ this.performanceClient.addFields({
392
391
  extensionId: this.nativeMessageHandler.getExtensionId(),
393
392
  extensionVersion: this.nativeMessageHandler.getExtensionVersion(),
394
393
  matsBrokerVersion: mats.broker_version,
@@ -507,10 +506,14 @@ class NativeInteractionClient extends BaseInteractionClient {
507
506
  extraParameters: {
508
507
  ...request.extraQueryParameters,
509
508
  ...request.tokenQueryParameters,
510
- telemetry: NativeConstants.MATS_TELEMETRY,
511
509
  },
512
510
  extendedExpiryToken: false, // Make this configurable?
513
511
  };
512
+ this.handleExtraBrokerParams(validatedRequest);
513
+ validatedRequest.extraParameters =
514
+ validatedRequest.extraParameters || {};
515
+ validatedRequest.extraParameters.telemetry =
516
+ NativeConstants.MATS_TELEMETRY;
514
517
  if (request.authenticationScheme === AuthenticationScheme.POP) {
515
518
  // add POP request type
516
519
  const shrParameters = {
@@ -527,7 +530,29 @@ class NativeInteractionClient extends BaseInteractionClient {
527
530
  }
528
531
  return validatedRequest;
529
532
  }
533
+ /**
534
+ * Handles extra broker request parameters
535
+ * @param request {NativeTokenRequest}
536
+ * @private
537
+ */
538
+ handleExtraBrokerParams(request) {
539
+ if (!request.extraParameters) {
540
+ return;
541
+ }
542
+ if (request.extraParameters.hasOwnProperty(BrokerServerParamKeys.BROKER_CLIENT_ID) &&
543
+ request.extraParameters.hasOwnProperty(BrokerServerParamKeys.BROKER_REDIRECT_URI) &&
544
+ request.extraParameters.hasOwnProperty(AADServerParamKeys.CLIENT_ID)) {
545
+ const child_client_id = request.extraParameters[AADServerParamKeys.CLIENT_ID];
546
+ const child_redirect_uri = request.redirectUri;
547
+ const brk_redirect_uri = request.extraParameters[BrokerServerParamKeys.BROKER_REDIRECT_URI];
548
+ request.extraParameters = {
549
+ child_client_id,
550
+ child_redirect_uri,
551
+ };
552
+ request.redirectUri = brk_redirect_uri;
553
+ }
554
+ }
530
555
  }
531
556
 
532
557
  export { NativeInteractionClient };
533
- //# sourceMappingURL=NativeInteractionClient.js.map
558
+ //# sourceMappingURL=NativeInteractionClient.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"NativeInteractionClient.mjs","sources":["../../src/interaction_client/NativeInteractionClient.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -109,5 +109,9 @@ export declare class PopupClient extends StandardInteractionClient {
109
109
  * @param request
110
110
  */
111
111
  generateLogoutPopupName(request: CommonEndSessionRequest): string;
112
+ /**
113
+ * Extracts the server response from the popup window
114
+ */
115
+ extractServerResponseStringFromPopup(popupWindow: Window, href: string): string;
112
116
  }
113
117
  //# sourceMappingURL=PopupClient.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"PopupClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/PopupClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PopupClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/PopupClient.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,14 @@
1
- /*! @azure/msal-browser v3.0.0-beta.1 2023-07-06 */
1
+ /*! @azure/msal-browser v3.0.1 2023-08-11 */
2
2
  'use strict';
3
- import { OIDC_DEFAULT_SCOPES, PerformanceEvents, Constants, UrlString, ThrottlingUtils, ProtocolUtils, AuthError, StringUtils } from '@azure/msal-common';
4
- import { StandardInteractionClient } from './StandardInteractionClient.js';
5
- import { EventType } from '../event/EventType.js';
6
- import { ApiId, InteractionType, BrowserConstants } from '../utils/BrowserConstants.js';
7
- import { BrowserUtils } from '../utils/BrowserUtils.js';
8
- import { NativeInteractionClient } from './NativeInteractionClient.js';
9
- import { NativeMessageHandler } from '../broker/nativeBroker/NativeMessageHandler.js';
10
- import { BrowserAuthError } from '../error/BrowserAuthError.js';
11
- import { InteractionHandler } from '../interaction_handler/InteractionHandler.js';
3
+ import { OIDC_DEFAULT_SCOPES, PerformanceEvents, Constants, UrlString, ThrottlingUtils, ProtocolUtils, AuthError, ProtocolMode, StringUtils, ServerResponseType } from '@azure/msal-common';
4
+ import { StandardInteractionClient } from './StandardInteractionClient.mjs';
5
+ import { EventType } from '../event/EventType.mjs';
6
+ import { ApiId, InteractionType, BrowserConstants } from '../utils/BrowserConstants.mjs';
7
+ import { BrowserUtils } from '../utils/BrowserUtils.mjs';
8
+ import { NativeInteractionClient } from './NativeInteractionClient.mjs';
9
+ import { NativeMessageHandler } from '../broker/nativeBroker/NativeMessageHandler.mjs';
10
+ import { BrowserAuthError } from '../error/BrowserAuthError.mjs';
11
+ import { InteractionHandler } from '../interaction_handler/InteractionHandler.mjs';
12
12
 
13
13
  /*
14
14
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -132,7 +132,7 @@ class PopupClient extends StandardInteractionClient {
132
132
  this.logger.verbose("Account id found in hash, calling WAM for token");
133
133
  // end measurement for server call with native brokering enabled
134
134
  if (fetchNativeAccountIdMeasurement) {
135
- fetchNativeAccountIdMeasurement.endMeasurement({
135
+ fetchNativeAccountIdMeasurement.end({
136
136
  success: true,
137
137
  isNativeBroker: true,
138
138
  });
@@ -189,6 +189,30 @@ class PopupClient extends StandardInteractionClient {
189
189
  this.performanceClient.setPreQueueTime(PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, validRequest.correlationId);
190
190
  const authClient = await this.createAuthCodeClient(serverTelemetryManager, requestAuthority);
191
191
  this.logger.verbose("Auth code client created");
192
+ try {
193
+ authClient.authority.endSessionEndpoint;
194
+ }
195
+ catch {
196
+ if (validRequest.account?.homeAccountId &&
197
+ validRequest.postLogoutRedirectUri &&
198
+ authClient.authority.protocolMode === ProtocolMode.OIDC) {
199
+ this.browserStorage.removeAccount(validRequest.account?.homeAccountId);
200
+ this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, InteractionType.Popup, validRequest);
201
+ if (mainWindowRedirectUri) {
202
+ const navigationOptions = {
203
+ apiId: ApiId.logoutPopup,
204
+ timeout: this.config.system.redirectNavigationTimeout,
205
+ noHistory: false,
206
+ };
207
+ const absoluteUrl = UrlString.getAbsoluteUrl(mainWindowRedirectUri, BrowserUtils.getCurrentUri());
208
+ await this.navigationClient.navigateInternal(absoluteUrl, navigationOptions);
209
+ }
210
+ if (popup) {
211
+ popup.close();
212
+ }
213
+ return;
214
+ }
215
+ }
192
216
  // Create logout string and navigate user window to logout.
193
217
  const logoutUri = authClient.getLogoutUri(validRequest);
194
218
  this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, InteractionType.Popup, validRequest);
@@ -273,7 +297,7 @@ class PopupClient extends StandardInteractionClient {
273
297
  return;
274
298
  }
275
299
  let href = Constants.EMPTY_STRING;
276
- let hash = Constants.EMPTY_STRING;
300
+ let serverResponseString = Constants.EMPTY_STRING;
277
301
  try {
278
302
  /*
279
303
  * Will throw if cross origin,
@@ -281,7 +305,8 @@ class PopupClient extends StandardInteractionClient {
281
305
  * since we need the interval to keep running while on STS UI.
282
306
  */
283
307
  href = popupWindow.location.href;
284
- hash = popupWindow.location.hash;
308
+ serverResponseString =
309
+ this.extractServerResponseStringFromPopup(popupWindow, href);
285
310
  }
286
311
  catch (e) { }
287
312
  // Don't process blank pages or cross domain
@@ -294,17 +319,17 @@ class PopupClient extends StandardInteractionClient {
294
319
  * as popup operations can take a long time.
295
320
  */
296
321
  ticks++;
297
- if (hash) {
322
+ if (serverResponseString) {
298
323
  this.logger.verbose("PopupHandler.monitorPopupForHash - found hash in url");
299
324
  clearInterval(intervalId);
300
325
  this.cleanPopup(popupWindow);
301
- if (UrlString.hashContainsKnownProperties(hash)) {
326
+ if (UrlString.hashContainsKnownProperties(serverResponseString)) {
302
327
  this.logger.verbose("PopupHandler.monitorPopupForHash - hash contains known properties, returning.");
303
- resolve(hash);
328
+ resolve(serverResponseString);
304
329
  }
305
330
  else {
306
331
  this.logger.error("PopupHandler.monitorPopupForHash - found hash in url but it does not contain known properties. Check that your router is not changing the hash prematurely.");
307
- this.logger.errorPii(`PopupHandler.monitorPopupForHash - hash found: ${hash}`);
332
+ this.logger.errorPii(`PopupHandler.monitorPopupForHash - hash found: ${serverResponseString}`);
308
333
  reject(BrowserAuthError.createHashDoesNotContainKnownPropertiesError());
309
334
  }
310
335
  }
@@ -485,7 +510,21 @@ class PopupClient extends StandardInteractionClient {
485
510
  const homeAccountId = request.account && request.account.homeAccountId;
486
511
  return `${BrowserConstants.POPUP_NAME_PREFIX}.${this.config.auth.clientId}.${homeAccountId}.${this.correlationId}`;
487
512
  }
513
+ /**
514
+ * Extracts the server response from the popup window
515
+ */
516
+ extractServerResponseStringFromPopup(popupWindow, href) {
517
+ let serverResponseString;
518
+ if (this.config.auth.OIDCOptions?.serverResponseType ===
519
+ ServerResponseType.QUERY) {
520
+ serverResponseString = UrlString.parseQueryServerResponse(href);
521
+ }
522
+ else {
523
+ serverResponseString = popupWindow.location.hash;
524
+ }
525
+ return serverResponseString;
526
+ }
488
527
  }
489
528
 
490
529
  export { PopupClient };
491
- //# sourceMappingURL=PopupClient.js.map
530
+ //# sourceMappingURL=PopupClient.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"PopupClient.mjs","sources":["../../src/interaction_client/PopupClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;AAGG;AAqDG,MAAO,WAAY,SAAQ,yBAAyB,CAAA;AAItD,IAAA,WAAA,CACI,MAA4B,EAC5B,WAAgC,EAChC,aAAsB,EACtB,MAAc,EACd,YAA0B,EAC1B,gBAAmC,EACnC,iBAAqC,EACrC,iBAAsC,EACtC,oBAA2C,EAC3C,aAAsB,EAAA;AAEtB,QAAA,KAAK,CACD,MAAM,EACN,WAAW,EACX,aAAa,EACb,MAAM,EACN,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,EACpB,aAAa,CAChB,CAAC;;QAEF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjD,QAAA,IAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC;KAC1C;AAED;;;AAGG;AACH,IAAA,YAAY,CAAC,OAAqB,EAAA;QAC9B,IAAI;YACA,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CACpC,OAAO,CAAC,MAAM,IAAI,mBAAmB,EACrC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAClD,CAAC;AACF,YAAA,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,IAAI,EAAE,CAAC;;AAGlE,YAAA,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;AAChC,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAC;;gBAEhE,OAAO,IAAI,CAAC,sBAAsB,CAC9B,OAAO,EACP,SAAS,EACT,qBAAqB,CACxB,CAAC;AACL,aAAA;AAAM,iBAAA;;AAEH,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,+DAA+D,CAClE,CAAC;AACF,gBAAA,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAC7B,aAAa,EACb,SAAS,EACT,qBAAqB,CACxB,CAAC;AACF,gBAAA,OAAO,IAAI,CAAC,sBAAsB,CAC9B,OAAO,EACP,SAAS,EACT,qBAAqB,EACrB,KAAK,CACR,CAAC;AACL,aAAA;AACJ,SAAA;AAAC,QAAA,OAAO,CAAC,EAAE;AACR,YAAA,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC5B,SAAA;KACJ;AAED;;;AAGG;AACH,IAAA,MAAM,CAAC,aAAsC,EAAA;QACzC,IAAI;AACA,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAC1C,MAAM,kBAAkB,GACpB,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;YAEhD,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;AACnE,YAAA,MAAM,SAAS,GAAG,aAAa,IAAI,aAAa,CAAC,SAAS,CAAC;AAC3D,YAAA,MAAM,qBAAqB,GACvB,aAAa,IAAI,aAAa,CAAC,qBAAqB,CAAC;AACzD,YAAA,MAAM,qBAAqB,GACvB,aAAa,EAAE,qBAAqB,IAAI,EAAE,CAAC;;AAG/C,YAAA,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE;AAChC,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;;AAE/C,gBAAA,OAAO,IAAI,CAAC,gBAAgB,CACxB,kBAAkB,EAClB,SAAS,EACT,qBAAqB,EACrB,SAAS,EACT,SAAS,EACT,qBAAqB,CACxB,CAAC;AACL,aAAA;AAAM,iBAAA;;AAEH,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC;AAC9D,gBAAA,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAC7B,aAAa,EACb,SAAS,EACT,qBAAqB,CACxB,CAAC;AACF,gBAAA,OAAO,IAAI,CAAC,gBAAgB,CACxB,kBAAkB,EAClB,SAAS,EACT,qBAAqB,EACrB,SAAS,EACT,KAAK,EACL,qBAAqB,CACxB,CAAC;AACL,aAAA;AACJ,SAAA;AAAC,QAAA,OAAO,CAAC,EAAE;;AAER,YAAA,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC5B,SAAA;KACJ;AAED;;;;;;;;AAQG;IACO,MAAM,sBAAsB,CAClC,OAAqB,EACrB,SAAiB,EACjB,qBAA4C,EAC5C,KAAqB,EAAA;AAErB,QAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;QACrD,MAAM,sBAAsB,GAAG,IAAI,CAAC,gCAAgC,CAChE,KAAK,CAAC,iBAAiB,CAC1B,CAAC;AAEF,QAAA,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAClC,iBAAiB,CAAC,uDAAuD,EACzE,OAAO,CAAC,aAAa,CACxB,CAAC;AACF,QAAA,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAC1D,OAAO,EACP,eAAe,CAAC,KAAK,CACxB,CAAC;AACF,QAAA,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAClC,YAAY,CAAC,KAAK,EAClB,YAAY,CAAC,KAAK,EAClB,YAAY,CAAC,SAAS,EACtB,YAAY,CAAC,SAAS,IAAI,SAAS,CAAC,YAAY,EAChD,YAAY,CAAC,OAAO,IAAI,IAAI,CAC/B,CAAC;QAEF,IAAI;;AAEA,YAAA,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAClC,iBAAiB,CAAC,2DAA2D,EAC7E,OAAO,CAAC,aAAa,CACxB,CAAC;YACF,MAAM,eAAe,GACjB,MAAM,IAAI,CAAC,kCAAkC,CAAC,YAAY,CAAC,CAAC;;AAGhE,YAAA,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAClC,iBAAiB,CAAC,6CAA6C,EAC/D,OAAO,CAAC,aAAa,CACxB,CAAC;AACF,YAAA,MAAM,UAAU,GACZ,MAAM,IAAI,CAAC,oBAAoB,CAC3B,sBAAsB,EACtB,YAAY,CAAC,SAAS,EACtB,YAAY,CAAC,iBAAiB,CACjC,CAAC;AACN,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;YAEhD,MAAM,cAAc,GAAG,oBAAoB,CAAC,iBAAiB,CACzD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,oBAAoB,EACzB,OAAO,CAAC,oBAAoB,CAC/B,CAAC;;AAEF,YAAA,IAAI,+BAA+B,CAAC;AACpC,YAAA,IAAI,cAAc,EAAE;gBAChB,+BAA+B;AAC3B,oBAAA,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CACnC,iBAAiB,CAAC,8BAA8B,EAChD,OAAO,CAAC,aAAa,CACxB,CAAC;AACT,aAAA;;AAGD,YAAA,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC;AAChD,gBAAA,GAAG,YAAY;AACf,gBAAA,YAAY,EAAE,cAAc;AAC/B,aAAA,CAAC,CAAC;;YAGH,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAC7C,UAAU,EACV,IAAI,CAAC,cAAc,EACnB,eAAe,EACf,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,iBAAiB,CACzB,CAAC;;AAGF,YAAA,MAAM,eAAe,GAAgB;gBACjC,KAAK;gBACL,SAAS;gBACT,qBAAqB;aACxB,CAAC;YACF,MAAM,WAAW,GAAW,IAAI,CAAC,mBAAmB,CAChD,WAAW,EACX,eAAe,CAClB,CAAC;AACF,YAAA,IAAI,CAAC,YAAY,CAAC,SAAS,CACvB,SAAS,CAAC,YAAY,EACtB,eAAe,CAAC,KAAK,EACrB,EAAE,WAAW,EAAE,EACf,IAAI,CACP,CAAC;;YAGF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;;YAEzD,MAAM,YAAY,GACd,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACxC,YAAA,MAAM,KAAK,GAAG,IAAI,CAAC,+BAA+B,CAC9C,YAAY,EACZ,eAAe,CAAC,KAAK,EACrB,YAAY,CAAC,aAAa,CAC7B,CAAC;;AAEF,YAAA,eAAe,CAAC,cAAc,CAC1B,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EACzB,eAAe,CAClB,CAAC;YAEF,IAAI,YAAY,CAAC,SAAS,EAAE;AACxB,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,iDAAiD,CACpD,CAAC;;AAEF,gBAAA,IAAI,+BAA+B,EAAE;oBACjC,+BAA+B,CAAC,GAAG,CAAC;AAChC,wBAAA,OAAO,EAAE,IAAI;AACb,wBAAA,cAAc,EAAE,IAAI;AACvB,qBAAA,CAAC,CAAC;AACN,iBAAA;AAED,gBAAA,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;AAC5B,oBAAA,MAAM,gBAAgB,CAAC,yCAAyC,EAAE,CAAC;AACtE,iBAAA;gBACD,MAAM,uBAAuB,GAAG,IAAI,uBAAuB,CACvD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,gBAAgB,EACrB,KAAK,CAAC,iBAAiB,EACvB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,oBAAoB,EACzB,YAAY,CAAC,SAAS,EACtB,IAAI,CAAC,aAAa,EAClB,YAAY,CAAC,aAAa,CAC7B,CAAC;AACF,gBAAA,MAAM,EAAE,gBAAgB,EAAE,GAAG,aAAa,CAAC,iBAAiB,CACxD,IAAI,CAAC,aAAa,EAClB,KAAK,CACR,CAAC;AACF,gBAAA,OAAO,uBAAuB;AACzB,qBAAA,YAAY,CAAC;AACV,oBAAA,GAAG,YAAY;AACf,oBAAA,KAAK,EAAE,gBAAgB;oBACvB,MAAM,EAAE,SAAS;iBACpB,CAAC;qBACD,OAAO,CAAC,MAAK;AACV,oBAAA,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;AACnD,iBAAC,CAAC,CAAC;AACV,aAAA;;AAGD,YAAA,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,0BAA0B,CAC9D,IAAI,EACJ,KAAK,EACL,UAAU,CAAC,SAAS,EACpB,IAAI,CAAC,aAAa,CACrB,CAAC;AAEF,YAAA,OAAO,MAAM,CAAC;AACjB,SAAA;AAAC,QAAA,OAAO,CAAC,EAAE;AACR,YAAA,IAAI,KAAK,EAAE;;gBAEP,KAAK,CAAC,KAAK,EAAE,CAAC;AACjB,aAAA;YAED,IAAI,CAAC,YAAY,SAAS,EAAE;AACvB,gBAAA,CAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AACtD,gBAAA,sBAAsB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAChD,aAAA;YACD,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAC5D,YAAA,MAAM,CAAC,CAAC;AACX,SAAA;KACJ;AAED;;;;;;;;AAQG;AACO,IAAA,MAAM,gBAAgB,CAC5B,YAAqC,EACrC,SAAiB,EACjB,qBAA4C,EAC5C,gBAAyB,EACzB,KAAqB,EACrB,qBAA8B,EAAA;AAE9B,QAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAC/C,QAAA,IAAI,CAAC,YAAY,CAAC,SAAS,CACvB,SAAS,CAAC,YAAY,EACtB,eAAe,CAAC,KAAK,EACrB,YAAY,CACf,CAAC;QAEF,MAAM,sBAAsB,GAAG,IAAI,CAAC,gCAAgC,CAChE,KAAK,CAAC,WAAW,CACpB,CAAC;QAEF,IAAI;;YAEA,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;;AAGpD,YAAA,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAClC,iBAAiB,CAAC,6CAA6C,EAC/D,YAAY,CAAC,aAAa,CAC7B,CAAC;YACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAC9C,sBAAsB,EACtB,gBAAgB,CACnB,CAAC;AACF,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;YAEhD,IAAI;AACA,gBAAA,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC;AAC3C,aAAA;YAAC,MAAM;AACJ,gBAAA,IACI,YAAY,CAAC,OAAO,EAAE,aAAa;AACnC,oBAAA,YAAY,CAAC,qBAAqB;oBAClC,UAAU,CAAC,SAAS,CAAC,YAAY,KAAK,YAAY,CAAC,IAAI,EACzD;oBACE,IAAI,CAAC,cAAc,CAAC,aAAa,CAC7B,YAAY,CAAC,OAAO,EAAE,aAAa,CACtC,CAAC;AAEF,oBAAA,IAAI,CAAC,YAAY,CAAC,SAAS,CACvB,SAAS,CAAC,cAAc,EACxB,eAAe,CAAC,KAAK,EACrB,YAAY,CACf,CAAC;AAEF,oBAAA,IAAI,qBAAqB,EAAE;AACvB,wBAAA,MAAM,iBAAiB,GAAsB;4BACzC,KAAK,EAAE,KAAK,CAAC,WAAW;AACxB,4BAAA,OAAO,EACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,yBAAyB;AAChD,4BAAA,SAAS,EAAE,KAAK;yBACnB,CAAC;AACF,wBAAA,MAAM,WAAW,GAAG,SAAS,CAAC,cAAc,CACxC,qBAAqB,EACrB,YAAY,CAAC,aAAa,EAAE,CAC/B,CAAC;wBACF,MAAM,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CACxC,WAAW,EACX,iBAAiB,CACpB,CAAC;AACL,qBAAA;AAED,oBAAA,IAAI,KAAK,EAAE;wBACP,KAAK,CAAC,KAAK,EAAE,CAAC;AACjB,qBAAA;oBAED,OAAO;AACV,iBAAA;AACJ,aAAA;;YAGD,MAAM,SAAS,GAAW,UAAU,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;AAEhE,YAAA,IAAI,CAAC,YAAY,CAAC,SAAS,CACvB,SAAS,CAAC,cAAc,EACxB,eAAe,CAAC,KAAK,EACrB,YAAY,CACf,CAAC;;AAGF,YAAA,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;gBAC1C,SAAS;gBACT,qBAAqB;gBACrB,KAAK;AACR,aAAA,CAAC,CAAC;AACH,YAAA,IAAI,CAAC,YAAY,CAAC,SAAS,CACvB,SAAS,CAAC,YAAY,EACtB,eAAe,CAAC,KAAK,EACrB,EAAE,WAAW,EAAE,EACf,IAAI,CACP,CAAC;AAEF,YAAA,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;AAE3C,YAAA,IAAI,qBAAqB,EAAE;AACvB,gBAAA,MAAM,iBAAiB,GAAsB;oBACzC,KAAK,EAAE,KAAK,CAAC,WAAW;AACxB,oBAAA,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,yBAAyB;AACrD,oBAAA,SAAS,EAAE,KAAK;iBACnB,CAAC;AACF,gBAAA,MAAM,WAAW,GAAG,SAAS,CAAC,cAAc,CACxC,qBAAqB,EACrB,YAAY,CAAC,aAAa,EAAE,CAC/B,CAAC;AAEF,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,yDAAyD,CAC5D,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,UAAU,CAClB,CAA+B,4BAAA,EAAA,WAAW,CAAE,CAAA,CAC/C,CAAC;gBACF,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAClC,WAAW,EACX,iBAAiB,CACpB,CAAC;AACL,aAAA;AAAM,iBAAA;AACH,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,qCAAqC,CAAC,CAAC;AAC9D,aAAA;AACJ,SAAA;AAAC,QAAA,OAAO,CAAC,EAAE;AACR,YAAA,IAAI,KAAK,EAAE;;gBAEP,KAAK,CAAC,KAAK,EAAE,CAAC;AACjB,aAAA;YAED,IAAI,CAAC,YAAY,SAAS,EAAE;AACvB,gBAAA,CAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AACtD,gBAAA,sBAAsB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAChD,aAAA;AACD,YAAA,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;AACpD,YAAA,IAAI,CAAC,YAAY,CAAC,SAAS,CACvB,SAAS,CAAC,cAAc,EACxB,eAAe,CAAC,KAAK,EACrB,IAAI,EACJ,CAAe,CAClB,CAAC;AACF,YAAA,IAAI,CAAC,YAAY,CAAC,SAAS,CACvB,SAAS,CAAC,UAAU,EACpB,eAAe,CAAC,KAAK,CACxB,CAAC;AACF,YAAA,MAAM,CAAC,CAAC;AACX,SAAA;AAED,QAAA,IAAI,CAAC,YAAY,CAAC,SAAS,CACvB,SAAS,CAAC,UAAU,EACpB,eAAe,CAAC,KAAK,CACxB,CAAC;KACL;AAED;;;AAGG;IACH,mBAAmB,CAAC,UAAkB,EAAE,MAAmB,EAAA;;AAEvD,QAAA,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAgB,aAAA,EAAA,UAAU,CAAE,CAAA,CAAC,CAAC;;YAElD,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AAC7C,SAAA;AAAM,aAAA;;AAEH,YAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;AAC3C,YAAA,MAAM,gBAAgB,CAAC,6BAA6B,EAAE,CAAC;AAC1D,SAAA;KACJ;AAED;;;;AAIG;AACH,IAAA,mBAAmB,CAAC,WAAmB,EAAA;QACnC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAI;AACnC;;;AAGG;YACH,MAAM,QAAQ,GACV,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB;AACpC,gBAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC;YAChD,IAAI,KAAK,GAAG,CAAC,CAAC;AAEd,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,oDAAoD,CACvD,CAAC;AAEF,YAAA,MAAM,UAAU,GAAG,WAAW,CAAC,MAAK;;gBAEhC,IAAI,WAAW,CAAC,MAAM,EAAE;AACpB,oBAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,kDAAkD,CACrD,CAAC;oBACF,IAAI,CAAC,UAAU,EAAE,CAAC;oBAClB,aAAa,CAAC,UAAU,CAAC,CAAC;AAC1B,oBAAA,MAAM,CAAC,gBAAgB,CAAC,wBAAwB,EAAE,CAAC,CAAC;oBACpD,OAAO;AACV,iBAAA;AAED,gBAAA,IAAI,IAAI,GAAG,SAAS,CAAC,YAAY,CAAC;AAClC,gBAAA,IAAI,oBAAoB,GAAG,SAAS,CAAC,YAAY,CAAC;gBAClD,IAAI;AACA;;;;AAIG;AACH,oBAAA,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACjC,oBAAoB;AAChB,wBAAA,IAAI,CAAC,oCAAoC,CACrC,WAAW,EACX,IAAI,CACP,CAAC;AACT,iBAAA;gBAAC,OAAO,CAAC,EAAE,GAAE;;gBAGd,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,aAAa,EAAE;oBACrD,OAAO;AACV,iBAAA;AAED,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,6EAA6E,CAChF,CAAC;AAEF;;;AAGG;AACH,gBAAA,KAAK,EAAE,CAAC;AAER,gBAAA,IAAI,oBAAoB,EAAE;AACtB,oBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,sDAAsD,CACzD,CAAC;oBACF,aAAa,CAAC,UAAU,CAAC,CAAC;AAC1B,oBAAA,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAE7B,oBAAA,IACI,SAAS,CAAC,2BAA2B,CACjC,oBAAoB,CACvB,EACH;AACE,wBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,+EAA+E,CAClF,CAAC;wBACF,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACjC,qBAAA;AAAM,yBAAA;AACH,wBAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,6JAA6J,CAChK,CAAC;wBACF,IAAI,CAAC,MAAM,CAAC,QAAQ,CAChB,CAAkD,+CAAA,EAAA,oBAAoB,CAAE,CAAA,CAC3E,CAAC;AACF,wBAAA,MAAM,CACF,gBAAgB,CAAC,4CAA4C,EAAE,CAClE,CAAC;AACL,qBAAA;AACJ,iBAAA;qBAAM,IAAI,KAAK,GAAG,QAAQ,EAAE;AACzB,oBAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,2EAA2E,CAC9E,CAAC;oBACF,aAAa,CAAC,UAAU,CAAC,CAAC;AAC1B,oBAAA,MAAM,CAAC,gBAAgB,CAAC,8BAA8B,EAAE,CAAC,CAAC;AAC7D,iBAAA;aACJ,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;AACpD,SAAC,CAAC,CAAC;KACN;AAED;;;;AAIG;AACH,IAAA,kBAAkB,CAAC,WAAmB,EAAA;AAClC,QAAA,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,KAAI;AAC3B,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,mDAAmD,CACtD,CAAC;AAEF,YAAA,MAAM,UAAU,GAAG,WAAW,CAAC,MAAK;;gBAEhC,IAAI,WAAW,CAAC,MAAM,EAAE;AACpB,oBAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,iDAAiD,CACpD,CAAC;oBACF,IAAI,CAAC,UAAU,EAAE,CAAC;oBAClB,aAAa,CAAC,UAAU,CAAC,CAAC;AAC1B,oBAAA,OAAO,EAAE,CAAC;AACb,iBAAA;AAED,gBAAA,IAAI,IAAI,GAAW,SAAS,CAAC,YAAY,CAAC;gBAC1C,IAAI;AACA;;;;AAIG;AACH,oBAAA,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;AACpC,iBAAA;gBAAC,OAAO,CAAC,EAAE,GAAE;;gBAGd,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,aAAa,EAAE;oBACrD,OAAO;AACV,iBAAA;AAED,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,sFAAsF,CACzF,CAAC;gBAEF,aAAa,CAAC,UAAU,CAAC,CAAC;AAC1B,gBAAA,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAC7B,gBAAA,OAAO,EAAE,CAAC;aACb,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;AACpD,SAAC,CAAC,CAAC;KACN;AAED;;;;;;;;;;;;AAYG;IACH,SAAS,CAAC,WAAmB,EAAE,WAAwB,EAAA;QACnD,IAAI;AACA,YAAA,IAAI,WAAW,CAAC;;YAEhB,IAAI,WAAW,CAAC,KAAK,EAAE;AACnB,gBAAA,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC;gBAChC,IAAI,CAAC,MAAM,CAAC,UAAU,CAClB,CAA+B,4BAAA,EAAA,WAAW,CAAE,CAAA,CAC/C,CAAC;AACF,gBAAA,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAC5C,aAAA;AAAM,iBAAA,IAAI,OAAO,WAAW,CAAC,KAAK,KAAK,WAAW,EAAE;;gBAEjD,IAAI,CAAC,MAAM,CAAC,UAAU,CAClB,CAA4B,yBAAA,EAAA,WAAW,CAAE,CAAA,CAC5C,CAAC;AACF,gBAAA,WAAW,GAAG,IAAI,CAAC,cAAc,CAC7B,WAAW,EACX,WAAW,CAAC,SAAS,EACrB,WAAW,CAAC,qBAAqB,CACpC,CAAC;AACL,aAAA;;YAGD,IAAI,CAAC,WAAW,EAAE;AACd,gBAAA,MAAM,gBAAgB,CAAC,6BAA6B,EAAE,CAAC;AAC1D,aAAA;YACD,IAAI,WAAW,CAAC,KAAK,EAAE;gBACnB,WAAW,CAAC,KAAK,EAAE,CAAC;AACvB,aAAA;AACD,YAAA,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC;YACjC,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;AAE3D,YAAA,OAAO,WAAW,CAAC;AACtB,SAAA;AAAC,QAAA,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,sBAAsB,GAAI,CAAe,CAAC,OAAO,CACpD,CAAC;AACF,YAAA,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,gBAAgB,CAAC,sBAAsB,CACxC,CAAe,CAAC,QAAQ,EAAE,CAC9B,CAAC;AACL,SAAA;KACJ;AAED;;;;;;AAMG;AACH,IAAA,cAAc,CACV,WAAmB,EACnB,SAAiB,EACjB,qBAA4C,EAAA;AAE5C;;;AAGG;AACH,QAAA,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;AACvE,QAAA,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;AACpE;;;AAGG;AACH,QAAA,MAAM,QAAQ,GACV,MAAM,CAAC,UAAU;YACjB,QAAQ,CAAC,eAAe,CAAC,WAAW;AACpC,YAAA,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;AAC9B,QAAA,MAAM,SAAS,GACX,MAAM,CAAC,WAAW;YAClB,QAAQ,CAAC,eAAe,CAAC,YAAY;AACrC,YAAA,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;AAE/B,QAAA,IAAI,KAAK,GAAG,qBAAqB,CAAC,SAAS,EAAE,KAAK,CAAC;AACnD,QAAA,IAAI,MAAM,GAAG,qBAAqB,CAAC,SAAS,EAAE,MAAM,CAAC;AACrD,QAAA,IAAI,GAAG,GAAG,qBAAqB,CAAC,aAAa,EAAE,GAAG,CAAC;AACnD,QAAA,IAAI,IAAI,GAAG,qBAAqB,CAAC,aAAa,EAAE,IAAI,CAAC;QAErD,IAAI,CAAC,KAAK,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,QAAQ,EAAE;AACzC,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,0EAA0E,CAC7E,CAAC;AACF,YAAA,KAAK,GAAG,gBAAgB,CAAC,WAAW,CAAC;AACxC,SAAA;QAED,IAAI,CAAC,MAAM,IAAI,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,SAAS,EAAE;AAC7C,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,4EAA4E,CAC/E,CAAC;AACF,YAAA,MAAM,GAAG,gBAAgB,CAAC,YAAY,CAAC;AAC1C,SAAA;QAED,IAAI,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,SAAS,EAAE;AACpC,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,+EAA+E,CAClF,CAAC;AACF,YAAA,GAAG,GAAG,IAAI,CAAC,GAAG,CACV,CAAC,EACD,SAAS,GAAG,CAAC,GAAG,gBAAgB,CAAC,YAAY,GAAG,CAAC,GAAG,MAAM,CAC7D,CAAC;AACL,SAAA;QAED,IAAI,CAAC,IAAI,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,QAAQ,EAAE;AACtC,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,iFAAiF,CACpF,CAAC;AACF,YAAA,IAAI,GAAG,IAAI,CAAC,GAAG,CACX,CAAC,EACD,QAAQ,GAAG,CAAC,GAAG,gBAAgB,CAAC,WAAW,GAAG,CAAC,GAAG,OAAO,CAC5D,CAAC;AACL,SAAA;AAED,QAAA,OAAO,MAAM,CAAC,IAAI,CACd,WAAW,EACX,SAAS,EACT,CAAA,MAAA,EAAS,KAAK,CAAA,SAAA,EAAY,MAAM,CAAS,MAAA,EAAA,GAAG,UAAU,IAAI,CAAA,gBAAA,CAAkB,CAC/E,CAAC;KACL;AAED;;AAEG;AACH,IAAA,YAAY,CAAC,CAAQ,EAAA;QACjB,IAAI,CAAC,cAAc,CAAC,6BAA6B,CAC7C,eAAe,CAAC,KAAK,CACxB,CAAC;QACF,IAAI,IAAI,CAAC,aAAa,EAAE;AACpB,YAAA,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;AAC9B,SAAA;;QAED,CAAC,CAAC,cAAc,EAAE,CAAC;KACtB;AAED;;;AAGG;AACH,IAAA,UAAU,CAAC,WAAoB,EAAA;AAC3B,QAAA,IAAI,WAAW,EAAE;;YAEb,WAAW,CAAC,KAAK,EAAE,CAAC;AACvB,SAAA;;QAED,MAAM,CAAC,mBAAmB,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;;AAG9D,QAAA,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;KACvD;AAED;;;;AAIG;IACH,iBAAiB,CAAC,MAAqB,EAAE,SAAiB,EAAA;QACtD,OAAO,CAAA,EAAG,gBAAgB,CAAC,iBAAiB,CAAA,CAAA,EACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QACrB,CAAA,CAAA,EAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA,CAAA,EAAI,SAAS,CAAA,CAAA,EAAI,IAAI,CAAC,aAAa,CAAA,CAAE,CAAC;KAC7D;AAED;;;;AAIG;AACH,IAAA,uBAAuB,CAAC,OAAgC,EAAA;QACpD,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;AACvE,QAAA,OAAO,GAAG,gBAAgB,CAAC,iBAAiB,CAAI,CAAA,EAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,aAAa,CAAA,CAAA,EAAI,IAAI,CAAC,aAAa,EAAE,CAAC;KACtH;AAED;;AAEG;IACH,oCAAoC,CAChC,WAAmB,EACnB,IAAY,EAAA;AAEZ,QAAA,IAAI,oBAAoB,CAAC;QACzB,IACI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB;YAChD,kBAAkB,CAAC,KAAK,EAC1B;AACE,YAAA,oBAAoB,GAAG,SAAS,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;AACnE,SAAA;AAAM,aAAA;AACH,YAAA,oBAAoB,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;AACpD,SAAA;AACD,QAAA,OAAO,oBAAoB,CAAC;KAC/B;AACJ;;;;"}
@@ -1 +1 @@
1
- {"version":3,"file":"RedirectClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/RedirectClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAKH,sBAAsB,EAKtB,OAAO,EACP,MAAM,EACN,kBAAkB,EAErB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAQxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAIjE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AACnF,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;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,qBAAa,cAAe,SAAQ,yBAAyB;IACzD,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;IAgB1B;;;OAGG;IACG,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAuG3D;;;;;OAKG;IACG,qBAAqB,CACvB,IAAI,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IAmKvC;;;;OAIG;IACH,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IA4B9D;;;;OAIG;cACa,UAAU,CACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,sBAAsB,EAAE,sBAAsB,GAC/C,OAAO,CAAC,oBAAoB,CAAC;IAiFhC;;;;OAIG;IACG,MAAM,CAAC,aAAa,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuG9D;;;OAGG;IACH,SAAS,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;CAOpE"}
1
+ {"version":3,"file":"RedirectClient.d.ts","sourceRoot":"","sources":["../../src/interaction_client/RedirectClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAKH,sBAAsB,EAKtB,OAAO,EACP,MAAM,EACN,kBAAkB,EAGrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAQxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAIjE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AACnF,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;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,qBAAa,cAAe,SAAQ,yBAAyB;IACzD,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;IAgB1B;;;OAGG;IACG,YAAY,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAuG3D;;;;;OAKG;IACG,qBAAqB,CACvB,IAAI,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IAkKvC;;;;OAIG;IACH,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IA4B9D;;;;OAIG;cACa,UAAU,CACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,sBAAsB,EAAE,sBAAsB,GAC/C,OAAO,CAAC,oBAAoB,CAAC;IAiFhC;;;;OAIG;IACG,MAAM,CAAC,aAAa,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2H9D;;;OAGG;IACH,SAAS,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;CAOpE"}
@@ -1,14 +1,14 @@
1
- /*! @azure/msal-browser v3.0.0-beta.1 2023-07-06 */
1
+ /*! @azure/msal-browser v3.0.1 2023-08-11 */
2
2
  'use strict';
3
- import { PerformanceEvents, Constants, AuthError, UrlString, ProtocolUtils, ThrottlingUtils } from '@azure/msal-common';
4
- import { StandardInteractionClient } from './StandardInteractionClient.js';
5
- import { InteractionType, ApiId, TemporaryCacheKeys } from '../utils/BrowserConstants.js';
6
- import { RedirectHandler } from '../interaction_handler/RedirectHandler.js';
7
- import { BrowserUtils } from '../utils/BrowserUtils.js';
8
- import { EventType } from '../event/EventType.js';
9
- import { BrowserAuthError } from '../error/BrowserAuthError.js';
10
- import { NativeInteractionClient } from './NativeInteractionClient.js';
11
- import { NativeMessageHandler } from '../broker/nativeBroker/NativeMessageHandler.js';
3
+ import { PerformanceEvents, Constants, AuthError, UrlString, ProtocolUtils, ThrottlingUtils, ProtocolMode } from '@azure/msal-common';
4
+ import { StandardInteractionClient } from './StandardInteractionClient.mjs';
5
+ import { InteractionType, ApiId, TemporaryCacheKeys } from '../utils/BrowserConstants.mjs';
6
+ import { RedirectHandler } from '../interaction_handler/RedirectHandler.mjs';
7
+ import { BrowserUtils } from '../utils/BrowserUtils.mjs';
8
+ import { EventType } from '../event/EventType.mjs';
9
+ import { BrowserAuthError } from '../error/BrowserAuthError.mjs';
10
+ import { NativeInteractionClient } from './NativeInteractionClient.mjs';
11
+ import { NativeMessageHandler } from '../broker/nativeBroker/NativeMessageHandler.mjs';
12
12
 
13
13
  /*
14
14
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -250,6 +250,18 @@ class RedirectClient extends StandardInteractionClient {
250
250
  this.performanceClient.setPreQueueTime(PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, validLogoutRequest.correlationId);
251
251
  const authClient = await this.createAuthCodeClient(serverTelemetryManager, logoutRequest && logoutRequest.authority);
252
252
  this.logger.verbose("Auth code client created");
253
+ if (authClient.authority.protocolMode === ProtocolMode.OIDC) {
254
+ try {
255
+ authClient.authority.endSessionEndpoint;
256
+ }
257
+ catch {
258
+ if (validLogoutRequest.account?.homeAccountId) {
259
+ this.browserStorage.removeAccount(validLogoutRequest.account?.homeAccountId);
260
+ this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, InteractionType.Redirect, validLogoutRequest);
261
+ return;
262
+ }
263
+ }
264
+ }
253
265
  // Create logout string and navigate user window to logout.
254
266
  const logoutUri = authClient.getLogoutUri(validLogoutRequest);
255
267
  this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, InteractionType.Redirect, validLogoutRequest);
@@ -303,4 +315,4 @@ class RedirectClient extends StandardInteractionClient {
303
315
  }
304
316
 
305
317
  export { RedirectClient };
306
- //# sourceMappingURL=RedirectClient.js.map
318
+ //# sourceMappingURL=RedirectClient.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"RedirectClient.mjs","sources":["../../src/interaction_client/RedirectClient.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -1,11 +1,11 @@
1
- /*! @azure/msal-browser v3.0.0-beta.1 2023-07-06 */
1
+ /*! @azure/msal-browser v3.0.1 2023-08-11 */
2
2
  'use strict';
3
3
  import { PerformanceEvents, Constants, AuthError } from '@azure/msal-common';
4
- import { StandardInteractionClient } from './StandardInteractionClient.js';
5
- import { BrowserAuthError } from '../error/BrowserAuthError.js';
6
- import { InteractionType } from '../utils/BrowserConstants.js';
7
- import { SilentHandler } from '../interaction_handler/SilentHandler.js';
8
- import { HybridSpaAuthorizationCodeClient } from './HybridSpaAuthorizationCodeClient.js';
4
+ import { StandardInteractionClient } from './StandardInteractionClient.mjs';
5
+ import { BrowserAuthError } from '../error/BrowserAuthError.mjs';
6
+ import { InteractionType } from '../utils/BrowserConstants.mjs';
7
+ import { SilentHandler } from '../interaction_handler/SilentHandler.mjs';
8
+ import { HybridSpaAuthorizationCodeClient } from './HybridSpaAuthorizationCodeClient.mjs';
9
9
 
10
10
  /*
11
11
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -71,4 +71,4 @@ class SilentAuthCodeClient extends StandardInteractionClient {
71
71
  }
72
72
 
73
73
  export { SilentAuthCodeClient };
74
- //# sourceMappingURL=SilentAuthCodeClient.js.map
74
+ //# sourceMappingURL=SilentAuthCodeClient.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SilentAuthCodeClient.mjs","sources":["../../src/interaction_client/SilentAuthCodeClient.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -1,9 +1,9 @@
1
- /*! @azure/msal-browser v3.0.0-beta.1 2023-07-06 */
1
+ /*! @azure/msal-browser v3.0.1 2023-08-11 */
2
2
  'use strict';
3
- import { StandardInteractionClient } from './StandardInteractionClient.js';
3
+ import { StandardInteractionClient } from './StandardInteractionClient.mjs';
4
4
  import { PerformanceEvents, AuthError, SilentFlowClient } from '@azure/msal-common';
5
- import { ApiId } from '../utils/BrowserConstants.js';
6
- import { BrowserAuthError, BrowserAuthErrorMessage } from '../error/BrowserAuthError.js';
5
+ import { ApiId } from '../utils/BrowserConstants.mjs';
6
+ import { BrowserAuthError, BrowserAuthErrorMessage } from '../error/BrowserAuthError.mjs';
7
7
 
8
8
  /*
9
9
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -21,8 +21,8 @@ class SilentCacheClient extends StandardInteractionClient {
21
21
  const silentAuthClient = await this.createSilentFlowClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions);
22
22
  this.logger.verbose("Silent auth client created");
23
23
  try {
24
- const cachedToken = await silentAuthClient.acquireCachedToken(silentRequest);
25
- acquireTokenMeasurement.endMeasurement({
24
+ const cachedToken = (await silentAuthClient.acquireCachedToken(silentRequest));
25
+ acquireTokenMeasurement.end({
26
26
  success: true,
27
27
  fromCache: true,
28
28
  });
@@ -34,7 +34,7 @@ class SilentCacheClient extends StandardInteractionClient {
34
34
  BrowserAuthErrorMessage.signingKeyNotFoundInStorage.code) {
35
35
  this.logger.verbose("Signing keypair for bound access token not found. Refreshing bound access token and generating a new crypto keypair.");
36
36
  }
37
- acquireTokenMeasurement.endMeasurement({
37
+ acquireTokenMeasurement.end({
38
38
  errorCode: (error instanceof AuthError && error.errorCode) ||
39
39
  undefined,
40
40
  subErrorCode: (error instanceof AuthError && error.subError) || undefined,
@@ -66,7 +66,7 @@ class SilentCacheClient extends StandardInteractionClient {
66
66
  this.performanceClient.setPreQueueTime(PerformanceEvents.InitializeBaseRequest, this.correlationId);
67
67
  return {
68
68
  ...request,
69
- ...await this.initializeBaseRequest(request, account),
69
+ ...(await this.initializeBaseRequest(request, account)),
70
70
  account: account,
71
71
  forceRefresh: request.forceRefresh || false,
72
72
  };
@@ -74,4 +74,4 @@ class SilentCacheClient extends StandardInteractionClient {
74
74
  }
75
75
 
76
76
  export { SilentCacheClient };
77
- //# sourceMappingURL=SilentCacheClient.js.map
77
+ //# sourceMappingURL=SilentCacheClient.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SilentCacheClient.mjs","sources":["../../src/interaction_client/SilentCacheClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;AAAA;;;AAGG;AAoBG,MAAO,iBAAkB,SAAQ,yBAAyB,CAAA;AAC5D;;;AAGG;IACH,MAAM,YAAY,CACd,aAAsC,EAAA;AAEtC,QAAA,MAAM,uBAAuB,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CACnE,iBAAiB,CAAC,6BAA6B,EAC/C,aAAa,CAAC,aAAa,CAC9B,CAAC;;QAEF,MAAM,sBAAsB,GAAG,IAAI,CAAC,gCAAgC,CAChE,KAAK,CAAC,6BAA6B,CACtC,CAAC;AAEF,QAAA,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CACtD,sBAAsB,EACtB,aAAa,CAAC,SAAS,EACvB,aAAa,CAAC,iBAAiB,CAClC,CAAC;AACF,QAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAElD,IAAI;YACA,MAAM,WAAW,IAAI,MAAM,gBAAgB,CAAC,kBAAkB,CAC1D,aAAa,CAChB,CAAyB,CAAC;YAE3B,uBAAuB,CAAC,GAAG,CAAC;AACxB,gBAAA,OAAO,EAAE,IAAI;AACb,gBAAA,SAAS,EAAE,IAAI;AAClB,aAAA,CAAC,CAAC;AACH,YAAA,OAAO,WAAW,CAAC;AACtB,SAAA;AAAC,QAAA,OAAO,KAAK,EAAE;YACZ,IACI,KAAK,YAAY,gBAAgB;AACjC,gBAAA,KAAK,CAAC,SAAS;AACX,oBAAA,uBAAuB,CAAC,2BAA2B,CAAC,IAAI,EAC9D;AACE,gBAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CACf,sHAAsH,CACzH,CAAC;AACL,aAAA;YACD,uBAAuB,CAAC,GAAG,CAAC;gBACxB,SAAS,EACL,CAAC,KAAK,YAAY,SAAS,IAAI,KAAK,CAAC,SAAS;oBAC9C,SAAS;gBACb,YAAY,EACR,CAAC,KAAK,YAAY,SAAS,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS;AAC/D,gBAAA,OAAO,EAAE,KAAK;AACjB,aAAA,CAAC,CAAC;AACH,YAAA,MAAM,KAAK,CAAC;AACf,SAAA;KACJ;AAED;;AAEG;IACH,MAAM,GAAA;;QAEF,OAAO,OAAO,CAAC,MAAM,CACjB,gBAAgB,CAAC,kCAAkC,EAAE,CACxD,CAAC;KACL;AAED;;;;AAIG;AACO,IAAA,MAAM,sBAAsB,CAClC,sBAA8C,EAC9C,YAAqB,EACrB,iBAAqC,EAAA;;AAGrC,QAAA,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAClC,iBAAiB,CAAC,+CAA+C,EACjE,IAAI,CAAC,aAAa,CACrB,CAAC;AACF,QAAA,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAClD,sBAAsB,EACtB,YAAY,EACZ,iBAAiB,CACpB,CAAC;QACF,OAAO,IAAI,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;KACrE;AAED,IAAA,MAAM,uBAAuB,CACzB,OAAsB,EACtB,OAAoB,EAAA;AAEpB,QAAA,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CACtC,iBAAiB,CAAC,uBAAuB,EACzC,IAAI,CAAC,aAAa,CACrB,CAAC;AAEF,QAAA,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAClC,iBAAiB,CAAC,qBAAqB,EACvC,IAAI,CAAC,aAAa,CACrB,CAAC;QACF,OAAO;AACH,YAAA,GAAG,OAAO;YACV,IAAI,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACvD,YAAA,OAAO,EAAE,OAAO;AAChB,YAAA,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,KAAK;SAC9C,CAAC;KACL;AACJ;;;;"}