@kwiz/common 1.0.7 → 1.0.9
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/helpers/typecheckers.d.ts +1 -1
- package/dist/helpers/url.js +12 -6
- package/dist/helpers/url.js.map +1 -1
- package/dist/utils/auth/common.d.ts +1 -1
- package/dist/utils/auth/common.js +2 -2
- package/dist/utils/auth/common.js.map +1 -1
- package/package.json +1 -1
- package/src/helpers/url.test.js +8 -1
- package/src/helpers/url.ts +12 -7
- package/src/utils/auth/common.ts +2 -2
|
@@ -51,6 +51,6 @@ export declare function newGuid(): string;
|
|
|
51
51
|
/** check if object has all members (they are not undefined) */
|
|
52
52
|
export declare function hasMembers(o: any, ...members: string[]): boolean;
|
|
53
53
|
/** compares 2 versions. if v1 is bigger return 1, if v2 is bigger returns -1, if equals return 0 */
|
|
54
|
-
export declare function CompareVersion(v1: string, v2: string):
|
|
54
|
+
export declare function CompareVersion(v1: string, v2: string): 1 | 0 | -1;
|
|
55
55
|
/** pass along a list of unsafe tests to get a value, the first one that doesn't throw an exception and doesnt return null will get returned */
|
|
56
56
|
export declare function SafeIfElse<T>(...list: ((() => T) | T)[]): T;
|
package/dist/helpers/url.js
CHANGED
|
@@ -62,15 +62,21 @@ function makeFullUrl(url, baseUrl) {
|
|
|
62
62
|
if (url.indexOf('://') > 0)
|
|
63
63
|
return url;
|
|
64
64
|
else {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
65
|
+
if (url.startsWith('/')) {
|
|
66
|
+
//server relative
|
|
67
|
+
if ((0, typecheckers_1.isNullOrEmptyString)(baseUrl)) { //no override base
|
|
68
|
+
var xxx = document.createElement("a");
|
|
69
|
+
xxx.href = url;
|
|
70
|
+
return xxx.href;
|
|
71
|
+
}
|
|
72
|
+
else //have override base
|
|
73
|
+
{
|
|
74
|
+
return `${baseUrl.split('/').slice(0, 3).join("/")}${url}`;
|
|
75
|
+
}
|
|
70
76
|
}
|
|
71
77
|
else //folder relative URL, and we have a different baseURL to base it on
|
|
72
78
|
{
|
|
73
|
-
return makeFullUrl(makeServerRelativeUrl(url, baseUrl));
|
|
79
|
+
return makeFullUrl(makeServerRelativeUrl(url, baseUrl), baseUrl);
|
|
74
80
|
}
|
|
75
81
|
}
|
|
76
82
|
}
|
package/dist/helpers/url.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/helpers/url.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/helpers/url.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export declare function GetTokenAudiencePrefix(appId: string): string;
|
|
2
2
|
export declare function GetDefaultScope(appId: string): string;
|
|
3
|
-
export declare function GetMSALSiteScope(
|
|
3
|
+
export declare function GetMSALSiteScope(hostName: string): string;
|
|
@@ -9,8 +9,8 @@ function GetDefaultScope(appId) {
|
|
|
9
9
|
return `${GetTokenAudiencePrefix(appId)}/access_as_user`;
|
|
10
10
|
}
|
|
11
11
|
exports.GetDefaultScope = GetDefaultScope;
|
|
12
|
-
function GetMSALSiteScope(
|
|
13
|
-
return `https://${
|
|
12
|
+
function GetMSALSiteScope(hostName) {
|
|
13
|
+
return `https://${hostName}`;
|
|
14
14
|
}
|
|
15
15
|
exports.GetMSALSiteScope = GetMSALSiteScope;
|
|
16
16
|
//# sourceMappingURL=common.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/utils/auth/common.ts"],"names":[],"mappings":";;;AAAA,SAAgB,sBAAsB,CAAC,KAAa;IAChD,OAAO,SAAS,KAAK,EAAE,CAAC;AAC5B,CAAC;AAFD,wDAEC;AACD,SAAgB,eAAe,CAAC,KAAa;IACzC,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,iBAAiB,CAAC;AAC7D,CAAC;AAFD,0CAEC;AACD,SAAgB,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/utils/auth/common.ts"],"names":[],"mappings":";;;AAAA,SAAgB,sBAAsB,CAAC,KAAa;IAChD,OAAO,SAAS,KAAK,EAAE,CAAC;AAC5B,CAAC;AAFD,wDAEC;AACD,SAAgB,eAAe,CAAC,KAAa;IACzC,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,iBAAiB,CAAC;AAC7D,CAAC;AAFD,0CAEC;AACD,SAAgB,gBAAgB,CAAC,QAAgB;IAC7C,OAAO,WAAW,QAAQ,EAAE,CAAC;AACjC,CAAC;AAFD,4CAEC"}
|
package/package.json
CHANGED
package/src/helpers/url.test.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import assert from 'assert/strict';
|
|
2
2
|
import test from 'node:test';
|
|
3
|
-
import { parseHash, parseQueryString } from './url';
|
|
3
|
+
import { makeFullUrl, parseHash, parseQueryString, } from './url';
|
|
4
4
|
|
|
5
5
|
test('parseQueryString', t => {
|
|
6
6
|
assert.deepEqual(parseQueryString(), {});
|
|
@@ -15,4 +15,11 @@ test('parseHash', t => {
|
|
|
15
15
|
assert.deepEqual(parseHash("http://foo?p1=1&p2=2#someAnchor"), { someAnchor: '' });
|
|
16
16
|
assert.deepEqual(parseHash("http://foo?p1=3&p2=4#p1=1&p2=2"), { p1: '1', p2: '2' });
|
|
17
17
|
assert.deepEqual(parseHash("http://foo#p1=1&p2=2"), { p1: '1', p2: '2' });
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
test('makeFullUrl', t => {
|
|
21
|
+
assert.deepEqual(makeFullUrl("http://foo"), "http://foo");
|
|
22
|
+
assert.deepEqual(makeFullUrl("http://foo", "http://fii"), "http://foo");
|
|
23
|
+
assert.deepEqual(makeFullUrl("foo/fii", "http://host/folder"), "http://host/folder/foo/fii");
|
|
24
|
+
assert.deepEqual(makeFullUrl("/foo/fii", "http://host"), "http://host/foo/fii");
|
|
18
25
|
});
|
package/src/helpers/url.ts
CHANGED
|
@@ -62,16 +62,21 @@ export function makeFullUrl(url: string, baseUrl?: string): string {
|
|
|
62
62
|
|
|
63
63
|
if (url.indexOf('://') > 0) return url;
|
|
64
64
|
else {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
65
|
+
if (url.startsWith('/')) {
|
|
66
|
+
//server relative
|
|
67
|
+
if (isNullOrEmptyString(baseUrl)) {//no override base
|
|
68
|
+
var xxx = document.createElement("a");
|
|
69
|
+
xxx.href = url;
|
|
70
|
+
return xxx.href;
|
|
71
|
+
}
|
|
72
|
+
else//have override base
|
|
73
|
+
{
|
|
74
|
+
return `${baseUrl.split('/').slice(0, 3).join("/")}${url}`;
|
|
75
|
+
}
|
|
71
76
|
}
|
|
72
77
|
else//folder relative URL, and we have a different baseURL to base it on
|
|
73
78
|
{
|
|
74
|
-
return makeFullUrl(makeServerRelativeUrl(url, baseUrl));
|
|
79
|
+
return makeFullUrl(makeServerRelativeUrl(url, baseUrl), baseUrl);
|
|
75
80
|
}
|
|
76
81
|
}
|
|
77
82
|
}
|
package/src/utils/auth/common.ts
CHANGED
|
@@ -4,6 +4,6 @@ export function GetTokenAudiencePrefix(appId: string) {
|
|
|
4
4
|
export function GetDefaultScope(appId: string) {
|
|
5
5
|
return `${GetTokenAudiencePrefix(appId)}/access_as_user`;
|
|
6
6
|
}
|
|
7
|
-
export function GetMSALSiteScope(
|
|
8
|
-
return `https://${
|
|
7
|
+
export function GetMSALSiteScope(hostName: string) {
|
|
8
|
+
return `https://${hostName}`;
|
|
9
9
|
}
|