@azure/msal-common 14.1.0 → 14.2.0-alpha.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.
Files changed (230) hide show
  1. package/dist/account/AccountInfo.d.ts +31 -31
  2. package/dist/account/AuthToken.d.ts +17 -17
  3. package/dist/account/AuthToken.mjs +58 -58
  4. package/dist/account/CcsCredential.d.ts +9 -9
  5. package/dist/account/CcsCredential.mjs +8 -8
  6. package/dist/account/ClientCredentials.d.ts +14 -14
  7. package/dist/account/ClientInfo.d.ts +19 -19
  8. package/dist/account/ClientInfo.mjs +37 -37
  9. package/dist/account/TokenClaims.d.ts +65 -65
  10. package/dist/authority/Authority.d.ts +250 -235
  11. package/dist/authority/Authority.d.ts.map +1 -1
  12. package/dist/authority/Authority.mjs +795 -740
  13. package/dist/authority/Authority.mjs.map +1 -1
  14. package/dist/authority/AuthorityFactory.d.ts +31 -31
  15. package/dist/authority/AuthorityFactory.d.ts.map +1 -1
  16. package/dist/authority/AuthorityFactory.mjs +48 -48
  17. package/dist/authority/AuthorityMetadata.d.ts +646 -623
  18. package/dist/authority/AuthorityMetadata.d.ts.map +1 -1
  19. package/dist/authority/AuthorityMetadata.mjs +941 -885
  20. package/dist/authority/AuthorityMetadata.mjs.map +1 -1
  21. package/dist/authority/AuthorityOptions.d.ts +27 -21
  22. package/dist/authority/AuthorityOptions.d.ts.map +1 -1
  23. package/dist/authority/AuthorityOptions.mjs +18 -18
  24. package/dist/authority/AuthorityOptions.mjs.map +1 -1
  25. package/dist/authority/AuthorityType.d.ts +10 -10
  26. package/dist/authority/AuthorityType.mjs +13 -13
  27. package/dist/authority/AzureRegion.d.ts +1 -1
  28. package/dist/authority/AzureRegionConfiguration.d.ts +5 -5
  29. package/dist/authority/CloudDiscoveryMetadata.d.ts +5 -5
  30. package/dist/authority/CloudInstanceDiscoveryErrorResponse.d.ts +13 -13
  31. package/dist/authority/CloudInstanceDiscoveryErrorResponse.mjs +8 -8
  32. package/dist/authority/CloudInstanceDiscoveryResponse.d.ts +9 -9
  33. package/dist/authority/CloudInstanceDiscoveryResponse.mjs +8 -8
  34. package/dist/authority/ImdsOptions.d.ts +5 -5
  35. package/dist/authority/OIDCOptions.d.ts +8 -8
  36. package/dist/authority/OpenIdConfigResponse.d.ts +11 -11
  37. package/dist/authority/OpenIdConfigResponse.mjs +10 -10
  38. package/dist/authority/ProtocolMode.d.ts +8 -8
  39. package/dist/authority/ProtocolMode.mjs +11 -11
  40. package/dist/authority/RegionDiscovery.d.ts +32 -32
  41. package/dist/authority/RegionDiscovery.mjs +106 -106
  42. package/dist/authority/RegionDiscoveryMetadata.d.ts +6 -6
  43. package/dist/broker/nativeBroker/INativeBrokerPlugin.d.ts +15 -15
  44. package/dist/cache/CacheManager.d.ts +480 -464
  45. package/dist/cache/CacheManager.d.ts.map +1 -1
  46. package/dist/cache/CacheManager.mjs +1089 -1049
  47. package/dist/cache/CacheManager.mjs.map +1 -1
  48. package/dist/cache/entities/AccessTokenEntity.d.ts +56 -56
  49. package/dist/cache/entities/AccessTokenEntity.mjs +109 -109
  50. package/dist/cache/entities/AccountEntity.d.ts +101 -101
  51. package/dist/cache/entities/AccountEntity.d.ts.map +1 -1
  52. package/dist/cache/entities/AccountEntity.mjs +218 -220
  53. package/dist/cache/entities/AccountEntity.mjs.map +1 -1
  54. package/dist/cache/entities/AppMetadataEntity.d.ts +39 -39
  55. package/dist/cache/entities/AppMetadataEntity.mjs +66 -66
  56. package/dist/cache/entities/AuthorityMetadataEntity.d.ts +48 -48
  57. package/dist/cache/entities/AuthorityMetadataEntity.mjs +78 -78
  58. package/dist/cache/entities/CacheRecord.d.ts +14 -14
  59. package/dist/cache/entities/CacheRecord.mjs +14 -14
  60. package/dist/cache/entities/CredentialEntity.d.ts +88 -88
  61. package/dist/cache/entities/CredentialEntity.mjs +136 -136
  62. package/dist/cache/entities/IdTokenEntity.d.ts +34 -34
  63. package/dist/cache/entities/IdTokenEntity.mjs +56 -56
  64. package/dist/cache/entities/RefreshTokenEntity.d.ts +36 -36
  65. package/dist/cache/entities/RefreshTokenEntity.mjs +59 -59
  66. package/dist/cache/entities/ServerTelemetryEntity.d.ts +12 -12
  67. package/dist/cache/entities/ServerTelemetryEntity.mjs +27 -27
  68. package/dist/cache/entities/ThrottlingEntity.d.ts +13 -13
  69. package/dist/cache/entities/ThrottlingEntity.mjs +23 -23
  70. package/dist/cache/interface/ICacheManager.d.ts +166 -166
  71. package/dist/cache/interface/ICachePlugin.d.ts +5 -5
  72. package/dist/cache/interface/ISerializableTokenCache.d.ts +4 -4
  73. package/dist/cache/persistence/TokenCacheContext.d.ts +23 -23
  74. package/dist/cache/persistence/TokenCacheContext.mjs +25 -25
  75. package/dist/cache/utils/CacheTypes.d.ts +67 -66
  76. package/dist/cache/utils/CacheTypes.d.ts.map +1 -1
  77. package/dist/client/AuthorizationCodeClient.d.ts +73 -73
  78. package/dist/client/AuthorizationCodeClient.d.ts.map +1 -1
  79. package/dist/client/AuthorizationCodeClient.mjs +408 -408
  80. package/dist/client/AuthorizationCodeClient.mjs.map +1 -1
  81. package/dist/client/BaseClient.d.ts +51 -51
  82. package/dist/client/BaseClient.d.ts.map +1 -1
  83. package/dist/client/BaseClient.mjs +100 -99
  84. package/dist/client/BaseClient.mjs.map +1 -1
  85. package/dist/client/RefreshTokenClient.d.ts +35 -35
  86. package/dist/client/RefreshTokenClient.d.ts.map +1 -1
  87. package/dist/client/RefreshTokenClient.mjs +187 -187
  88. package/dist/client/RefreshTokenClient.mjs.map +1 -1
  89. package/dist/client/SilentFlowClient.d.ts +27 -26
  90. package/dist/client/SilentFlowClient.d.ts.map +1 -1
  91. package/dist/client/SilentFlowClient.mjs +118 -125
  92. package/dist/client/SilentFlowClient.mjs.map +1 -1
  93. package/dist/config/AppTokenProvider.d.ts +38 -38
  94. package/dist/config/ClientConfiguration.d.ts +150 -150
  95. package/dist/config/ClientConfiguration.d.ts.map +1 -1
  96. package/dist/config/ClientConfiguration.mjs +96 -98
  97. package/dist/config/ClientConfiguration.mjs.map +1 -1
  98. package/dist/crypto/ICrypto.d.ts +58 -58
  99. package/dist/crypto/ICrypto.mjs +30 -30
  100. package/dist/crypto/IGuidGenerator.d.ts +4 -4
  101. package/dist/crypto/JoseHeader.d.ts +22 -22
  102. package/dist/crypto/JoseHeader.mjs +37 -37
  103. package/dist/crypto/PopTokenGenerator.d.ts +60 -60
  104. package/dist/crypto/PopTokenGenerator.mjs +82 -82
  105. package/dist/crypto/SignedHttpRequest.d.ts +11 -11
  106. package/dist/error/AuthError.d.ts +44 -44
  107. package/dist/error/AuthError.mjs +46 -46
  108. package/dist/error/AuthErrorCodes.d.ts +5 -5
  109. package/dist/error/AuthErrorCodes.mjs +9 -9
  110. package/dist/error/ClientAuthError.d.ts +237 -232
  111. package/dist/error/ClientAuthError.d.ts.map +1 -1
  112. package/dist/error/ClientAuthError.mjs +250 -245
  113. package/dist/error/ClientAuthError.mjs.map +1 -1
  114. package/dist/error/ClientAuthErrorCodes.d.ts +44 -43
  115. package/dist/error/ClientAuthErrorCodes.d.ts.map +1 -1
  116. package/dist/error/ClientAuthErrorCodes.mjs +50 -49
  117. package/dist/error/ClientAuthErrorCodes.mjs.map +1 -1
  118. package/dist/error/ClientConfigurationError.d.ts +128 -128
  119. package/dist/error/ClientConfigurationError.mjs +135 -135
  120. package/dist/error/ClientConfigurationErrorCodes.d.ts +22 -22
  121. package/dist/error/ClientConfigurationErrorCodes.mjs +26 -26
  122. package/dist/error/InteractionRequiredAuthError.d.ts +57 -57
  123. package/dist/error/InteractionRequiredAuthError.mjs +76 -76
  124. package/dist/error/InteractionRequiredAuthErrorCodes.d.ts +5 -5
  125. package/dist/error/InteractionRequiredAuthErrorCodes.mjs +11 -11
  126. package/dist/error/JoseHeaderError.d.ts +15 -15
  127. package/dist/error/JoseHeaderError.mjs +22 -22
  128. package/dist/error/JoseHeaderErrorCodes.d.ts +2 -2
  129. package/dist/error/JoseHeaderErrorCodes.mjs +6 -6
  130. package/dist/error/ServerError.d.ts +7 -7
  131. package/dist/error/ServerError.mjs +14 -14
  132. package/dist/index.cjs +8840 -8677
  133. package/dist/index.cjs.map +1 -1
  134. package/dist/index.d.ts +96 -96
  135. package/dist/index.d.ts.map +1 -1
  136. package/dist/index.mjs +3 -3
  137. package/dist/logger/Logger.d.ts +95 -95
  138. package/dist/logger/Logger.mjs +188 -188
  139. package/dist/network/INetworkModule.d.ts +29 -29
  140. package/dist/network/INetworkModule.mjs +12 -12
  141. package/dist/network/NetworkManager.d.ts +33 -33
  142. package/dist/network/NetworkManager.mjs +34 -34
  143. package/dist/network/RequestThumbprint.d.ts +16 -16
  144. package/dist/network/ThrottlingUtils.d.ts +42 -42
  145. package/dist/network/ThrottlingUtils.mjs +95 -95
  146. package/dist/packageMetadata.d.ts +2 -2
  147. package/dist/packageMetadata.d.ts.map +1 -1
  148. package/dist/packageMetadata.mjs +4 -4
  149. package/dist/packageMetadata.mjs.map +1 -1
  150. package/dist/request/AuthenticationHeaderParser.d.ts +19 -19
  151. package/dist/request/AuthenticationHeaderParser.mjs +55 -55
  152. package/dist/request/BaseAuthRequest.d.ts +40 -40
  153. package/dist/request/CommonAuthorizationCodeRequest.d.ts +27 -27
  154. package/dist/request/CommonAuthorizationUrlRequest.d.ts +50 -50
  155. package/dist/request/CommonClientCredentialRequest.d.ts +17 -17
  156. package/dist/request/CommonDeviceCodeRequest.d.ts +21 -21
  157. package/dist/request/CommonEndSessionRequest.d.ts +21 -21
  158. package/dist/request/CommonOnBehalfOfRequest.d.ts +13 -13
  159. package/dist/request/CommonRefreshTokenRequest.d.ts +22 -22
  160. package/dist/request/CommonSilentFlowRequest.d.ts +20 -20
  161. package/dist/request/CommonUsernamePasswordRequest.d.ts +17 -17
  162. package/dist/request/NativeRequest.d.ts +19 -19
  163. package/dist/request/NativeSignOutRequest.d.ts +5 -5
  164. package/dist/request/RequestParameterBuilder.d.ts +217 -217
  165. package/dist/request/RequestParameterBuilder.mjs +381 -381
  166. package/dist/request/RequestValidator.d.ts +33 -33
  167. package/dist/request/RequestValidator.mjs +81 -81
  168. package/dist/request/ScopeSet.d.ts +88 -88
  169. package/dist/request/ScopeSet.mjs +197 -197
  170. package/dist/request/StoreInCache.d.ts +8 -8
  171. package/dist/response/AuthenticationResult.d.ts +41 -41
  172. package/dist/response/AuthorizationCodePayload.d.ts +13 -13
  173. package/dist/response/DeviceCodeResponse.d.ts +25 -25
  174. package/dist/response/ExternalTokenResponse.d.ts +15 -15
  175. package/dist/response/IMDSBadResponse.d.ts +4 -4
  176. package/dist/response/ResponseHandler.d.ts +67 -67
  177. package/dist/response/ResponseHandler.d.ts.map +1 -1
  178. package/dist/response/ResponseHandler.mjs +315 -311
  179. package/dist/response/ResponseHandler.mjs.map +1 -1
  180. package/dist/response/ServerAuthorizationCodeResponse.d.ts +25 -25
  181. package/dist/response/ServerAuthorizationTokenResponse.d.ts +46 -46
  182. package/dist/telemetry/performance/IPerformanceClient.d.ts +51 -51
  183. package/dist/telemetry/performance/IPerformanceMeasurement.d.ts +5 -5
  184. package/dist/telemetry/performance/PerformanceClient.d.ts +191 -191
  185. package/dist/telemetry/performance/PerformanceClient.mjs +409 -409
  186. package/dist/telemetry/performance/PerformanceEvent.d.ts +457 -441
  187. package/dist/telemetry/performance/PerformanceEvent.d.ts.map +1 -1
  188. package/dist/telemetry/performance/PerformanceEvent.mjs +249 -242
  189. package/dist/telemetry/performance/PerformanceEvent.mjs.map +1 -1
  190. package/dist/telemetry/performance/StubPerformanceClient.d.ts +24 -24
  191. package/dist/telemetry/performance/StubPerformanceClient.mjs +76 -76
  192. package/dist/telemetry/server/ServerTelemetryManager.d.ts +66 -66
  193. package/dist/telemetry/server/ServerTelemetryManager.mjs +197 -197
  194. package/dist/telemetry/server/ServerTelemetryRequest.d.ts +8 -8
  195. package/dist/url/IUri.d.ts +12 -12
  196. package/dist/url/UrlString.d.ts +83 -83
  197. package/dist/url/UrlString.mjs +279 -279
  198. package/dist/utils/Constants.d.ts +368 -366
  199. package/dist/utils/Constants.d.ts.map +1 -1
  200. package/dist/utils/Constants.mjs +381 -378
  201. package/dist/utils/Constants.mjs.map +1 -1
  202. package/dist/utils/FunctionWrappers.d.ts +27 -27
  203. package/dist/utils/FunctionWrappers.mjs +84 -84
  204. package/dist/utils/MsalTypes.d.ts +6 -6
  205. package/dist/utils/ProtocolUtils.d.ts +42 -42
  206. package/dist/utils/ProtocolUtils.mjs +69 -69
  207. package/dist/utils/StringUtils.d.ts +40 -40
  208. package/dist/utils/StringUtils.mjs +95 -95
  209. package/dist/utils/TimeUtils.d.ts +27 -27
  210. package/dist/utils/TimeUtils.mjs +45 -45
  211. package/package.json +1 -1
  212. package/src/authority/Authority.ts +216 -130
  213. package/src/authority/AuthorityFactory.ts +4 -4
  214. package/src/authority/AuthorityMetadata.ts +87 -0
  215. package/src/authority/AuthorityOptions.ts +9 -0
  216. package/src/cache/CacheManager.ts +120 -52
  217. package/src/cache/entities/AccountEntity.ts +0 -3
  218. package/src/cache/utils/CacheTypes.ts +1 -0
  219. package/src/client/AuthorizationCodeClient.ts +9 -2
  220. package/src/client/BaseClient.ts +9 -6
  221. package/src/client/RefreshTokenClient.ts +17 -7
  222. package/src/client/SilentFlowClient.ts +49 -49
  223. package/src/config/ClientConfiguration.ts +4 -4
  224. package/src/error/ClientAuthError.ts +8 -0
  225. package/src/error/ClientAuthErrorCodes.ts +1 -0
  226. package/src/index.ts +7 -1
  227. package/src/packageMetadata.ts +1 -1
  228. package/src/response/ResponseHandler.ts +9 -3
  229. package/src/telemetry/performance/PerformanceEvent.ts +24 -2
  230. package/src/utils/Constants.ts +4 -0
@@ -1,4 +1,4 @@
1
- /*! @azure/msal-common v14.1.0 2023-10-05 */
1
+ /*! @azure/msal-common v14.2.0-alpha.0 2023-12-07 */
2
2
  'use strict';
3
3
  import { isOidcProtocolMode } from '../config/ClientConfiguration.mjs';
4
4
  import { BaseClient } from './BaseClient.mjs';
@@ -16,196 +16,196 @@ import { CcsCredentialType } from '../account/CcsCredential.mjs';
16
16
  import { buildClientInfoFromHomeAccountId } from '../account/ClientInfo.mjs';
17
17
  import { createInteractionRequiredAuthError, InteractionRequiredAuthError } from '../error/InteractionRequiredAuthError.mjs';
18
18
  import { PerformanceEvents } from '../telemetry/performance/PerformanceEvent.mjs';
19
- import { invokeAsync } from '../utils/FunctionWrappers.mjs';
19
+ import { invokeAsync, invoke } from '../utils/FunctionWrappers.mjs';
20
20
  import { tokenRequestEmpty, missingSshJwk } from '../error/ClientConfigurationErrorCodes.mjs';
21
21
  import { noAccountInSilentRequest } from '../error/ClientAuthErrorCodes.mjs';
22
22
  import { noTokensFound } from '../error/InteractionRequiredAuthErrorCodes.mjs';
23
23
 
24
- /*
25
- * Copyright (c) Microsoft Corporation. All rights reserved.
26
- * Licensed under the MIT License.
27
- */
28
- /**
29
- * OAuth2.0 refresh token client
30
- * @internal
31
- */
32
- class RefreshTokenClient extends BaseClient {
33
- constructor(configuration, performanceClient) {
34
- super(configuration, performanceClient);
35
- }
36
- async acquireToken(request) {
37
- this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
38
- const reqTimestamp = TimeUtils.nowSeconds();
39
- const response = await invokeAsync(this.executeTokenRequest.bind(this), PerformanceEvents.RefreshTokenClientExecuteTokenRequest, this.logger, this.performanceClient, request.correlationId)(request, this.authority);
40
- // Retrieve requestId from response headers
41
- const requestId = response.headers?.[HeaderNames.X_MS_REQUEST_ID];
42
- const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
43
- responseHandler.validateTokenResponse(response.body);
44
- return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache, requestId);
45
- }
46
- /**
47
- * Gets cached refresh token and attaches to request, then calls acquireToken API
48
- * @param request
49
- */
50
- async acquireTokenByRefreshToken(request) {
51
- // Cannot renew token if no request object is given.
52
- if (!request) {
53
- throw createClientConfigurationError(tokenRequestEmpty);
54
- }
55
- this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, request.correlationId);
56
- // We currently do not support silent flow for account === null use cases; This will be revisited for confidential flow usecases
57
- if (!request.account) {
58
- throw createClientAuthError(noAccountInSilentRequest);
59
- }
60
- // try checking if FOCI is enabled for the given application
61
- const isFOCI = this.cacheManager.isAppMetadataFOCI(request.account.environment);
62
- // if the app is part of the family, retrive a Family refresh token if present and make a refreshTokenRequest
63
- if (isFOCI) {
64
- try {
65
- return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, true);
66
- }
67
- catch (e) {
68
- const noFamilyRTInCache = e instanceof InteractionRequiredAuthError &&
69
- e.errorCode ===
70
- noTokensFound;
71
- const clientMismatchErrorWithFamilyRT = e instanceof ServerError &&
72
- e.errorCode === Errors.INVALID_GRANT_ERROR &&
73
- e.subError === Errors.CLIENT_MISMATCH_ERROR;
74
- // if family Refresh Token (FRT) cache acquisition fails or if client_mismatch error is seen with FRT, reattempt with application Refresh Token (ART)
75
- if (noFamilyRTInCache || clientMismatchErrorWithFamilyRT) {
76
- return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
77
- // throw in all other cases
78
- }
79
- else {
80
- throw e;
81
- }
82
- }
83
- }
84
- // fall back to application refresh token acquisition
85
- return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
86
- }
87
- /**
88
- * makes a network call to acquire tokens by exchanging RefreshToken available in userCache; throws if refresh token is not cached
89
- * @param request
90
- */
91
- async acquireTokenWithCachedRefreshToken(request, foci) {
92
- this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
93
- // fetches family RT or application RT based on FOCI value
94
- const refreshToken = this.cacheManager.getRefreshToken(request.account, foci);
95
- if (!refreshToken) {
96
- throw createInteractionRequiredAuthError(noTokensFound);
97
- }
98
- // attach cached RT size to the current measurement
99
- const refreshTokenRequest = {
100
- ...request,
101
- refreshToken: refreshToken.secret,
102
- authenticationScheme: request.authenticationScheme || AuthenticationScheme.BEARER,
103
- ccsCredential: {
104
- credential: request.account.homeAccountId,
105
- type: CcsCredentialType.HOME_ACCOUNT_ID,
106
- },
107
- };
108
- return invokeAsync(this.acquireToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(refreshTokenRequest);
109
- }
110
- /**
111
- * Constructs the network message and makes a NW call to the underlying secure token service
112
- * @param request
113
- * @param authority
114
- */
115
- async executeTokenRequest(request, authority) {
116
- this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
117
- const queryParametersString = this.createTokenQueryParameters(request);
118
- const endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParametersString);
119
- const requestBody = await invokeAsync(this.createTokenRequestBody.bind(this), PerformanceEvents.RefreshTokenClientCreateTokenRequestBody, this.logger, this.performanceClient, request.correlationId)(request);
120
- const headers = this.createTokenRequestHeaders(request.ccsCredential);
121
- const thumbprint = {
122
- clientId: request.tokenBodyParameters?.clientId ||
123
- this.config.authOptions.clientId,
124
- authority: authority.canonicalAuthority,
125
- scopes: request.scopes,
126
- claims: request.claims,
127
- authenticationScheme: request.authenticationScheme,
128
- resourceRequestMethod: request.resourceRequestMethod,
129
- resourceRequestUri: request.resourceRequestUri,
130
- shrClaims: request.shrClaims,
131
- sshKid: request.sshKid,
132
- };
133
- return invokeAsync(this.executePostToTokenEndpoint.bind(this), PerformanceEvents.BaseClientExecutePostToTokenEndpoint, this.logger, this.performanceClient, request.correlationId)(endpoint, requestBody, headers, thumbprint, request.correlationId);
134
- }
135
- /**
136
- * Helper function to create the token request body
137
- * @param request
138
- */
139
- async createTokenRequestBody(request) {
140
- this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientCreateTokenRequestBody, request.correlationId);
141
- const correlationId = request.correlationId;
142
- const parameterBuilder = new RequestParameterBuilder();
143
- parameterBuilder.addClientId(request.tokenBodyParameters?.[AADServerParamKeys.CLIENT_ID] ||
144
- this.config.authOptions.clientId);
145
- if (request.redirectUri) {
146
- parameterBuilder.addRedirectUri(request.redirectUri);
147
- }
148
- parameterBuilder.addScopes(request.scopes, true, this.config.authOptions.authority.options.OIDCOptions?.defaultScopes);
149
- parameterBuilder.addGrantType(GrantType.REFRESH_TOKEN_GRANT);
150
- parameterBuilder.addClientInfo();
151
- parameterBuilder.addLibraryInfo(this.config.libraryInfo);
152
- parameterBuilder.addApplicationTelemetry(this.config.telemetry.application);
153
- parameterBuilder.addThrottling();
154
- if (this.serverTelemetryManager && !isOidcProtocolMode(this.config)) {
155
- parameterBuilder.addServerTelemetry(this.serverTelemetryManager);
156
- }
157
- parameterBuilder.addCorrelationId(correlationId);
158
- parameterBuilder.addRefreshToken(request.refreshToken);
159
- if (this.config.clientCredentials.clientSecret) {
160
- parameterBuilder.addClientSecret(this.config.clientCredentials.clientSecret);
161
- }
162
- if (this.config.clientCredentials.clientAssertion) {
163
- const clientAssertion = this.config.clientCredentials.clientAssertion;
164
- parameterBuilder.addClientAssertion(clientAssertion.assertion);
165
- parameterBuilder.addClientAssertionType(clientAssertion.assertionType);
166
- }
167
- if (request.authenticationScheme === AuthenticationScheme.POP) {
168
- const popTokenGenerator = new PopTokenGenerator(this.cryptoUtils, this.performanceClient);
169
- const reqCnfData = await invokeAsync(popTokenGenerator.generateCnf.bind(popTokenGenerator), PerformanceEvents.PopTokenGenerateCnf, this.logger, this.performanceClient, request.correlationId)(request, this.logger);
170
- // SPA PoP requires full Base64Url encoded req_cnf string (unhashed)
171
- parameterBuilder.addPopToken(reqCnfData.reqCnfString);
172
- }
173
- else if (request.authenticationScheme === AuthenticationScheme.SSH) {
174
- if (request.sshJwk) {
175
- parameterBuilder.addSshJwk(request.sshJwk);
176
- }
177
- else {
178
- throw createClientConfigurationError(missingSshJwk);
179
- }
180
- }
181
- if (!StringUtils.isEmptyObj(request.claims) ||
182
- (this.config.authOptions.clientCapabilities &&
183
- this.config.authOptions.clientCapabilities.length > 0)) {
184
- parameterBuilder.addClaims(request.claims, this.config.authOptions.clientCapabilities);
185
- }
186
- if (this.config.systemOptions.preventCorsPreflight &&
187
- request.ccsCredential) {
188
- switch (request.ccsCredential.type) {
189
- case CcsCredentialType.HOME_ACCOUNT_ID:
190
- try {
191
- const clientInfo = buildClientInfoFromHomeAccountId(request.ccsCredential.credential);
192
- parameterBuilder.addCcsOid(clientInfo);
193
- }
194
- catch (e) {
195
- this.logger.verbose("Could not parse home account ID for CCS Header: " +
196
- e);
197
- }
198
- break;
199
- case CcsCredentialType.UPN:
200
- parameterBuilder.addCcsUpn(request.ccsCredential.credential);
201
- break;
202
- }
203
- }
204
- if (request.tokenBodyParameters) {
205
- parameterBuilder.addExtraQueryParameters(request.tokenBodyParameters);
206
- }
207
- return parameterBuilder.createQueryString();
208
- }
24
+ /*
25
+ * Copyright (c) Microsoft Corporation. All rights reserved.
26
+ * Licensed under the MIT License.
27
+ */
28
+ /**
29
+ * OAuth2.0 refresh token client
30
+ * @internal
31
+ */
32
+ class RefreshTokenClient extends BaseClient {
33
+ constructor(configuration, performanceClient) {
34
+ super(configuration, performanceClient);
35
+ }
36
+ async acquireToken(request) {
37
+ this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
38
+ const reqTimestamp = TimeUtils.nowSeconds();
39
+ const response = await invokeAsync(this.executeTokenRequest.bind(this), PerformanceEvents.RefreshTokenClientExecuteTokenRequest, this.logger, this.performanceClient, request.correlationId)(request, this.authority);
40
+ // Retrieve requestId from response headers
41
+ const requestId = response.headers?.[HeaderNames.X_MS_REQUEST_ID];
42
+ const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
43
+ responseHandler.validateTokenResponse(response.body);
44
+ return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache, requestId);
45
+ }
46
+ /**
47
+ * Gets cached refresh token and attaches to request, then calls acquireToken API
48
+ * @param request
49
+ */
50
+ async acquireTokenByRefreshToken(request) {
51
+ // Cannot renew token if no request object is given.
52
+ if (!request) {
53
+ throw createClientConfigurationError(tokenRequestEmpty);
54
+ }
55
+ this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, request.correlationId);
56
+ // We currently do not support silent flow for account === null use cases; This will be revisited for confidential flow usecases
57
+ if (!request.account) {
58
+ throw createClientAuthError(noAccountInSilentRequest);
59
+ }
60
+ // try checking if FOCI is enabled for the given application
61
+ const isFOCI = this.cacheManager.isAppMetadataFOCI(request.account.environment);
62
+ // if the app is part of the family, retrive a Family refresh token if present and make a refreshTokenRequest
63
+ if (isFOCI) {
64
+ try {
65
+ return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, true);
66
+ }
67
+ catch (e) {
68
+ const noFamilyRTInCache = e instanceof InteractionRequiredAuthError &&
69
+ e.errorCode ===
70
+ noTokensFound;
71
+ const clientMismatchErrorWithFamilyRT = e instanceof ServerError &&
72
+ e.errorCode === Errors.INVALID_GRANT_ERROR &&
73
+ e.subError === Errors.CLIENT_MISMATCH_ERROR;
74
+ // if family Refresh Token (FRT) cache acquisition fails or if client_mismatch error is seen with FRT, reattempt with application Refresh Token (ART)
75
+ if (noFamilyRTInCache || clientMismatchErrorWithFamilyRT) {
76
+ return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
77
+ // throw in all other cases
78
+ }
79
+ else {
80
+ throw e;
81
+ }
82
+ }
83
+ }
84
+ // fall back to application refresh token acquisition
85
+ return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
86
+ }
87
+ /**
88
+ * makes a network call to acquire tokens by exchanging RefreshToken available in userCache; throws if refresh token is not cached
89
+ * @param request
90
+ */
91
+ async acquireTokenWithCachedRefreshToken(request, foci) {
92
+ this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
93
+ // fetches family RT or application RT based on FOCI value
94
+ const refreshToken = invoke(this.cacheManager.getRefreshToken.bind(this.cacheManager), PerformanceEvents.CacheManagerGetRefreshToken, this.logger, this.performanceClient, request.correlationId)(request.account, foci);
95
+ if (!refreshToken) {
96
+ throw createInteractionRequiredAuthError(noTokensFound);
97
+ }
98
+ // attach cached RT size to the current measurement
99
+ const refreshTokenRequest = {
100
+ ...request,
101
+ refreshToken: refreshToken.secret,
102
+ authenticationScheme: request.authenticationScheme || AuthenticationScheme.BEARER,
103
+ ccsCredential: {
104
+ credential: request.account.homeAccountId,
105
+ type: CcsCredentialType.HOME_ACCOUNT_ID,
106
+ },
107
+ };
108
+ return invokeAsync(this.acquireToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(refreshTokenRequest);
109
+ }
110
+ /**
111
+ * Constructs the network message and makes a NW call to the underlying secure token service
112
+ * @param request
113
+ * @param authority
114
+ */
115
+ async executeTokenRequest(request, authority) {
116
+ this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
117
+ const queryParametersString = this.createTokenQueryParameters(request);
118
+ const endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParametersString);
119
+ const requestBody = await invokeAsync(this.createTokenRequestBody.bind(this), PerformanceEvents.RefreshTokenClientCreateTokenRequestBody, this.logger, this.performanceClient, request.correlationId)(request);
120
+ const headers = this.createTokenRequestHeaders(request.ccsCredential);
121
+ const thumbprint = {
122
+ clientId: request.tokenBodyParameters?.clientId ||
123
+ this.config.authOptions.clientId,
124
+ authority: authority.canonicalAuthority,
125
+ scopes: request.scopes,
126
+ claims: request.claims,
127
+ authenticationScheme: request.authenticationScheme,
128
+ resourceRequestMethod: request.resourceRequestMethod,
129
+ resourceRequestUri: request.resourceRequestUri,
130
+ shrClaims: request.shrClaims,
131
+ sshKid: request.sshKid,
132
+ };
133
+ return invokeAsync(this.executePostToTokenEndpoint.bind(this), PerformanceEvents.RefreshTokenClientExecutePostToTokenEndpoint, this.logger, this.performanceClient, request.correlationId)(endpoint, requestBody, headers, thumbprint, request.correlationId, PerformanceEvents.RefreshTokenClientExecutePostToTokenEndpoint);
134
+ }
135
+ /**
136
+ * Helper function to create the token request body
137
+ * @param request
138
+ */
139
+ async createTokenRequestBody(request) {
140
+ this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientCreateTokenRequestBody, request.correlationId);
141
+ const correlationId = request.correlationId;
142
+ const parameterBuilder = new RequestParameterBuilder();
143
+ parameterBuilder.addClientId(request.tokenBodyParameters?.[AADServerParamKeys.CLIENT_ID] ||
144
+ this.config.authOptions.clientId);
145
+ if (request.redirectUri) {
146
+ parameterBuilder.addRedirectUri(request.redirectUri);
147
+ }
148
+ parameterBuilder.addScopes(request.scopes, true, this.config.authOptions.authority.options.OIDCOptions?.defaultScopes);
149
+ parameterBuilder.addGrantType(GrantType.REFRESH_TOKEN_GRANT);
150
+ parameterBuilder.addClientInfo();
151
+ parameterBuilder.addLibraryInfo(this.config.libraryInfo);
152
+ parameterBuilder.addApplicationTelemetry(this.config.telemetry.application);
153
+ parameterBuilder.addThrottling();
154
+ if (this.serverTelemetryManager && !isOidcProtocolMode(this.config)) {
155
+ parameterBuilder.addServerTelemetry(this.serverTelemetryManager);
156
+ }
157
+ parameterBuilder.addCorrelationId(correlationId);
158
+ parameterBuilder.addRefreshToken(request.refreshToken);
159
+ if (this.config.clientCredentials.clientSecret) {
160
+ parameterBuilder.addClientSecret(this.config.clientCredentials.clientSecret);
161
+ }
162
+ if (this.config.clientCredentials.clientAssertion) {
163
+ const clientAssertion = this.config.clientCredentials.clientAssertion;
164
+ parameterBuilder.addClientAssertion(clientAssertion.assertion);
165
+ parameterBuilder.addClientAssertionType(clientAssertion.assertionType);
166
+ }
167
+ if (request.authenticationScheme === AuthenticationScheme.POP) {
168
+ const popTokenGenerator = new PopTokenGenerator(this.cryptoUtils, this.performanceClient);
169
+ const reqCnfData = await invokeAsync(popTokenGenerator.generateCnf.bind(popTokenGenerator), PerformanceEvents.PopTokenGenerateCnf, this.logger, this.performanceClient, request.correlationId)(request, this.logger);
170
+ // SPA PoP requires full Base64Url encoded req_cnf string (unhashed)
171
+ parameterBuilder.addPopToken(reqCnfData.reqCnfString);
172
+ }
173
+ else if (request.authenticationScheme === AuthenticationScheme.SSH) {
174
+ if (request.sshJwk) {
175
+ parameterBuilder.addSshJwk(request.sshJwk);
176
+ }
177
+ else {
178
+ throw createClientConfigurationError(missingSshJwk);
179
+ }
180
+ }
181
+ if (!StringUtils.isEmptyObj(request.claims) ||
182
+ (this.config.authOptions.clientCapabilities &&
183
+ this.config.authOptions.clientCapabilities.length > 0)) {
184
+ parameterBuilder.addClaims(request.claims, this.config.authOptions.clientCapabilities);
185
+ }
186
+ if (this.config.systemOptions.preventCorsPreflight &&
187
+ request.ccsCredential) {
188
+ switch (request.ccsCredential.type) {
189
+ case CcsCredentialType.HOME_ACCOUNT_ID:
190
+ try {
191
+ const clientInfo = buildClientInfoFromHomeAccountId(request.ccsCredential.credential);
192
+ parameterBuilder.addCcsOid(clientInfo);
193
+ }
194
+ catch (e) {
195
+ this.logger.verbose("Could not parse home account ID for CCS Header: " +
196
+ e);
197
+ }
198
+ break;
199
+ case CcsCredentialType.UPN:
200
+ parameterBuilder.addCcsUpn(request.ccsCredential.credential);
201
+ break;
202
+ }
203
+ }
204
+ if (request.tokenBodyParameters) {
205
+ parameterBuilder.addExtraQueryParameters(request.tokenBodyParameters);
206
+ }
207
+ return parameterBuilder.createQueryString();
208
+ }
209
209
  }
210
210
 
211
211
  export { RefreshTokenClient };
@@ -1 +1 @@
1
- {"version":3,"file":"RefreshTokenClient.mjs","sources":["../../src/client/RefreshTokenClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAKA;AAIA;AACA;AAYA;AAqKO;;AA2CH;;;;AAIG,QAAA,KAAA,CAAA,aAAA,EAAA,iBAAA,CAAA,CAAA;;AAiDH,IAAA,MAAA,YAAA,CAAA,OAAA,EAAA;;;AAGG,QAAA,MAAA,QAAA,GAAA,MAAA,WAAA,CAAA,IAAA,CAAA,mBAAA,CAAA,IAAA,CAAA,IAAA,CAAA,EAAA,iBAAA,CAAA,qCAAA,EAAA,IAAA,CAAA,MAAA,EAAA,IAAA,CAAA,iBAAA,EAAA,OAAA,CAAA,aAAA,CAAA,CAAA,OAAA,EAAA,IAAA,CAAA,SAAA,CAAA,CAAA;;AAiIN,QAAA,MAAA,SAAA,GAAA,QAAA,CAAA,OAAA,GAAA,WAAA,CAAA,eAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
1
+ {"version":3,"file":"RefreshTokenClient.mjs","sources":["../../src/client/RefreshTokenClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAKA;AAIA;AACA;AAYA;AAqKO;;AA8CH;;;;AAIG,QAAA,KAAA,CAAA,aAAA,EAAA,iBAAA,CAAA,CAAA;;AAwDH,IAAA,MAAA,YAAA,CAAA,OAAA,EAAA;;;AAGG,QAAA,MAAA,QAAA,GAAA,MAAA,WAAA,CAAA,IAAA,CAAA,mBAAA,CAAA,IAAA,CAAA,IAAA,CAAA,EAAA,iBAAA,CAAA,qCAAA,EAAA,IAAA,CAAA,MAAA,EAAA,IAAA,CAAA,iBAAA,EAAA,OAAA,CAAA,aAAA,CAAA,CAAA,OAAA,EAAA,IAAA,CAAA,SAAA,CAAA,CAAA;;AAiIN,QAAA,MAAA,SAAA,GAAA,QAAA,CAAA,OAAA,GAAA,WAAA,CAAA,eAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
@@ -1,27 +1,28 @@
1
- import { BaseClient } from "./BaseClient";
2
- import { ClientConfiguration } from "../config/ClientConfiguration";
3
- import { CommonSilentFlowRequest } from "../request/CommonSilentFlowRequest";
4
- import { AuthenticationResult } from "../response/AuthenticationResult";
5
- import { CacheOutcome } from "../utils/Constants";
6
- import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient";
7
- /** @internal */
8
- export declare class SilentFlowClient extends BaseClient {
9
- constructor(configuration: ClientConfiguration, performanceClient?: IPerformanceClient);
10
- /**
11
- * Retrieves a token from cache if it is still valid, or uses the cached refresh token to renew
12
- * the given token and returns the renewed token
13
- * @param request
14
- */
15
- acquireToken(request: CommonSilentFlowRequest): Promise<AuthenticationResult>;
16
- /**
17
- * Retrieves token from cache or throws an error if it must be refreshed.
18
- * @param request
19
- */
20
- acquireCachedToken(request: CommonSilentFlowRequest): Promise<[AuthenticationResult, CacheOutcome]>;
21
- /**
22
- * Helper function to build response object from the CacheRecord
23
- * @param cacheRecord
24
- */
25
- private generateResultFromCacheRecord;
26
- }
1
+ import { BaseClient } from "./BaseClient";
2
+ import { ClientConfiguration } from "../config/ClientConfiguration";
3
+ import { CommonSilentFlowRequest } from "../request/CommonSilentFlowRequest";
4
+ import { AuthenticationResult } from "../response/AuthenticationResult";
5
+ import { CacheOutcome } from "../utils/Constants";
6
+ import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient";
7
+ /** @internal */
8
+ export declare class SilentFlowClient extends BaseClient {
9
+ constructor(configuration: ClientConfiguration, performanceClient?: IPerformanceClient);
10
+ /**
11
+ * Retrieves a token from cache if it is still valid, or uses the cached refresh token to renew
12
+ * the given token and returns the renewed token
13
+ * @param request
14
+ */
15
+ acquireToken(request: CommonSilentFlowRequest): Promise<AuthenticationResult>;
16
+ /**
17
+ * Retrieves token from cache or throws an error if it must be refreshed.
18
+ * @param request
19
+ */
20
+ acquireCachedToken(request: CommonSilentFlowRequest): Promise<[AuthenticationResult, CacheOutcome]>;
21
+ private setCacheOutcome;
22
+ /**
23
+ * Helper function to build response object from the CacheRecord
24
+ * @param cacheRecord
25
+ */
26
+ private generateResultFromCacheRecord;
27
+ }
27
28
  //# sourceMappingURL=SilentFlowClient.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"SilentFlowClient.d.ts","sourceRoot":"","sources":["../../src/client/SilentFlowClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAcxE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAKjF,gBAAgB;AAChB,qBAAa,gBAAiB,SAAQ,UAAU;gBAExC,aAAa,EAAE,mBAAmB,EAClC,iBAAiB,CAAC,EAAE,kBAAkB;IAK1C;;;;OAIG;IACG,YAAY,CACd,OAAO,EAAE,uBAAuB,GACjC,OAAO,CAAC,oBAAoB,CAAC;IA2ChC;;;OAGG;IACG,kBAAkB,CACpB,OAAO,EAAE,uBAAuB,GACjC,OAAO,CAAC,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;IA4GhD;;;OAGG;YACW,6BAA6B;CAiC9C"}
1
+ {"version":3,"file":"SilentFlowClient.d.ts","sourceRoot":"","sources":["../../src/client/SilentFlowClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAUxE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAOjF,gBAAgB;AAChB,qBAAa,gBAAiB,SAAQ,UAAU;gBAExC,aAAa,EAAE,mBAAmB,EAClC,iBAAiB,CAAC,EAAE,kBAAkB;IAK1C;;;;OAIG;IACG,YAAY,CACd,OAAO,EAAE,uBAAuB,GACjC,OAAO,CAAC,oBAAoB,CAAC;IA2ChC;;;OAGG;IACG,kBAAkB,CACpB,OAAO,EAAE,uBAAuB,GACjC,OAAO,CAAC,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;IA0FhD,OAAO,CAAC,eAAe;IAgBvB;;;OAGG;YACW,6BAA6B;CAqC9C"}