@kwiz/common 1.0.197 → 1.0.198

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.
@@ -4,10 +4,13 @@ exports.DiscoverTenantInfo = DiscoverTenantInfo;
4
4
  exports.AutoDiscoverTenantInfo = AutoDiscoverTenantInfo;
5
5
  exports.GetEnvironmentFromACSEndPoint = GetEnvironmentFromACSEndPoint;
6
6
  exports.GetAzureADLoginEndPoint = GetAzureADLoginEndPoint;
7
+ exports.GetAzureEnvironmentFromAzureADLogin = GetAzureEnvironmentFromAzureADLogin;
7
8
  const promises_1 = require("../../helpers/promises");
9
+ const strings_1 = require("../../helpers/strings");
8
10
  const typecheckers_1 = require("../../helpers/typecheckers");
9
11
  const auth_1 = require("../../types/auth");
10
12
  const rest_1 = require("../rest");
13
+ const common_1 = require("../sharepoint.rest/common");
11
14
  function _getFriendlyName(hostName) {
12
15
  if (hostName.indexOf(".sharepoint.") !== -1) {
13
16
  let hostParts = hostName.split('.'); //should be xxx.sharepoint.com or xxx.sharepoint.us
@@ -49,6 +52,29 @@ function _processOpenidConfiguration(config, friendlyName) {
49
52
  }
50
53
  function DiscoverTenantInfo(hostNameOrId, sync) {
51
54
  hostNameOrId = hostNameOrId.toLowerCase();
55
+ if ("location" in globalThis && (0, common_1.hasGlobalContext)()) {
56
+ if (!(0, typecheckers_1.isValidGuid)(hostNameOrId)) {
57
+ try {
58
+ let host1 = new URL(hostNameOrId).host.toLowerCase();
59
+ let host2 = window.location.host.toLowerCase();
60
+ if (host1 === host2) {
61
+ let info = _getTenantInfoFromContext();
62
+ if (!(0, typecheckers_1.isNullOrUndefined)(info)) {
63
+ return info;
64
+ }
65
+ }
66
+ }
67
+ catch {
68
+ }
69
+ }
70
+ else if ((0, typecheckers_1.isValidGuid)(_spPageContextInfo.aadTenantId)
71
+ && (0, strings_1.normalizeGuid)(hostNameOrId) === (0, strings_1.normalizeGuid)(_spPageContextInfo.aadTenantId)) {
72
+ let info = _getTenantInfoFromContext();
73
+ if (!(0, typecheckers_1.isNullOrUndefined)(info)) {
74
+ return info;
75
+ }
76
+ }
77
+ }
52
78
  let friendlyName = "";
53
79
  if ((0, typecheckers_1.isValidGuid)(hostNameOrId)) {
54
80
  friendlyName = hostNameOrId;
@@ -83,6 +109,22 @@ function DiscoverTenantInfo(hostNameOrId, sync) {
83
109
  });
84
110
  }
85
111
  }
112
+ function _getTenantInfoFromContext() {
113
+ if (!(0, common_1.hasGlobalContext)()
114
+ || !("location" in globalThis)
115
+ || !(0, typecheckers_1.isValidGuid)(_spPageContextInfo.aadTenantId)
116
+ || (0, typecheckers_1.isNullOrEmptyString)(_spPageContextInfo["aadInstanceUrl"])
117
+ || (0, typecheckers_1.isNullOrEmptyString)(_spPageContextInfo["msGraphEndpointUrl"])) {
118
+ return null;
119
+ }
120
+ let environment = GetAzureEnvironmentFromAzureADLogin(_spPageContextInfo["aadInstanceUrl"]);
121
+ return {
122
+ environment: environment,
123
+ idOrName: (0, strings_1.normalizeGuid)(_spPageContextInfo.aadTenantId),
124
+ authorityUrl: _spPageContextInfo["aadInstanceUrl"],
125
+ msGraphHost: new URL(_spPageContextInfo["msGraphEndpointUrl"]).host
126
+ };
127
+ }
86
128
  function AutoDiscoverTenantInfo(sync) {
87
129
  if (sync === true) {
88
130
  return DiscoverTenantInfo(window.location.hostname.toLowerCase(), true);
@@ -106,13 +148,31 @@ function GetEnvironmentFromACSEndPoint(ACSEndPoint) {
106
148
  }
107
149
  function GetAzureADLoginEndPoint(environment) {
108
150
  switch (environment) {
109
- case auth_1.AzureEnvironment.Germany: return "https://login.microsoftonline.de";
110
- case auth_1.AzureEnvironment.China: return "https://login.chinacloudapi.cn";
111
- case auth_1.AzureEnvironment.USGovernmentHigh: return "https://login.microsoftonline.us";
112
- case auth_1.AzureEnvironment.PPE: return "https://login.windows-ppe.net";
151
+ case auth_1.AzureEnvironment.Germany:
152
+ return "https://login.microsoftonline.de";
153
+ case auth_1.AzureEnvironment.China:
154
+ return "https://login.chinacloudapi.cn";
155
+ case auth_1.AzureEnvironment.USGovernmentHigh:
156
+ return "https://login.microsoftonline.us";
157
+ case auth_1.AzureEnvironment.PPE:
158
+ return "https://login.windows-ppe.net";
113
159
  case auth_1.AzureEnvironment.Production:
114
160
  default:
115
161
  return "https://login.microsoftonline.com";
116
162
  }
117
163
  }
164
+ function GetAzureEnvironmentFromAzureADLogin(login) {
165
+ switch (login) {
166
+ case "https://login.microsoftonline.de":
167
+ return auth_1.AzureEnvironment.Germany;
168
+ case "https://login.chinacloudapi.cn":
169
+ return auth_1.AzureEnvironment.China;
170
+ case "https://login.microsoftonline.us":
171
+ return auth_1.AzureEnvironment.USGovernmentHigh;
172
+ case "https://login.windows-ppe.net":
173
+ return auth_1.AzureEnvironment.PPE;
174
+ default:
175
+ return auth_1.AzureEnvironment.Production;
176
+ }
177
+ }
118
178
  //# sourceMappingURL=discovery.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../../src/utils/auth/discovery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../../src/utils/auth/discovery.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,9 @@
1
1
  import { promiseOnce } from "../../helpers/promises";
2
- import { isNullOrEmptyString, isValidGuid } from "../../helpers/typecheckers";
2
+ import { normalizeGuid } from "../../helpers/strings";
3
+ import { isNullOrEmptyString, isNullOrUndefined, isValidGuid } from "../../helpers/typecheckers";
3
4
  import { AzureEnvironment } from "../../types/auth";
4
5
  import { GetJson, GetJsonSync } from "../rest";
6
+ import { hasGlobalContext } from "../sharepoint.rest/common";
5
7
  function _getFriendlyName(hostName) {
6
8
  if (hostName.indexOf(".sharepoint.") !== -1) {
7
9
  let hostParts = hostName.split('.'); //should be xxx.sharepoint.com or xxx.sharepoint.us
@@ -43,6 +45,29 @@ function _processOpenidConfiguration(config, friendlyName) {
43
45
  }
44
46
  export function DiscoverTenantInfo(hostNameOrId, sync) {
45
47
  hostNameOrId = hostNameOrId.toLowerCase();
48
+ if ("location" in globalThis && hasGlobalContext()) {
49
+ if (!isValidGuid(hostNameOrId)) {
50
+ try {
51
+ let host1 = new URL(hostNameOrId).host.toLowerCase();
52
+ let host2 = window.location.host.toLowerCase();
53
+ if (host1 === host2) {
54
+ let info = _getTenantInfoFromContext();
55
+ if (!isNullOrUndefined(info)) {
56
+ return info;
57
+ }
58
+ }
59
+ }
60
+ catch {
61
+ }
62
+ }
63
+ else if (isValidGuid(_spPageContextInfo.aadTenantId)
64
+ && normalizeGuid(hostNameOrId) === normalizeGuid(_spPageContextInfo.aadTenantId)) {
65
+ let info = _getTenantInfoFromContext();
66
+ if (!isNullOrUndefined(info)) {
67
+ return info;
68
+ }
69
+ }
70
+ }
46
71
  let friendlyName = "";
47
72
  if (isValidGuid(hostNameOrId)) {
48
73
  friendlyName = hostNameOrId;
@@ -77,6 +102,22 @@ export function DiscoverTenantInfo(hostNameOrId, sync) {
77
102
  });
78
103
  }
79
104
  }
105
+ function _getTenantInfoFromContext() {
106
+ if (!hasGlobalContext()
107
+ || !("location" in globalThis)
108
+ || !isValidGuid(_spPageContextInfo.aadTenantId)
109
+ || isNullOrEmptyString(_spPageContextInfo["aadInstanceUrl"])
110
+ || isNullOrEmptyString(_spPageContextInfo["msGraphEndpointUrl"])) {
111
+ return null;
112
+ }
113
+ let environment = GetAzureEnvironmentFromAzureADLogin(_spPageContextInfo["aadInstanceUrl"]);
114
+ return {
115
+ environment: environment,
116
+ idOrName: normalizeGuid(_spPageContextInfo.aadTenantId),
117
+ authorityUrl: _spPageContextInfo["aadInstanceUrl"],
118
+ msGraphHost: new URL(_spPageContextInfo["msGraphEndpointUrl"]).host
119
+ };
120
+ }
80
121
  export function AutoDiscoverTenantInfo(sync) {
81
122
  if (sync === true) {
82
123
  return DiscoverTenantInfo(window.location.hostname.toLowerCase(), true);
@@ -100,13 +141,31 @@ export function GetEnvironmentFromACSEndPoint(ACSEndPoint) {
100
141
  }
101
142
  export function GetAzureADLoginEndPoint(environment) {
102
143
  switch (environment) {
103
- case AzureEnvironment.Germany: return "https://login.microsoftonline.de";
104
- case AzureEnvironment.China: return "https://login.chinacloudapi.cn";
105
- case AzureEnvironment.USGovernmentHigh: return "https://login.microsoftonline.us";
106
- case AzureEnvironment.PPE: return "https://login.windows-ppe.net";
144
+ case AzureEnvironment.Germany:
145
+ return "https://login.microsoftonline.de";
146
+ case AzureEnvironment.China:
147
+ return "https://login.chinacloudapi.cn";
148
+ case AzureEnvironment.USGovernmentHigh:
149
+ return "https://login.microsoftonline.us";
150
+ case AzureEnvironment.PPE:
151
+ return "https://login.windows-ppe.net";
107
152
  case AzureEnvironment.Production:
108
153
  default:
109
154
  return "https://login.microsoftonline.com";
110
155
  }
111
156
  }
157
+ export function GetAzureEnvironmentFromAzureADLogin(login) {
158
+ switch (login) {
159
+ case "https://login.microsoftonline.de":
160
+ return AzureEnvironment.Germany;
161
+ case "https://login.chinacloudapi.cn":
162
+ return AzureEnvironment.China;
163
+ case "https://login.microsoftonline.us":
164
+ return AzureEnvironment.USGovernmentHigh;
165
+ case "https://login.windows-ppe.net":
166
+ return AzureEnvironment.PPE;
167
+ default:
168
+ return AzureEnvironment.Production;
169
+ }
170
+ }
112
171
  //# sourceMappingURL=discovery.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../../src/utils/auth/discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAe,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAmB/C,SAAS,gBAAgB,CAAC,QAAgB;IACtC,IAAI,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1C,IAAI,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA,mDAAmD;QACvF,IAAI,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAClJ,IAAI,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC3G,OAAO,GAAG,aAAa,gBAAgB,YAAY,EAAE,CAAC;IAC1D,CAAC;SAAM,CAAC;QACJ,OAAO,QAAQ,CAAC,CAAA,qDAAqD;IACzE,CAAC;AACL,CAAC;AAED,SAAS,0BAA0B,CAAC,YAAoB;IACpD,OAAO,qCAAqC,YAAY,wCAAwC,CAAC;AACrG,CAAC;AAED,SAAS,2BAA2B,CAAC,MAA4B,EAAE,YAAoB;IACnF,IAAI,IAAI,GAAgB;QACpB,WAAW,EAAE,gBAAgB,CAAC,UAAU;QACxC,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE,KAAK;QACZ,WAAW,EAAE,IAAI;KACpB,CAAC;IAEF,IAAI,QAAQ,GAAG,MAAM,CAAC,cAAc,CAAC,CAAA,4BAA4B;IACjE,IAAI,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,0DAA0D;IACnH,IAAI,QAAQ,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA,oBAAoB;IAE9D,IAAI,CAAC,WAAW,GAAG,6BAA6B,CAAC,QAAQ,CAAC,CAAC;IAC3D,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;SAAM,CAAC;QACJ,IAAI,CAAC,QAAQ,GAAG,YAAY,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,YAAY,GAAG,GAAG,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IAClB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC;IAEvC,OAAO,IAAI,CAAC;AAChB,CAAC;AAID,MAAM,UAAU,kBAAkB,CAAC,YAAoB,EAAE,IAAc;IACnE,YAAY,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;IAE1C,IAAI,YAAY,GAAG,EAAE,CAAC;IAEtB,IAAI,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QAC5B,YAAY,GAAG,YAAY,CAAC;IAChC,CAAC;SAAM,CAAC;QACJ,YAAY,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,GAAG,GAAG,0BAA0B,CAAC,YAAY,CAAC,CAAC;IAEnD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAChB,IAAI,CAAC;YACD,IAAI,QAAQ,GAAG,WAAW,CAAuB,GAAG,CAAC,CAAC;YACtD,IAAI,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC7B,IAAI,IAAI,GAAG,2BAA2B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC7D,OAAO,IAAI,CAAC;QAChB,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACpB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;SAAM,CAAC;QACJ,OAAO,WAAW,CAAC,sBAAsB,YAAY,EAAE,EAAE,KAAK,IAAI,EAAE;YAChE,IAAI,CAAC;gBACD,IAAI,MAAM,GAAG,MAAM,OAAO,CAAuB,GAAG,CAAC,CAAC;gBACtD,IAAI,IAAI,GAAG,2BAA2B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;gBAC7D,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,OAAO,EAAE,EAAE,CAAC;gBACR,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpB,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAID,MAAM,UAAU,sBAAsB,CAAC,IAAc;IACjD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAChB,OAAO,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,WAAmB;IAC7D,QAAQ,WAAW,EAAE,CAAC;QAClB,KAAK,oBAAoB;YACrB,OAAO,gBAAgB,CAAC,gBAAgB,CAAC;QAC7C,KAAK,oBAAoB;YACrB,OAAO,gBAAgB,CAAC,OAAO,CAAC;QACpC,KAAK,gCAAgC;YACjC,OAAO,gBAAgB,CAAC,KAAK,CAAC;QAClC,KAAK,iBAAiB;YAClB,OAAO,gBAAgB,CAAC,GAAG,CAAC;QAChC,KAAK,2BAA2B,CAAC;QACjC;YACI,OAAO,gBAAgB,CAAC,UAAU,CAAC;IAC3C,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,WAA6B;IACjE,QAAQ,WAAW,EAAE,CAAC;QAClB,KAAK,gBAAgB,CAAC,OAAO,CAAC,CAAC,OAAO,kCAAkC,CAAC;QACzE,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,gCAAgC,CAAC;QACrE,KAAK,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,OAAO,kCAAkC,CAAC;QAClF,KAAK,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,+BAA+B,CAAC;QAClE,KAAK,gBAAgB,CAAC,UAAU,CAAC;QACjC;YACI,OAAO,mCAAmC,CAAC;IACnD,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../../src/utils/auth/discovery.ts"],"names":[],"mappings":"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"}
@@ -5,3 +5,4 @@ export declare function AutoDiscoverTenantInfo(sync?: false): Promise<ITenantInf
5
5
  export declare function AutoDiscoverTenantInfo(sync: true): ITenantInfo;
6
6
  export declare function GetEnvironmentFromACSEndPoint(ACSEndPoint: string): AzureEnvironment;
7
7
  export declare function GetAzureADLoginEndPoint(environment: AzureEnvironment): string;
8
+ export declare function GetAzureEnvironmentFromAzureADLogin(login: string): AzureEnvironment.Production | AzureEnvironment.PPE | AzureEnvironment.China | AzureEnvironment.Germany | AzureEnvironment.USGovernmentHigh;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kwiz/common",
3
- "version": "1.0.197",
3
+ "version": "1.0.198",
4
4
  "description": "KWIZ common utilities and helpers for M365 platform",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/esm/index.js",