@kwiz/node 1.0.15 → 1.0.19

package/.github/workflows/npm-publish.yml

@@ -0,0 +1,24 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
+
+name: Node.js Package
+
+on:
+  push:
+    tags: 
+      - 'v*.*.*' # run every time we commit with a new version number
+
+jobs:
+  build-publish-npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm run build
+      - run: npm run npm-publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.KWIZ_NPM_TOKEN}}

package/.madgerc

@@ -1,3 +1,3 @@
-{
-    "fileExtensions": ["js", "ts"]
+{
+    "fileExtensions": ["js", "ts"]
 }

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 KWIZ Corp
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 KWIZ Corp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,2 +1,2 @@
-# node
-Common utilities for node applications
+# node
+Common utilities for node applications

package/dist/exports-index.d.ts

@@ -3,3 +3,4 @@ export * from './auth/exports-index';
 export * from './graph/exports-index';
 export * from './storage/exports-index';
 export * from './axios';
+export * from './get-with-cache';

package/dist/exports-index.js

@@ -19,4 +19,5 @@ __exportStar(require("./auth/exports-index"), exports);
 __exportStar(require("./graph/exports-index"), exports);
 __exportStar(require("./storage/exports-index"), exports);
 __exportStar(require("./axios"), exports);
+__exportStar(require("./get-with-cache"), exports);
 //# sourceMappingURL=exports-index.js.map

package/dist/exports-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"exports-index.js","sourceRoot":"","sources":["../src/exports-index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,uDAAqC;AACrC,wDAAsC;AACtC,0DAAwC;AACxC,0CAAwB"}
+{"version":3,"file":"exports-index.js","sourceRoot":"","sources":["../src/exports-index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,uDAAqC;AACrC,wDAAsC;AACtC,0DAAwC;AACxC,0CAAwB;AACxB,mDAAiC"}

package/dist/get-with-cache.d.ts

@@ -0,0 +1,12 @@
+export declare function getWithCache<T>(worker: () => Promise<{
+    success: boolean;
+    value: T;
+}>, info: {
+    /** seconds */
+    successCacheDuration: number;
+    /** seconds */
+    failedCacheDuration?: number;
+    /** must be unique for your call! function name, and parameters */
+    cacheKey: string;
+    forceRefresh?: boolean;
+}): Promise<any>;

package/dist/get-with-cache.js

@@ -0,0 +1,43 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWithCache = void 0;
+const common_1 = require("@kwiz/common");
+const $$cache = {};
+function getWithCache(worker, info) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        //purge old values
+        Object.keys($$cache).forEach(key => {
+            if ($$cache[key].expires < now)
+                delete $$cache[key];
+        });
+        let cached = info.forceRefresh ? null : $$cache[info.cacheKey];
+        if ((0, common_1.isNullOrUndefined)(cached)) {
+            const result = yield worker();
+            if (result.success) {
+                $$cache[info.cacheKey] = {
+                    expires: new Date(new Date().getTime() + info.successCacheDuration * 1000),
+                    value: result.value
+                };
+            }
+            else if (info.failedCacheDuration > 0) {
+                $$cache[info.cacheKey] = {
+                    expires: new Date(new Date().getTime() + info.failedCacheDuration * 1000),
+                    value: result.value
+                };
+            }
+        }
+        return $$cache[info.cacheKey].value;
+    });
+}
+exports.getWithCache = getWithCache;
+//# sourceMappingURL=get-with-cache.js.map

package/dist/get-with-cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-with-cache.js","sourceRoot":"","sources":["../src/get-with-cache.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8D;AAE9D,MAAM,OAAO,GAA+C,EAAE,CAAC;AAE/D,SAAsB,YAAY,CAAI,MAAqD,EAAE,IAQ5F;;QACG,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,kBAAkB;QAClB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,GAAG;gBAAE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE/D,IAAI,IAAA,0BAAiB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,MAAM,EAAE,CAAC;YAC9B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG;oBACrB,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;oBAC1E,KAAK,EAAE,MAAM,CAAC,KAAK;iBACtB,CAAC;YACN,CAAC;iBACI,IAAI,IAAI,CAAC,mBAAmB,GAAG,CAAC,EAAE,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG;oBACrB,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;oBACzE,KAAK,EAAE,MAAM,CAAC,KAAK;iBACtB,CAAC;YACN,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;IACxC,CAAC;CAAA;AAjCD,oCAiCC"}

package/fix-folder-imports.js

@@ -1,27 +1,27 @@
-const glob = require('glob');
-const fs = require("fs-extra");
-const exportsFileName = "exports-index";
-const exportsFileNameWithExt = `${exportsFileName}.ts`;
-const exportsIndexFiles = glob.sync(`./src/**/${exportsFileNameWithExt}`);
-//loop every exportsIndexFiles and find any import to a directory, and replace with /exports-index
-console.time("fixing direcry imports");
-exportsIndexFiles.forEach(file => {
-    var content = fs.readFileSync(file, "utf8").split("\n");
-    var parentFolderContent = fs.readdirSync(file.replace(exportsFileNameWithExt, ''));
-    var hasChanges = false;
-    //loop every import - if it does not match a file in the folder, but matches a sub-folder - append exports-index to it
-    content.forEach((line, idx) => {
-        if (line.replace(/ /g, '').length > 0) {
-            let importName = line.slice(line.indexOf('./') + 2, line.length - 2);
-            if (parentFolderContent.includes(importName))//its a folder, otherwise it would be .ts
-            {
-                content[idx] = line.replace(`./${importName}`, `./${importName}/${exportsFileName}`);
-                hasChanges = true;
-            }
-        }
-    });
-    if (hasChanges) {
-        fs.writeFileSync(file, content.join('\n'));
-    }
-});
+const glob = require('glob');
+const fs = require("fs-extra");
+const exportsFileName = "exports-index";
+const exportsFileNameWithExt = `${exportsFileName}.ts`;
+const exportsIndexFiles = glob.sync(`./src/**/${exportsFileNameWithExt}`);
+//loop every exportsIndexFiles and find any import to a directory, and replace with /exports-index
+console.time("fixing direcry imports");
+exportsIndexFiles.forEach(file => {
+    var content = fs.readFileSync(file, "utf8").split("\n");
+    var parentFolderContent = fs.readdirSync(file.replace(exportsFileNameWithExt, ''));
+    var hasChanges = false;
+    //loop every import - if it does not match a file in the folder, but matches a sub-folder - append exports-index to it
+    content.forEach((line, idx) => {
+        if (line.replace(/ /g, '').length > 0) {
+            let importName = line.slice(line.indexOf('./') + 2, line.length - 2);
+            if (parentFolderContent.includes(importName))//its a folder, otherwise it would be .ts
+            {
+                content[idx] = line.replace(`./${importName}`, `./${importName}/${exportsFileName}`);
+                hasChanges = true;
+            }
+        }
+    });
+    if (hasChanges) {
+        fs.writeFileSync(file, content.join('\n'));
+    }
+});
 console.timeEnd("fixing direcry imports");

package/package.json

@@ -1,78 +1,78 @@
-{
-  "name": "@kwiz/node",
-  "version": "1.0.15",
-  "description": "KWIZ utilities and helpers for node applications",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "scripts": {
-    "watch": "tsc -watch",
-    "build": "npm run reindex-project && npm run test && tsc",
-    "build-explain": "tsc --explainFiles",
-    "check-dependencies": "madge --circular ./src",
-    "create-link": "npm link",
-    "test": "node --import tsx --test src",
-    "npm-v-patch": "npm version patch",
-    "npm-v-major": "npm version major",
-    "npm-publish": "npm publish --access public",
-    "reset-repo": "git fetch origin && git reset --hard origin/main",
-    "__update-kwiz-packages": "npm install @kwiz/common@latest",
-    "link-local-common": "npm link @kwiz/common",
-    "reindex-project": "cti create ./src -i _dependencies -w -b -n -o exports-index.ts && node fix-folder-imports.js",
-    "install-packages": "npm install azurite -g && npm ci",
-    "startDevStorage": "azurite -s -l"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/KWizCom/node.git"
-  },
-  "keywords": [
-    "KWIZ",
-    "SharePoint",
-    "SPO",
-    "Teams",
-    "Utilities",
-    "Helpers",
-    "Node"
-  ],
-  "author": "Shai Petel",
-  "contributors": [
-    "Shai Petel",
-    "Kevin Vieira"
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/KWizCom/node/issues",
-    "email": "support@kwizcom.com"
-  },
-  "homepage": "https://github.com/KWizCom/node#readme",
-  "private": false,
-  "engines": {
-    "node": ">=16"
-  },
-  "packageManager": "npm@9.5.1",
-  "devDependencies": {
-    "@types/node": "^18.19.21",
-    "create-ts-index": "^1.14.0",
-    "fs-extra": "^11.2.0",
-    "madge": "^6.1.0",
-    "tsx": "^4.7.1",
-    "typescript": "^5.3.3"
-  },
-  "dependencies": {
-    "@azure/data-tables": "^13.2.2",
-    "@azure/msal-node": "^2.6.4",
-    "@kwiz/common": "^1.0.19",
-    "axios": "^1.6.7",
-    "esbuild": "^0.19.12",
-    "get-tsconfig": "^4.7.2",
-    "resolve-pkg-maps": "^1.0.0"
-  }
-}
+{
+  "name": "@kwiz/node",
+  "version": "1.0.19",
+  "description": "KWIZ utilities and helpers for node applications",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "watch": "tsc -watch",
+    "build": "npm run reindex-project && npm run test && tsc",
+    "build-explain": "tsc --explainFiles",
+    "check-dependencies": "madge --circular ./src",
+    "create-link": "npm link",
+    "test": "node --import tsx --test src",
+    "npm-v-patch": "npm version patch && git push origin main:main && git push --tags",
+    "npm-v-major": "npm version major && git push origin main:main && git push --tags",
+    "npm-publish": "npm publish --access public",
+    "reset-repo": "git fetch origin && git reset --hard origin/main",
+    "__update-kwiz-packages": "npm install @kwiz/common@latest",
+    "link-local-common": "npm link @kwiz/common",
+    "reindex-project": "cti create ./src -i _dependencies -w -b -n -o exports-index.ts && node fix-folder-imports.js",
+    "install-packages": "npm install azurite -g && npm ci",
+    "startDevStorage": "azurite -s -l"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/KWizCom/node.git"
+  },
+  "keywords": [
+    "KWIZ",
+    "SharePoint",
+    "SPO",
+    "Teams",
+    "Utilities",
+    "Helpers",
+    "Node"
+  ],
+  "author": "Shai Petel",
+  "contributors": [
+    "Shai Petel",
+    "Kevin Vieira"
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/KWizCom/node/issues",
+    "email": "support@kwizcom.com"
+  },
+  "homepage": "https://github.com/KWizCom/node#readme",
+  "private": false,
+  "engines": {
+    "node": ">=16"
+  },
+  "packageManager": "npm@9.5.1",
+  "devDependencies": {
+    "@types/node": "^18.19.21",
+    "create-ts-index": "^1.14.0",
+    "fs-extra": "^11.2.0",
+    "madge": "^6.1.0",
+    "tsx": "^4.7.1",
+    "typescript": "^5.3.3"
+  },
+  "dependencies": {
+    "@azure/data-tables": "^13.2.2",
+    "@azure/msal-node": "^2.6.4",
+    "@kwiz/common": "^1.0.19",
+    "axios": "^1.6.7",
+    "esbuild": "^0.19.12",
+    "get-tsconfig": "^4.7.2",
+    "resolve-pkg-maps": "^1.0.0"
+  }
+}

package/src/SPO/common.ts

@@ -1,17 +1,17 @@
-import { AuthContextType, GetMSALSiteScope, ITenantInfo, isNullOrUndefined } from "@kwiz/common";
-import { GetMSALToken } from "../auth/msal";
-import { getAxiosConfigBearer } from "../axios";
-
-var auth: AuthContextType = null;
-export function ConfigureSPOAuth(config?: AuthContextType) {
-    auth = config;
-}
-export async function getAxiosConfigSharePoint(tenantInfo: ITenantInfo, hostName: string, clearCache?: boolean) {
-    if (isNullOrUndefined(auth)) throw Error("Call ConfigureSPOAuth first");
-    // only certificate supported
-    // DisableCustomAppAuthentication property, that disable this kind of auth., however it can be overriden using this command:
-    // Set-SPOTenant -DisableCustomAppAuthentication $false
-    let token = await GetMSALToken(tenantInfo, GetMSALSiteScope(hostName), auth, clearCache);
-    let config = getAxiosConfigBearer(token, { contantType: "application/json; odata=nometadata" });
-    return config;
+import { AuthContextType, GetMSALSiteScope, ITenantInfo, isNullOrUndefined } from "@kwiz/common";
+import { GetMSALToken } from "../auth/msal";
+import { getAxiosConfigBearer } from "../axios";
+
+var auth: AuthContextType = null;
+export function ConfigureSPOAuth(config?: AuthContextType) {
+    auth = config;
+}
+export async function getAxiosConfigSharePoint(tenantInfo: ITenantInfo, hostName: string, clearCache?: boolean) {
+    if (isNullOrUndefined(auth)) throw Error("Call ConfigureSPOAuth first");
+    // only certificate supported
+    // DisableCustomAppAuthentication property, that disable this kind of auth., however it can be overriden using this command:
+    // Set-SPOTenant -DisableCustomAppAuthentication $false
+    let token = await GetMSALToken(tenantInfo, GetMSALSiteScope(hostName), auth, clearCache);
+    let config = getAxiosConfigBearer(token, { contantType: "application/json; odata=nometadata" });
+    return config;
 }

package/src/auth/discovery.test.js

@@ -1,9 +1,9 @@
-import assert from 'assert/strict';
-import test from 'node:test';
-import { DiscoverTenantInfo } from "./discovery";
-
-test('DiscoverTenantInfo', async t => {
-    const tenantName = "kwizcom.com";
-    const tenantInfo = await DiscoverTenantInfo(tenantName);
-    assert.strictEqual(tenantInfo.idOrName, "7d034656-be03-457d-8d82-60e90cf5f400");
+import assert from 'assert/strict';
+import test from 'node:test';
+import { DiscoverTenantInfo } from "./discovery";
+
+test('DiscoverTenantInfo', async t => {
+    const tenantName = "kwizcom.com";
+    const tenantInfo = await DiscoverTenantInfo(tenantName);
+    assert.strictEqual(tenantInfo.idOrName, "7d034656-be03-457d-8d82-60e90cf5f400");
 });

package/src/auth/discovery.ts

@@ -1,61 +1,61 @@
-import { $AzureEnvironment, GetAzureADLoginEndPoint, GetEnvironmentFromACSEndPoint, ITenantInfo, isNullOrEmptyString, isValidGuid, promiseOnce } from "@kwiz/common";
-import axios from "axios";
-
-export function DiscoverTenantInfo(hostName: string) {
-    hostName = hostName.toLowerCase();
-    return promiseOnce(`DiscoverTenantInfo|${hostName}`, async () => {
-        let data: ITenantInfo = {
-            environment: $AzureEnvironment.Production,
-            idOrName: null,
-            authorityUrl: null,
-            valid: false
-        };
-
-        let tenantId: string = null;
-        let friendlyName: string = null;
-
-        try {
-            if (hostName.indexOf(".sharepoint.") !== -1) {
-                let hostParts = hostName.split('.');//should be xxx.sharepoint.com or xxx.sharepoint.us
-                let firstHostPart = hostParts[0];
-                let lastHostPart = hostParts[hostParts.length - 1] === "us" || hostParts[hostParts.length - 1] === "de" ? hostParts[hostParts.length - 1] : "com";
-                if (firstHostPart.endsWith("-admin")) firstHostPart = firstHostPart.substring(0, firstHostPart.length - 6);
-                friendlyName = `${firstHostPart}.onmicrosoft.${lastHostPart}`;
-            }
-            else friendlyName = hostName;//could be an exchange email domain, or bpos customer
-
-            let config = await axios.get<{
-                token_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/oauth2/token
-                cloud_instance_name: string;//microsoftonline.com
-                token_endpoint_auth_methods_supported: string[];// ["client_secret_post", "private_key_jwt", "client_secret_basic"]
-                response_modes_supported: string[];// ["query", "fragment", "form_post"]
-                response_types_supported: string[];// ["code", "id_token", "code id_token", "token id_token", "token"]
-                scopes_supported: string[];// ["openid"]
-                issuer: string;//https://sts.windows.net/7d034656-be03-457d-8d82-60e90cf5f400/
-                authorization_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/oauth2/authorize
-                device_authorization_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/oauth2/devicecode
-                end_session_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/oauth2/logout
-                userinfo_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/openid/userinfo
-                tenant_region_scope: string;//NA
-                cloud_graph_host_name: string;//graph.windows.net
-                msgraph_host: string;//graph.microsoft.com
-            }>(`https://login.microsoftonline.com/${friendlyName}/v2.0/.well-known/openid-configuration`);
-
-            let endpoint = config.data.token_endpoint;//https://xxxx/{tenant}/....
-            tenantId = endpoint.replace("//", "/").split('/')[2];//replace :// with :/ split by / and take the second part.
-            let instance = config.data.cloud_instance_name;//microsoftonline.us
-
-            data.environment = GetEnvironmentFromACSEndPoint(instance);
-            if (!isNullOrEmptyString(tenantId) || isValidGuid(tenantId))
-                data.idOrName = tenantId;
-            else
-                data.idOrName = friendlyName;
-
-            data.authorityUrl = `${GetAzureADLoginEndPoint(data.environment)}/${data.idOrName}`;
-            data.valid = true;
-        }
-        catch (e) { }
-
-        return data;
-    });
+import { $AzureEnvironment, GetAzureADLoginEndPoint, GetEnvironmentFromACSEndPoint, ITenantInfo, isNullOrEmptyString, isValidGuid, promiseOnce } from "@kwiz/common";
+import axios from "axios";
+
+export function DiscoverTenantInfo(hostName: string) {
+    hostName = hostName.toLowerCase();
+    return promiseOnce(`DiscoverTenantInfo|${hostName}`, async () => {
+        let data: ITenantInfo = {
+            environment: $AzureEnvironment.Production,
+            idOrName: null,
+            authorityUrl: null,
+            valid: false
+        };
+
+        let tenantId: string = null;
+        let friendlyName: string = null;
+
+        try {
+            if (hostName.indexOf(".sharepoint.") !== -1) {
+                let hostParts = hostName.split('.');//should be xxx.sharepoint.com or xxx.sharepoint.us
+                let firstHostPart = hostParts[0];
+                let lastHostPart = hostParts[hostParts.length - 1] === "us" || hostParts[hostParts.length - 1] === "de" ? hostParts[hostParts.length - 1] : "com";
+                if (firstHostPart.endsWith("-admin")) firstHostPart = firstHostPart.substring(0, firstHostPart.length - 6);
+                friendlyName = `${firstHostPart}.onmicrosoft.${lastHostPart}`;
+            }
+            else friendlyName = hostName;//could be an exchange email domain, or bpos customer
+
+            let config = await axios.get<{
+                token_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/oauth2/token
+                cloud_instance_name: string;//microsoftonline.com
+                token_endpoint_auth_methods_supported: string[];// ["client_secret_post", "private_key_jwt", "client_secret_basic"]
+                response_modes_supported: string[];// ["query", "fragment", "form_post"]
+                response_types_supported: string[];// ["code", "id_token", "code id_token", "token id_token", "token"]
+                scopes_supported: string[];// ["openid"]
+                issuer: string;//https://sts.windows.net/7d034656-be03-457d-8d82-60e90cf5f400/
+                authorization_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/oauth2/authorize
+                device_authorization_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/oauth2/devicecode
+                end_session_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/oauth2/logout
+                userinfo_endpoint: string;//https://login.microsoftonline.com/7d034656-be03-457d-8d82-60e90cf5f400/openid/userinfo
+                tenant_region_scope: string;//NA
+                cloud_graph_host_name: string;//graph.windows.net
+                msgraph_host: string;//graph.microsoft.com
+            }>(`https://login.microsoftonline.com/${friendlyName}/v2.0/.well-known/openid-configuration`);
+
+            let endpoint = config.data.token_endpoint;//https://xxxx/{tenant}/....
+            tenantId = endpoint.replace("//", "/").split('/')[2];//replace :// with :/ split by / and take the second part.
+            let instance = config.data.cloud_instance_name;//microsoftonline.us
+
+            data.environment = GetEnvironmentFromACSEndPoint(instance);
+            if (!isNullOrEmptyString(tenantId) || isValidGuid(tenantId))
+                data.idOrName = tenantId;
+            else
+                data.idOrName = friendlyName;
+
+            data.authorityUrl = `${GetAzureADLoginEndPoint(data.environment)}/${data.idOrName}`;
+            data.valid = true;
+        }
+        catch (e) { }
+
+        return data;
+    });
 }

package/src/auth/msal.ts

@@ -1,44 +1,44 @@
-import { ConfidentialClientApplication } from "@azure/msal-node";
-import { AuthContextType, AuthenticationModes, ITenantInfo } from "@kwiz/common";
-//find tenant id? https://login.microsoftonline.com/kwizcom.onmicrosoft.com/.well-known/openid-configuration
-//https://stackoverflow.com/questions/54771270/msal-ad-token-not-valid-with-sharepoint-online-csom
-
-var apps: { [tenant: string]: ConfidentialClientApplication } = {};
-
-function GetApp(tenantInfo: ITenantInfo, auth: AuthContextType) {
-    let key = `${tenantInfo.idOrName}|${auth.authenticationMode}`
-    if (!apps[key]) {
-        auth.authenticationMode === AuthenticationModes.clientSecret
-            ? apps[key] = new ConfidentialClientApplication({
-                auth: {
-                    clientId: auth.clientId,
-                    authority: tenantInfo.authorityUrl,
-                    clientSecret: auth.clientSecret
-                },
-
-            })
-            : apps[key] = new ConfidentialClientApplication({
-                auth: {
-                    clientId: auth.clientId,
-                    authority: tenantInfo.authorityUrl,
-                    clientCertificate: {
-                        thumbprint: auth.thumbprint,
-                        privateKey: auth.privateKey
-                    }
-                },
-
-            });
-    }
-    return apps[key];
-}
-
-/** client secret not supported by SharePoint, must use certificate */
-export async function GetMSALToken(tenantInfo: ITenantInfo, scope: string, auth: AuthContextType, clearCache?: boolean) {
-    const app = GetApp(tenantInfo, auth);
-    if (clearCache)
-        app.clearCache();
-    let token = await app.acquireTokenByClientCredential({
-        scopes: [`${scope}/.default`]
-    });
-    return token.accessToken;
+import { ConfidentialClientApplication } from "@azure/msal-node";
+import { AuthContextType, AuthenticationModes, ITenantInfo } from "@kwiz/common";
+//find tenant id? https://login.microsoftonline.com/kwizcom.onmicrosoft.com/.well-known/openid-configuration
+//https://stackoverflow.com/questions/54771270/msal-ad-token-not-valid-with-sharepoint-online-csom
+
+var apps: { [tenant: string]: ConfidentialClientApplication } = {};
+
+function GetApp(tenantInfo: ITenantInfo, auth: AuthContextType) {
+    let key = `${tenantInfo.idOrName}|${auth.authenticationMode}`
+    if (!apps[key]) {
+        auth.authenticationMode === AuthenticationModes.clientSecret
+            ? apps[key] = new ConfidentialClientApplication({
+                auth: {
+                    clientId: auth.clientId,
+                    authority: tenantInfo.authorityUrl,
+                    clientSecret: auth.clientSecret
+                },
+
+            })
+            : apps[key] = new ConfidentialClientApplication({
+                auth: {
+                    clientId: auth.clientId,
+                    authority: tenantInfo.authorityUrl,
+                    clientCertificate: {
+                        thumbprint: auth.thumbprint,
+                        privateKey: auth.privateKey
+                    }
+                },
+
+            });
+    }
+    return apps[key];
+}
+
+/** client secret not supported by SharePoint, must use certificate */
+export async function GetMSALToken(tenantInfo: ITenantInfo, scope: string, auth: AuthContextType, clearCache?: boolean) {
+    const app = GetApp(tenantInfo, auth);
+    if (clearCache)
+        app.clearCache();
+    let token = await app.acquireTokenByClientCredential({
+        scopes: [`${scope}/.default`]
+    });
+    return token.accessToken;
 }