@azure/msal-common 14.1.0-alpha.0 → 14.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/account/AccountInfo.d.ts +31 -32
- package/dist/account/AccountInfo.d.ts.map +1 -1
- package/dist/account/AuthToken.d.ts +17 -17
- package/dist/account/AuthToken.mjs +58 -58
- package/dist/account/CcsCredential.d.ts +9 -9
- package/dist/account/CcsCredential.mjs +8 -8
- package/dist/account/ClientCredentials.d.ts +14 -14
- package/dist/account/ClientInfo.d.ts +19 -19
- package/dist/account/ClientInfo.mjs +37 -37
- package/dist/account/TokenClaims.d.ts +65 -65
- package/dist/authority/Authority.d.ts +249 -235
- package/dist/authority/Authority.d.ts.map +1 -1
- package/dist/authority/Authority.mjs +791 -740
- package/dist/authority/Authority.mjs.map +1 -1
- package/dist/authority/AuthorityFactory.d.ts +31 -31
- package/dist/authority/AuthorityFactory.d.ts.map +1 -1
- package/dist/authority/AuthorityFactory.mjs +48 -48
- package/dist/authority/AuthorityMetadata.d.ts +646 -623
- package/dist/authority/AuthorityMetadata.d.ts.map +1 -1
- package/dist/authority/AuthorityMetadata.mjs +941 -885
- package/dist/authority/AuthorityMetadata.mjs.map +1 -1
- package/dist/authority/AuthorityOptions.d.ts +27 -21
- package/dist/authority/AuthorityOptions.d.ts.map +1 -1
- package/dist/authority/AuthorityOptions.mjs +18 -18
- package/dist/authority/AuthorityOptions.mjs.map +1 -1
- package/dist/authority/AuthorityType.d.ts +10 -10
- package/dist/authority/AuthorityType.mjs +13 -13
- package/dist/authority/AzureRegion.d.ts +1 -1
- package/dist/authority/AzureRegionConfiguration.d.ts +5 -5
- package/dist/authority/CloudDiscoveryMetadata.d.ts +5 -5
- package/dist/authority/CloudInstanceDiscoveryErrorResponse.d.ts +13 -13
- package/dist/authority/CloudInstanceDiscoveryErrorResponse.mjs +8 -8
- package/dist/authority/CloudInstanceDiscoveryResponse.d.ts +9 -9
- package/dist/authority/CloudInstanceDiscoveryResponse.mjs +8 -8
- package/dist/authority/ImdsOptions.d.ts +5 -5
- package/dist/authority/OIDCOptions.d.ts +8 -8
- package/dist/authority/OpenIdConfigResponse.d.ts +11 -11
- package/dist/authority/OpenIdConfigResponse.mjs +10 -10
- package/dist/authority/ProtocolMode.d.ts +8 -8
- package/dist/authority/ProtocolMode.mjs +11 -11
- package/dist/authority/RegionDiscovery.d.ts +32 -32
- package/dist/authority/RegionDiscovery.mjs +106 -106
- package/dist/authority/RegionDiscoveryMetadata.d.ts +6 -6
- package/dist/broker/nativeBroker/INativeBrokerPlugin.d.ts +15 -15
- package/dist/cache/CacheManager.d.ts +480 -446
- package/dist/cache/CacheManager.d.ts.map +1 -1
- package/dist/cache/CacheManager.mjs +1086 -998
- package/dist/cache/CacheManager.mjs.map +1 -1
- package/dist/cache/entities/AccessTokenEntity.d.ts +56 -56
- package/dist/cache/entities/AccessTokenEntity.mjs +109 -109
- package/dist/cache/entities/AccountEntity.d.ts +101 -101
- package/dist/cache/entities/AccountEntity.d.ts.map +1 -1
- package/dist/cache/entities/AccountEntity.mjs +218 -220
- package/dist/cache/entities/AccountEntity.mjs.map +1 -1
- package/dist/cache/entities/AppMetadataEntity.d.ts +39 -39
- package/dist/cache/entities/AppMetadataEntity.mjs +66 -66
- package/dist/cache/entities/AuthorityMetadataEntity.d.ts +48 -48
- package/dist/cache/entities/AuthorityMetadataEntity.mjs +78 -78
- package/dist/cache/entities/CacheRecord.d.ts +14 -14
- package/dist/cache/entities/CacheRecord.mjs +14 -14
- package/dist/cache/entities/CredentialEntity.d.ts +88 -88
- package/dist/cache/entities/CredentialEntity.mjs +136 -136
- package/dist/cache/entities/IdTokenEntity.d.ts +34 -34
- package/dist/cache/entities/IdTokenEntity.mjs +56 -56
- package/dist/cache/entities/RefreshTokenEntity.d.ts +36 -36
- package/dist/cache/entities/RefreshTokenEntity.mjs +59 -59
- package/dist/cache/entities/ServerTelemetryEntity.d.ts +12 -12
- package/dist/cache/entities/ServerTelemetryEntity.mjs +27 -27
- package/dist/cache/entities/ThrottlingEntity.d.ts +13 -13
- package/dist/cache/entities/ThrottlingEntity.mjs +23 -23
- package/dist/cache/interface/ICacheManager.d.ts +166 -166
- package/dist/cache/interface/ICachePlugin.d.ts +5 -5
- package/dist/cache/interface/ISerializableTokenCache.d.ts +4 -4
- package/dist/cache/persistence/TokenCacheContext.d.ts +23 -23
- package/dist/cache/persistence/TokenCacheContext.mjs +25 -25
- package/dist/cache/utils/CacheTypes.d.ts +67 -69
- package/dist/cache/utils/CacheTypes.d.ts.map +1 -1
- package/dist/client/AuthorizationCodeClient.d.ts +73 -73
- package/dist/client/AuthorizationCodeClient.d.ts.map +1 -1
- package/dist/client/AuthorizationCodeClient.mjs +408 -407
- package/dist/client/AuthorizationCodeClient.mjs.map +1 -1
- package/dist/client/BaseClient.d.ts +51 -51
- package/dist/client/BaseClient.d.ts.map +1 -1
- package/dist/client/BaseClient.mjs +100 -99
- package/dist/client/BaseClient.mjs.map +1 -1
- package/dist/client/RefreshTokenClient.d.ts +35 -35
- package/dist/client/RefreshTokenClient.d.ts.map +1 -1
- package/dist/client/RefreshTokenClient.mjs +188 -180
- package/dist/client/RefreshTokenClient.mjs.map +1 -1
- package/dist/client/SilentFlowClient.d.ts +27 -26
- package/dist/client/SilentFlowClient.d.ts.map +1 -1
- package/dist/client/SilentFlowClient.mjs +118 -125
- package/dist/client/SilentFlowClient.mjs.map +1 -1
- package/dist/config/AppTokenProvider.d.ts +38 -38
- package/dist/config/ClientConfiguration.d.ts +150 -150
- package/dist/config/ClientConfiguration.mjs +97 -97
- package/dist/crypto/ICrypto.d.ts +58 -62
- package/dist/crypto/ICrypto.d.ts.map +1 -1
- package/dist/crypto/ICrypto.mjs +30 -33
- package/dist/crypto/ICrypto.mjs.map +1 -1
- package/dist/crypto/IGuidGenerator.d.ts +4 -4
- package/dist/crypto/JoseHeader.d.ts +22 -22
- package/dist/crypto/JoseHeader.mjs +37 -37
- package/dist/crypto/PopTokenGenerator.d.ts +60 -60
- package/dist/crypto/PopTokenGenerator.mjs +82 -82
- package/dist/crypto/SignedHttpRequest.d.ts +11 -11
- package/dist/error/AuthError.d.ts +44 -44
- package/dist/error/AuthError.mjs +46 -46
- package/dist/error/AuthErrorCodes.d.ts +5 -5
- package/dist/error/AuthErrorCodes.mjs +9 -9
- package/dist/error/ClientAuthError.d.ts +237 -232
- package/dist/error/ClientAuthError.d.ts.map +1 -1
- package/dist/error/ClientAuthError.mjs +250 -245
- package/dist/error/ClientAuthError.mjs.map +1 -1
- package/dist/error/ClientAuthErrorCodes.d.ts +44 -43
- package/dist/error/ClientAuthErrorCodes.d.ts.map +1 -1
- package/dist/error/ClientAuthErrorCodes.mjs +49 -48
- package/dist/error/ClientAuthErrorCodes.mjs.map +1 -1
- package/dist/error/ClientConfigurationError.d.ts +128 -128
- package/dist/error/ClientConfigurationError.mjs +135 -135
- package/dist/error/ClientConfigurationErrorCodes.d.ts +22 -22
- package/dist/error/ClientConfigurationErrorCodes.mjs +26 -26
- package/dist/error/InteractionRequiredAuthError.d.ts +57 -57
- package/dist/error/InteractionRequiredAuthError.mjs +76 -76
- package/dist/error/InteractionRequiredAuthErrorCodes.d.ts +5 -5
- package/dist/error/InteractionRequiredAuthErrorCodes.mjs +11 -11
- package/dist/error/JoseHeaderError.d.ts +15 -15
- package/dist/error/JoseHeaderError.mjs +22 -22
- package/dist/error/JoseHeaderErrorCodes.d.ts +2 -2
- package/dist/error/JoseHeaderErrorCodes.mjs +6 -6
- package/dist/error/ServerError.d.ts +7 -7
- package/dist/error/ServerError.mjs +14 -14
- package/dist/index.cjs +8830 -8612
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +96 -96
- package/dist/index.d.ts.map +1 -1
- package/dist/index.mjs +2 -2
- package/dist/logger/Logger.d.ts +95 -95
- package/dist/logger/Logger.mjs +188 -188
- package/dist/network/INetworkModule.d.ts +29 -29
- package/dist/network/INetworkModule.mjs +12 -12
- package/dist/network/NetworkManager.d.ts +33 -33
- package/dist/network/NetworkManager.mjs +34 -34
- package/dist/network/RequestThumbprint.d.ts +16 -16
- package/dist/network/ThrottlingUtils.d.ts +42 -42
- package/dist/network/ThrottlingUtils.mjs +95 -95
- package/dist/packageMetadata.d.ts +2 -2
- package/dist/packageMetadata.mjs +4 -4
- package/dist/request/AuthenticationHeaderParser.d.ts +19 -19
- package/dist/request/AuthenticationHeaderParser.mjs +55 -55
- package/dist/request/BaseAuthRequest.d.ts +40 -40
- package/dist/request/CommonAuthorizationCodeRequest.d.ts +27 -27
- package/dist/request/CommonAuthorizationUrlRequest.d.ts +50 -50
- package/dist/request/CommonClientCredentialRequest.d.ts +17 -17
- package/dist/request/CommonDeviceCodeRequest.d.ts +21 -21
- package/dist/request/CommonEndSessionRequest.d.ts +21 -21
- package/dist/request/CommonOnBehalfOfRequest.d.ts +13 -13
- package/dist/request/CommonRefreshTokenRequest.d.ts +22 -19
- package/dist/request/CommonRefreshTokenRequest.d.ts.map +1 -1
- package/dist/request/CommonSilentFlowRequest.d.ts +20 -18
- package/dist/request/CommonSilentFlowRequest.d.ts.map +1 -1
- package/dist/request/CommonUsernamePasswordRequest.d.ts +17 -17
- package/dist/request/NativeRequest.d.ts +19 -19
- package/dist/request/NativeSignOutRequest.d.ts +5 -5
- package/dist/request/RequestParameterBuilder.d.ts +217 -217
- package/dist/request/RequestParameterBuilder.mjs +381 -381
- package/dist/request/RequestValidator.d.ts +33 -33
- package/dist/request/RequestValidator.mjs +81 -81
- package/dist/request/ScopeSet.d.ts +88 -88
- package/dist/request/ScopeSet.mjs +197 -197
- package/dist/request/StoreInCache.d.ts +8 -8
- package/dist/response/AuthenticationResult.d.ts +41 -41
- package/dist/response/AuthorizationCodePayload.d.ts +13 -13
- package/dist/response/DeviceCodeResponse.d.ts +25 -25
- package/dist/response/ExternalTokenResponse.d.ts +15 -15
- package/dist/response/IMDSBadResponse.d.ts +4 -4
- package/dist/response/ResponseHandler.d.ts +67 -67
- package/dist/response/ResponseHandler.d.ts.map +1 -1
- package/dist/response/ResponseHandler.mjs +315 -311
- package/dist/response/ResponseHandler.mjs.map +1 -1
- package/dist/response/ServerAuthorizationCodeResponse.d.ts +25 -25
- package/dist/response/ServerAuthorizationTokenResponse.d.ts +46 -46
- package/dist/telemetry/performance/IPerformanceClient.d.ts +51 -51
- package/dist/telemetry/performance/IPerformanceMeasurement.d.ts +5 -5
- package/dist/telemetry/performance/PerformanceClient.d.ts +191 -191
- package/dist/telemetry/performance/PerformanceClient.mjs +409 -409
- package/dist/telemetry/performance/PerformanceEvent.d.ts +457 -433
- package/dist/telemetry/performance/PerformanceEvent.d.ts.map +1 -1
- package/dist/telemetry/performance/PerformanceEvent.mjs +249 -234
- package/dist/telemetry/performance/PerformanceEvent.mjs.map +1 -1
- package/dist/telemetry/performance/StubPerformanceClient.d.ts +24 -24
- package/dist/telemetry/performance/StubPerformanceClient.mjs +76 -76
- package/dist/telemetry/server/ServerTelemetryManager.d.ts +66 -66
- package/dist/telemetry/server/ServerTelemetryManager.mjs +197 -197
- package/dist/telemetry/server/ServerTelemetryRequest.d.ts +8 -8
- package/dist/url/IUri.d.ts +12 -12
- package/dist/url/UrlString.d.ts +83 -83
- package/dist/url/UrlString.mjs +279 -279
- package/dist/utils/Constants.d.ts +366 -366
- package/dist/utils/Constants.mjs +376 -376
- package/dist/utils/FunctionWrappers.d.ts +27 -27
- package/dist/utils/FunctionWrappers.d.ts.map +1 -1
- package/dist/utils/FunctionWrappers.mjs +84 -85
- package/dist/utils/FunctionWrappers.mjs.map +1 -1
- package/dist/utils/MsalTypes.d.ts +6 -6
- package/dist/utils/ProtocolUtils.d.ts +42 -42
- package/dist/utils/ProtocolUtils.mjs +69 -69
- package/dist/utils/StringUtils.d.ts +40 -40
- package/dist/utils/StringUtils.mjs +95 -95
- package/dist/utils/TimeUtils.d.ts +27 -27
- package/dist/utils/TimeUtils.mjs +45 -45
- package/package.json +1 -1
- package/src/account/AccountInfo.ts +0 -1
- package/src/authority/Authority.ts +207 -127
- package/src/authority/AuthorityFactory.ts +4 -4
- package/src/authority/AuthorityMetadata.ts +87 -0
- package/src/authority/AuthorityOptions.ts +9 -0
- package/src/cache/CacheManager.ts +187 -46
- package/src/cache/entities/AccountEntity.ts +0 -3
- package/src/cache/utils/CacheTypes.ts +7 -6
- package/src/client/AuthorizationCodeClient.ts +12 -3
- package/src/client/BaseClient.ts +9 -6
- package/src/client/RefreshTokenClient.ts +36 -9
- package/src/client/SilentFlowClient.ts +49 -49
- package/src/crypto/ICrypto.ts +0 -7
- package/src/error/ClientAuthError.ts +8 -0
- package/src/error/ClientAuthErrorCodes.ts +1 -0
- package/src/index.ts +7 -1
- package/src/packageMetadata.ts +1 -1
- package/src/request/CommonRefreshTokenRequest.ts +3 -0
- package/src/request/CommonSilentFlowRequest.ts +2 -0
- package/src/response/ResponseHandler.ts +9 -3
- package/src/telemetry/performance/PerformanceEvent.ts +33 -2
- package/src/utils/FunctionWrappers.ts +0 -1
package/dist/url/UrlString.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! @azure/msal-common v14.
|
|
1
|
+
/*! @azure/msal-common v14.2.0 2023-10-20 */
|
|
2
2
|
'use strict';
|
|
3
3
|
import { createClientConfigurationError } from '../error/ClientConfigurationError.mjs';
|
|
4
4
|
import { createClientAuthError } from '../error/ClientAuthError.mjs';
|
|
@@ -7,284 +7,284 @@ import { AADAuthorityConstants, Constants, ServerResponseType } from '../utils/C
|
|
|
7
7
|
import { urlEmptyError, urlParseError, authorityUriInsecure } from '../error/ClientConfigurationErrorCodes.mjs';
|
|
8
8
|
import { hashNotDeserialized } from '../error/ClientAuthErrorCodes.mjs';
|
|
9
9
|
|
|
10
|
-
/*
|
|
11
|
-
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
12
|
-
* Licensed under the MIT License.
|
|
13
|
-
*/
|
|
14
|
-
/**
|
|
15
|
-
* Url object class which can perform various transformations on url strings.
|
|
16
|
-
*/
|
|
17
|
-
class UrlString {
|
|
18
|
-
get urlString() {
|
|
19
|
-
return this._urlString;
|
|
20
|
-
}
|
|
21
|
-
constructor(url) {
|
|
22
|
-
this._urlString = url;
|
|
23
|
-
if (!this._urlString) {
|
|
24
|
-
// Throws error if url is empty
|
|
25
|
-
throw createClientConfigurationError(urlEmptyError);
|
|
26
|
-
}
|
|
27
|
-
if (!this.getHash()) {
|
|
28
|
-
this._urlString = UrlString.canonicalizeUri(url);
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
/**
|
|
32
|
-
* Ensure urls are lower case and end with a / character.
|
|
33
|
-
* @param url
|
|
34
|
-
*/
|
|
35
|
-
static canonicalizeUri(url) {
|
|
36
|
-
if (url) {
|
|
37
|
-
let lowerCaseUrl = url.toLowerCase();
|
|
38
|
-
if (StringUtils.endsWith(lowerCaseUrl, "?")) {
|
|
39
|
-
lowerCaseUrl = lowerCaseUrl.slice(0, -1);
|
|
40
|
-
}
|
|
41
|
-
else if (StringUtils.endsWith(lowerCaseUrl, "?/")) {
|
|
42
|
-
lowerCaseUrl = lowerCaseUrl.slice(0, -2);
|
|
43
|
-
}
|
|
44
|
-
if (!StringUtils.endsWith(lowerCaseUrl, "/")) {
|
|
45
|
-
lowerCaseUrl += "/";
|
|
46
|
-
}
|
|
47
|
-
return lowerCaseUrl;
|
|
48
|
-
}
|
|
49
|
-
return url;
|
|
50
|
-
}
|
|
51
|
-
/**
|
|
52
|
-
* Throws if urlString passed is not a valid authority URI string.
|
|
53
|
-
*/
|
|
54
|
-
validateAsUri() {
|
|
55
|
-
// Attempts to parse url for uri components
|
|
56
|
-
let components;
|
|
57
|
-
try {
|
|
58
|
-
components = this.getUrlComponents();
|
|
59
|
-
}
|
|
60
|
-
catch (e) {
|
|
61
|
-
throw createClientConfigurationError(urlParseError);
|
|
62
|
-
}
|
|
63
|
-
// Throw error if URI or path segments are not parseable.
|
|
64
|
-
if (!components.HostNameAndPort || !components.PathSegments) {
|
|
65
|
-
throw createClientConfigurationError(urlParseError);
|
|
66
|
-
}
|
|
67
|
-
// Throw error if uri is insecure.
|
|
68
|
-
if (!components.Protocol ||
|
|
69
|
-
components.Protocol.toLowerCase() !== "https:") {
|
|
70
|
-
throw createClientConfigurationError(authorityUriInsecure);
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
/**
|
|
74
|
-
* Given a url and a query string return the url with provided query string appended
|
|
75
|
-
* @param url
|
|
76
|
-
* @param queryString
|
|
77
|
-
*/
|
|
78
|
-
static appendQueryString(url, queryString) {
|
|
79
|
-
if (!queryString) {
|
|
80
|
-
return url;
|
|
81
|
-
}
|
|
82
|
-
return url.indexOf("?") < 0
|
|
83
|
-
? `${url}?${queryString}`
|
|
84
|
-
: `${url}&${queryString}`;
|
|
85
|
-
}
|
|
86
|
-
/**
|
|
87
|
-
* Returns a url with the hash removed
|
|
88
|
-
* @param url
|
|
89
|
-
*/
|
|
90
|
-
static removeHashFromUrl(url) {
|
|
91
|
-
return UrlString.canonicalizeUri(url.split("#")[0]);
|
|
92
|
-
}
|
|
93
|
-
/**
|
|
94
|
-
* Given a url like https://a:b/common/d?e=f#g, and a tenantId, returns https://a:b/tenantId/d
|
|
95
|
-
* @param href The url
|
|
96
|
-
* @param tenantId The tenant id to replace
|
|
97
|
-
*/
|
|
98
|
-
replaceTenantPath(tenantId) {
|
|
99
|
-
const urlObject = this.getUrlComponents();
|
|
100
|
-
const pathArray = urlObject.PathSegments;
|
|
101
|
-
if (tenantId &&
|
|
102
|
-
pathArray.length !== 0 &&
|
|
103
|
-
(pathArray[0] === AADAuthorityConstants.COMMON ||
|
|
104
|
-
pathArray[0] === AADAuthorityConstants.ORGANIZATIONS)) {
|
|
105
|
-
pathArray[0] = tenantId;
|
|
106
|
-
}
|
|
107
|
-
return UrlString.constructAuthorityUriFromObject(urlObject);
|
|
108
|
-
}
|
|
109
|
-
/**
|
|
110
|
-
* Returns the anchor part(#) of the URL
|
|
111
|
-
*/
|
|
112
|
-
getHash() {
|
|
113
|
-
return UrlString.parseHash(this.urlString);
|
|
114
|
-
}
|
|
115
|
-
/**
|
|
116
|
-
* Parses out the components from a url string.
|
|
117
|
-
* @returns An object with the various components. Please cache this value insted of calling this multiple times on the same url.
|
|
118
|
-
*/
|
|
119
|
-
getUrlComponents() {
|
|
120
|
-
// https://gist.github.com/curtisz/11139b2cfcaef4a261e0
|
|
121
|
-
const regEx = RegExp("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?");
|
|
122
|
-
// If url string does not match regEx, we throw an error
|
|
123
|
-
const match = this.urlString.match(regEx);
|
|
124
|
-
if (!match) {
|
|
125
|
-
throw createClientConfigurationError(urlParseError);
|
|
126
|
-
}
|
|
127
|
-
// Url component object
|
|
128
|
-
const urlComponents = {
|
|
129
|
-
Protocol: match[1],
|
|
130
|
-
HostNameAndPort: match[4],
|
|
131
|
-
AbsolutePath: match[5],
|
|
132
|
-
QueryString: match[7],
|
|
133
|
-
};
|
|
134
|
-
let pathSegments = urlComponents.AbsolutePath.split("/");
|
|
135
|
-
pathSegments = pathSegments.filter((val) => val && val.length > 0); // remove empty elements
|
|
136
|
-
urlComponents.PathSegments = pathSegments;
|
|
137
|
-
if (urlComponents.QueryString &&
|
|
138
|
-
urlComponents.QueryString.endsWith("/")) {
|
|
139
|
-
urlComponents.QueryString = urlComponents.QueryString.substring(0, urlComponents.QueryString.length - 1);
|
|
140
|
-
}
|
|
141
|
-
return urlComponents;
|
|
142
|
-
}
|
|
143
|
-
static getDomainFromUrl(url) {
|
|
144
|
-
const regEx = RegExp("^([^:/?#]+://)?([^/?#]*)");
|
|
145
|
-
const match = url.match(regEx);
|
|
146
|
-
if (!match) {
|
|
147
|
-
throw createClientConfigurationError(urlParseError);
|
|
148
|
-
}
|
|
149
|
-
return match[2];
|
|
150
|
-
}
|
|
151
|
-
static getAbsoluteUrl(relativeUrl, baseUrl) {
|
|
152
|
-
if (relativeUrl[0] === Constants.FORWARD_SLASH) {
|
|
153
|
-
const url = new UrlString(baseUrl);
|
|
154
|
-
const baseComponents = url.getUrlComponents();
|
|
155
|
-
return (baseComponents.Protocol +
|
|
156
|
-
"//" +
|
|
157
|
-
baseComponents.HostNameAndPort +
|
|
158
|
-
relativeUrl);
|
|
159
|
-
}
|
|
160
|
-
return relativeUrl;
|
|
161
|
-
}
|
|
162
|
-
/**
|
|
163
|
-
* Parses hash string from given string. Returns empty string if no hash symbol is found.
|
|
164
|
-
* @param hashString
|
|
165
|
-
*/
|
|
166
|
-
static parseHash(hashString) {
|
|
167
|
-
const hashIndex1 = hashString.indexOf("#");
|
|
168
|
-
const hashIndex2 = hashString.indexOf("#/");
|
|
169
|
-
if (hashIndex2 > -1) {
|
|
170
|
-
return hashString.substring(hashIndex2 + 2);
|
|
171
|
-
}
|
|
172
|
-
else if (hashIndex1 > -1) {
|
|
173
|
-
return hashString.substring(hashIndex1 + 1);
|
|
174
|
-
}
|
|
175
|
-
return Constants.EMPTY_STRING;
|
|
176
|
-
}
|
|
177
|
-
/**
|
|
178
|
-
* Parses query string from given string. Returns empty string if no query symbol is found.
|
|
179
|
-
* @param queryString
|
|
180
|
-
*/
|
|
181
|
-
static parseQueryString(queryString) {
|
|
182
|
-
const queryIndex1 = queryString.indexOf("?");
|
|
183
|
-
const queryIndex2 = queryString.indexOf("/?");
|
|
184
|
-
if (queryIndex2 > -1) {
|
|
185
|
-
return queryString.substring(queryIndex2 + 2);
|
|
186
|
-
}
|
|
187
|
-
else if (queryIndex1 > -1) {
|
|
188
|
-
return queryString.substring(queryIndex1 + 1);
|
|
189
|
-
}
|
|
190
|
-
return Constants.EMPTY_STRING;
|
|
191
|
-
}
|
|
192
|
-
/**
|
|
193
|
-
* Parses query server response string from given string.
|
|
194
|
-
* Extract hash between '?code=' and '#' if trailing '# is present.
|
|
195
|
-
* Returns empty string if no query symbol is found.
|
|
196
|
-
* @param queryString
|
|
197
|
-
*/
|
|
198
|
-
static parseQueryServerResponse(queryString) {
|
|
199
|
-
const queryIndex1 = queryString.indexOf("?code");
|
|
200
|
-
const queryIndex2 = queryString.indexOf("/?code");
|
|
201
|
-
const hashIndex = queryString.indexOf("#");
|
|
202
|
-
if (queryIndex2 > -1 && hashIndex > -1) {
|
|
203
|
-
return queryString.substring(queryIndex2 + 2, hashIndex);
|
|
204
|
-
}
|
|
205
|
-
else if (queryIndex2 > -1) {
|
|
206
|
-
return queryString.substring(queryIndex2 + 2);
|
|
207
|
-
}
|
|
208
|
-
else if (queryIndex1 > -1 && hashIndex > -1) {
|
|
209
|
-
return queryString.substring(queryIndex1 + 1, hashIndex);
|
|
210
|
-
}
|
|
211
|
-
else if (queryIndex1 > -1) {
|
|
212
|
-
return queryString.substring(queryIndex1 + 1);
|
|
213
|
-
}
|
|
214
|
-
return Constants.EMPTY_STRING;
|
|
215
|
-
}
|
|
216
|
-
static constructAuthorityUriFromObject(urlObject) {
|
|
217
|
-
return new UrlString(urlObject.Protocol +
|
|
218
|
-
"//" +
|
|
219
|
-
urlObject.HostNameAndPort +
|
|
220
|
-
"/" +
|
|
221
|
-
urlObject.PathSegments.join("/"));
|
|
222
|
-
}
|
|
223
|
-
/**
|
|
224
|
-
* Returns URL hash as server auth code response object.
|
|
225
|
-
*/
|
|
226
|
-
static getDeserializedHash(hash) {
|
|
227
|
-
// Check if given hash is empty
|
|
228
|
-
if (!hash) {
|
|
229
|
-
return {};
|
|
230
|
-
}
|
|
231
|
-
// Strip the # symbol if present
|
|
232
|
-
const parsedHash = UrlString.parseHash(hash);
|
|
233
|
-
// If # symbol was not present, above will return empty string, so give original hash value
|
|
234
|
-
const deserializedHash = StringUtils.queryStringToObject(parsedHash || hash);
|
|
235
|
-
// Check if deserialization didn't work
|
|
236
|
-
if (!deserializedHash) {
|
|
237
|
-
throw createClientAuthError(hashNotDeserialized);
|
|
238
|
-
}
|
|
239
|
-
return deserializedHash;
|
|
240
|
-
}
|
|
241
|
-
/**
|
|
242
|
-
* Returns URL query string as server auth code response object.
|
|
243
|
-
*/
|
|
244
|
-
static getDeserializedQueryString(query) {
|
|
245
|
-
// Check if given query is empty
|
|
246
|
-
if (!query) {
|
|
247
|
-
return {};
|
|
248
|
-
}
|
|
249
|
-
// Strip the ? symbol if present
|
|
250
|
-
const parsedQueryString = UrlString.parseQueryString(query);
|
|
251
|
-
// If ? symbol was not present, above will return empty string, so give original query value
|
|
252
|
-
const deserializedQueryString = StringUtils.queryStringToObject(parsedQueryString || query);
|
|
253
|
-
// Check if deserialization didn't work
|
|
254
|
-
if (!deserializedQueryString) {
|
|
255
|
-
throw createClientAuthError(hashNotDeserialized);
|
|
256
|
-
}
|
|
257
|
-
return deserializedQueryString;
|
|
258
|
-
}
|
|
259
|
-
/**
|
|
260
|
-
* Returns either deserialized query string or deserialized hash, depending on the serverResponseType
|
|
261
|
-
* as a server auth code response object.
|
|
262
|
-
*/
|
|
263
|
-
static getDeserializedCodeResponse(serverResponseType, hashFragment) {
|
|
264
|
-
const hashUrlString = new UrlString(hashFragment);
|
|
265
|
-
let serverParams;
|
|
266
|
-
if (serverResponseType === ServerResponseType.QUERY) {
|
|
267
|
-
serverParams = UrlString.getDeserializedQueryString(hashFragment);
|
|
268
|
-
}
|
|
269
|
-
else {
|
|
270
|
-
serverParams = UrlString.getDeserializedHash(hashUrlString.getHash());
|
|
271
|
-
}
|
|
272
|
-
return serverParams;
|
|
273
|
-
}
|
|
274
|
-
/**
|
|
275
|
-
* Check if the hash of the URL string contains known properties
|
|
276
|
-
*/
|
|
277
|
-
static hashContainsKnownProperties(hash) {
|
|
278
|
-
if (!hash || hash.indexOf("=") < 0) {
|
|
279
|
-
// Hash doesn't contain key/value pairs
|
|
280
|
-
return false;
|
|
281
|
-
}
|
|
282
|
-
const parameters = UrlString.getDeserializedHash(hash);
|
|
283
|
-
return !!(parameters.code ||
|
|
284
|
-
parameters.error_description ||
|
|
285
|
-
parameters.error ||
|
|
286
|
-
parameters.state);
|
|
287
|
-
}
|
|
10
|
+
/*
|
|
11
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
12
|
+
* Licensed under the MIT License.
|
|
13
|
+
*/
|
|
14
|
+
/**
|
|
15
|
+
* Url object class which can perform various transformations on url strings.
|
|
16
|
+
*/
|
|
17
|
+
class UrlString {
|
|
18
|
+
get urlString() {
|
|
19
|
+
return this._urlString;
|
|
20
|
+
}
|
|
21
|
+
constructor(url) {
|
|
22
|
+
this._urlString = url;
|
|
23
|
+
if (!this._urlString) {
|
|
24
|
+
// Throws error if url is empty
|
|
25
|
+
throw createClientConfigurationError(urlEmptyError);
|
|
26
|
+
}
|
|
27
|
+
if (!this.getHash()) {
|
|
28
|
+
this._urlString = UrlString.canonicalizeUri(url);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Ensure urls are lower case and end with a / character.
|
|
33
|
+
* @param url
|
|
34
|
+
*/
|
|
35
|
+
static canonicalizeUri(url) {
|
|
36
|
+
if (url) {
|
|
37
|
+
let lowerCaseUrl = url.toLowerCase();
|
|
38
|
+
if (StringUtils.endsWith(lowerCaseUrl, "?")) {
|
|
39
|
+
lowerCaseUrl = lowerCaseUrl.slice(0, -1);
|
|
40
|
+
}
|
|
41
|
+
else if (StringUtils.endsWith(lowerCaseUrl, "?/")) {
|
|
42
|
+
lowerCaseUrl = lowerCaseUrl.slice(0, -2);
|
|
43
|
+
}
|
|
44
|
+
if (!StringUtils.endsWith(lowerCaseUrl, "/")) {
|
|
45
|
+
lowerCaseUrl += "/";
|
|
46
|
+
}
|
|
47
|
+
return lowerCaseUrl;
|
|
48
|
+
}
|
|
49
|
+
return url;
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Throws if urlString passed is not a valid authority URI string.
|
|
53
|
+
*/
|
|
54
|
+
validateAsUri() {
|
|
55
|
+
// Attempts to parse url for uri components
|
|
56
|
+
let components;
|
|
57
|
+
try {
|
|
58
|
+
components = this.getUrlComponents();
|
|
59
|
+
}
|
|
60
|
+
catch (e) {
|
|
61
|
+
throw createClientConfigurationError(urlParseError);
|
|
62
|
+
}
|
|
63
|
+
// Throw error if URI or path segments are not parseable.
|
|
64
|
+
if (!components.HostNameAndPort || !components.PathSegments) {
|
|
65
|
+
throw createClientConfigurationError(urlParseError);
|
|
66
|
+
}
|
|
67
|
+
// Throw error if uri is insecure.
|
|
68
|
+
if (!components.Protocol ||
|
|
69
|
+
components.Protocol.toLowerCase() !== "https:") {
|
|
70
|
+
throw createClientConfigurationError(authorityUriInsecure);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Given a url and a query string return the url with provided query string appended
|
|
75
|
+
* @param url
|
|
76
|
+
* @param queryString
|
|
77
|
+
*/
|
|
78
|
+
static appendQueryString(url, queryString) {
|
|
79
|
+
if (!queryString) {
|
|
80
|
+
return url;
|
|
81
|
+
}
|
|
82
|
+
return url.indexOf("?") < 0
|
|
83
|
+
? `${url}?${queryString}`
|
|
84
|
+
: `${url}&${queryString}`;
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Returns a url with the hash removed
|
|
88
|
+
* @param url
|
|
89
|
+
*/
|
|
90
|
+
static removeHashFromUrl(url) {
|
|
91
|
+
return UrlString.canonicalizeUri(url.split("#")[0]);
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Given a url like https://a:b/common/d?e=f#g, and a tenantId, returns https://a:b/tenantId/d
|
|
95
|
+
* @param href The url
|
|
96
|
+
* @param tenantId The tenant id to replace
|
|
97
|
+
*/
|
|
98
|
+
replaceTenantPath(tenantId) {
|
|
99
|
+
const urlObject = this.getUrlComponents();
|
|
100
|
+
const pathArray = urlObject.PathSegments;
|
|
101
|
+
if (tenantId &&
|
|
102
|
+
pathArray.length !== 0 &&
|
|
103
|
+
(pathArray[0] === AADAuthorityConstants.COMMON ||
|
|
104
|
+
pathArray[0] === AADAuthorityConstants.ORGANIZATIONS)) {
|
|
105
|
+
pathArray[0] = tenantId;
|
|
106
|
+
}
|
|
107
|
+
return UrlString.constructAuthorityUriFromObject(urlObject);
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* Returns the anchor part(#) of the URL
|
|
111
|
+
*/
|
|
112
|
+
getHash() {
|
|
113
|
+
return UrlString.parseHash(this.urlString);
|
|
114
|
+
}
|
|
115
|
+
/**
|
|
116
|
+
* Parses out the components from a url string.
|
|
117
|
+
* @returns An object with the various components. Please cache this value insted of calling this multiple times on the same url.
|
|
118
|
+
*/
|
|
119
|
+
getUrlComponents() {
|
|
120
|
+
// https://gist.github.com/curtisz/11139b2cfcaef4a261e0
|
|
121
|
+
const regEx = RegExp("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?");
|
|
122
|
+
// If url string does not match regEx, we throw an error
|
|
123
|
+
const match = this.urlString.match(regEx);
|
|
124
|
+
if (!match) {
|
|
125
|
+
throw createClientConfigurationError(urlParseError);
|
|
126
|
+
}
|
|
127
|
+
// Url component object
|
|
128
|
+
const urlComponents = {
|
|
129
|
+
Protocol: match[1],
|
|
130
|
+
HostNameAndPort: match[4],
|
|
131
|
+
AbsolutePath: match[5],
|
|
132
|
+
QueryString: match[7],
|
|
133
|
+
};
|
|
134
|
+
let pathSegments = urlComponents.AbsolutePath.split("/");
|
|
135
|
+
pathSegments = pathSegments.filter((val) => val && val.length > 0); // remove empty elements
|
|
136
|
+
urlComponents.PathSegments = pathSegments;
|
|
137
|
+
if (urlComponents.QueryString &&
|
|
138
|
+
urlComponents.QueryString.endsWith("/")) {
|
|
139
|
+
urlComponents.QueryString = urlComponents.QueryString.substring(0, urlComponents.QueryString.length - 1);
|
|
140
|
+
}
|
|
141
|
+
return urlComponents;
|
|
142
|
+
}
|
|
143
|
+
static getDomainFromUrl(url) {
|
|
144
|
+
const regEx = RegExp("^([^:/?#]+://)?([^/?#]*)");
|
|
145
|
+
const match = url.match(regEx);
|
|
146
|
+
if (!match) {
|
|
147
|
+
throw createClientConfigurationError(urlParseError);
|
|
148
|
+
}
|
|
149
|
+
return match[2];
|
|
150
|
+
}
|
|
151
|
+
static getAbsoluteUrl(relativeUrl, baseUrl) {
|
|
152
|
+
if (relativeUrl[0] === Constants.FORWARD_SLASH) {
|
|
153
|
+
const url = new UrlString(baseUrl);
|
|
154
|
+
const baseComponents = url.getUrlComponents();
|
|
155
|
+
return (baseComponents.Protocol +
|
|
156
|
+
"//" +
|
|
157
|
+
baseComponents.HostNameAndPort +
|
|
158
|
+
relativeUrl);
|
|
159
|
+
}
|
|
160
|
+
return relativeUrl;
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* Parses hash string from given string. Returns empty string if no hash symbol is found.
|
|
164
|
+
* @param hashString
|
|
165
|
+
*/
|
|
166
|
+
static parseHash(hashString) {
|
|
167
|
+
const hashIndex1 = hashString.indexOf("#");
|
|
168
|
+
const hashIndex2 = hashString.indexOf("#/");
|
|
169
|
+
if (hashIndex2 > -1) {
|
|
170
|
+
return hashString.substring(hashIndex2 + 2);
|
|
171
|
+
}
|
|
172
|
+
else if (hashIndex1 > -1) {
|
|
173
|
+
return hashString.substring(hashIndex1 + 1);
|
|
174
|
+
}
|
|
175
|
+
return Constants.EMPTY_STRING;
|
|
176
|
+
}
|
|
177
|
+
/**
|
|
178
|
+
* Parses query string from given string. Returns empty string if no query symbol is found.
|
|
179
|
+
* @param queryString
|
|
180
|
+
*/
|
|
181
|
+
static parseQueryString(queryString) {
|
|
182
|
+
const queryIndex1 = queryString.indexOf("?");
|
|
183
|
+
const queryIndex2 = queryString.indexOf("/?");
|
|
184
|
+
if (queryIndex2 > -1) {
|
|
185
|
+
return queryString.substring(queryIndex2 + 2);
|
|
186
|
+
}
|
|
187
|
+
else if (queryIndex1 > -1) {
|
|
188
|
+
return queryString.substring(queryIndex1 + 1);
|
|
189
|
+
}
|
|
190
|
+
return Constants.EMPTY_STRING;
|
|
191
|
+
}
|
|
192
|
+
/**
|
|
193
|
+
* Parses query server response string from given string.
|
|
194
|
+
* Extract hash between '?code=' and '#' if trailing '# is present.
|
|
195
|
+
* Returns empty string if no query symbol is found.
|
|
196
|
+
* @param queryString
|
|
197
|
+
*/
|
|
198
|
+
static parseQueryServerResponse(queryString) {
|
|
199
|
+
const queryIndex1 = queryString.indexOf("?code");
|
|
200
|
+
const queryIndex2 = queryString.indexOf("/?code");
|
|
201
|
+
const hashIndex = queryString.indexOf("#");
|
|
202
|
+
if (queryIndex2 > -1 && hashIndex > -1) {
|
|
203
|
+
return queryString.substring(queryIndex2 + 2, hashIndex);
|
|
204
|
+
}
|
|
205
|
+
else if (queryIndex2 > -1) {
|
|
206
|
+
return queryString.substring(queryIndex2 + 2);
|
|
207
|
+
}
|
|
208
|
+
else if (queryIndex1 > -1 && hashIndex > -1) {
|
|
209
|
+
return queryString.substring(queryIndex1 + 1, hashIndex);
|
|
210
|
+
}
|
|
211
|
+
else if (queryIndex1 > -1) {
|
|
212
|
+
return queryString.substring(queryIndex1 + 1);
|
|
213
|
+
}
|
|
214
|
+
return Constants.EMPTY_STRING;
|
|
215
|
+
}
|
|
216
|
+
static constructAuthorityUriFromObject(urlObject) {
|
|
217
|
+
return new UrlString(urlObject.Protocol +
|
|
218
|
+
"//" +
|
|
219
|
+
urlObject.HostNameAndPort +
|
|
220
|
+
"/" +
|
|
221
|
+
urlObject.PathSegments.join("/"));
|
|
222
|
+
}
|
|
223
|
+
/**
|
|
224
|
+
* Returns URL hash as server auth code response object.
|
|
225
|
+
*/
|
|
226
|
+
static getDeserializedHash(hash) {
|
|
227
|
+
// Check if given hash is empty
|
|
228
|
+
if (!hash) {
|
|
229
|
+
return {};
|
|
230
|
+
}
|
|
231
|
+
// Strip the # symbol if present
|
|
232
|
+
const parsedHash = UrlString.parseHash(hash);
|
|
233
|
+
// If # symbol was not present, above will return empty string, so give original hash value
|
|
234
|
+
const deserializedHash = StringUtils.queryStringToObject(parsedHash || hash);
|
|
235
|
+
// Check if deserialization didn't work
|
|
236
|
+
if (!deserializedHash) {
|
|
237
|
+
throw createClientAuthError(hashNotDeserialized);
|
|
238
|
+
}
|
|
239
|
+
return deserializedHash;
|
|
240
|
+
}
|
|
241
|
+
/**
|
|
242
|
+
* Returns URL query string as server auth code response object.
|
|
243
|
+
*/
|
|
244
|
+
static getDeserializedQueryString(query) {
|
|
245
|
+
// Check if given query is empty
|
|
246
|
+
if (!query) {
|
|
247
|
+
return {};
|
|
248
|
+
}
|
|
249
|
+
// Strip the ? symbol if present
|
|
250
|
+
const parsedQueryString = UrlString.parseQueryString(query);
|
|
251
|
+
// If ? symbol was not present, above will return empty string, so give original query value
|
|
252
|
+
const deserializedQueryString = StringUtils.queryStringToObject(parsedQueryString || query);
|
|
253
|
+
// Check if deserialization didn't work
|
|
254
|
+
if (!deserializedQueryString) {
|
|
255
|
+
throw createClientAuthError(hashNotDeserialized);
|
|
256
|
+
}
|
|
257
|
+
return deserializedQueryString;
|
|
258
|
+
}
|
|
259
|
+
/**
|
|
260
|
+
* Returns either deserialized query string or deserialized hash, depending on the serverResponseType
|
|
261
|
+
* as a server auth code response object.
|
|
262
|
+
*/
|
|
263
|
+
static getDeserializedCodeResponse(serverResponseType, hashFragment) {
|
|
264
|
+
const hashUrlString = new UrlString(hashFragment);
|
|
265
|
+
let serverParams;
|
|
266
|
+
if (serverResponseType === ServerResponseType.QUERY) {
|
|
267
|
+
serverParams = UrlString.getDeserializedQueryString(hashFragment);
|
|
268
|
+
}
|
|
269
|
+
else {
|
|
270
|
+
serverParams = UrlString.getDeserializedHash(hashUrlString.getHash());
|
|
271
|
+
}
|
|
272
|
+
return serverParams;
|
|
273
|
+
}
|
|
274
|
+
/**
|
|
275
|
+
* Check if the hash of the URL string contains known properties
|
|
276
|
+
*/
|
|
277
|
+
static hashContainsKnownProperties(hash) {
|
|
278
|
+
if (!hash || hash.indexOf("=") < 0) {
|
|
279
|
+
// Hash doesn't contain key/value pairs
|
|
280
|
+
return false;
|
|
281
|
+
}
|
|
282
|
+
const parameters = UrlString.getDeserializedHash(hash);
|
|
283
|
+
return !!(parameters.code ||
|
|
284
|
+
parameters.error_description ||
|
|
285
|
+
parameters.error ||
|
|
286
|
+
parameters.state);
|
|
287
|
+
}
|
|
288
288
|
}
|
|
289
289
|
|
|
290
290
|
export { UrlString };
|