@kwiz/common 1.0.126 → 1.0.128

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

@@ -1,24 +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 publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.KWIZ_NPM_TOKEN}}
+# 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 publish --access public
+        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/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/lib/cjs/types/libs/msal.types.js

@@ -1,31 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MSALSampleLoginPopupScript = void 0;
-exports.MSALSampleLoginPopupScript = `<p id="msg">please wait...</p>
-<script>
-function finish() {
-    try {
-        var hash = window.location.hash;
-        if (hash[0] === "#") hash = hash.slice(1);//get rid of #
-        var hashDictionary = {};
-        hash.split("&").forEach(function (keyValue) {
-            if (keyValue !== "") {
-                var vals = keyValue.split("=");
-                hashDictionary[vals[0]] = decodeURIComponent(vals[1]);
-            }
-        });
-        if (Object.keys(hashDictionary).length < 1)
-            window.close();//we lose the hash!
-        else if (hashDictionary.error && hashDictionary.error_description)
-            document.getElementById("msg").innerHTML = hashDictionary.error_description.replace(/\\+/g," ").replace(/\\n/g,"<br /><br />");
-        else if (hashDictionary.state) {
-            var origin = hashDictionary.state.split("|")[1];
-            if (origin) {
-                window.location.href = origin.split("#")[0] + window.location.hash;
-            }
-        }
-    } catch (e) { }
-}
-finish();
+exports.MSALSampleLoginPopupScript = `<p id="msg">please wait...</p>
+<script>
+function finish() {
+    try {
+        var hash = window.location.hash;
+        if (hash[0] === "#") hash = hash.slice(1);//get rid of #
+        var hashDictionary = {};
+        hash.split("&").forEach(function (keyValue) {
+            if (keyValue !== "") {
+                var vals = keyValue.split("=");
+                hashDictionary[vals[0]] = decodeURIComponent(vals[1]);
+            }
+        });
+        if (Object.keys(hashDictionary).length < 1)
+            window.close();//we lose the hash!
+        else if (hashDictionary.error && hashDictionary.error_description)
+            document.getElementById("msg").innerHTML = hashDictionary.error_description.replace(/\\+/g," ").replace(/\\n/g,"<br /><br />");
+        else if (hashDictionary.state) {
+            var origin = hashDictionary.state.split("|")[1];
+            if (origin) {
+                window.location.href = origin.split("#")[0] + window.location.hash;
+            }
+        }
+    } catch (e) { }
+}
+finish();
 </script>`;
 //# sourceMappingURL=msal.types.js.map

package/lib/cjs/utils/auth/common.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetSPFxClientAuthToken = exports.GetMSALSiteScope = exports.GetDefaultScope = exports.GetTokenAudiencePrefix = void 0;
+exports.GetSPFxClientAuthTokenSync = exports.GetSPFxClientAuthToken = exports.GetMSALSiteScope = exports.GetDefaultScope = exports.GetTokenAudiencePrefix = void 0;
+const exports_index_1 = require("../../exports-index");
 const typecheckers_1 = require("../../helpers/typecheckers");
 const auth_1 = require("../../types/auth");
 const rest_1 = require("../rest");
@@ -17,52 +18,98 @@ function GetMSALSiteScope(hostName) {
     return `https://${hostName}`;
 }
 exports.GetMSALSiteScope = GetMSALSiteScope;
-/** Acquire an authorization token for a Outlook, Graph, or SharePoint the same way SPFx clients do */
-async function GetSPFxClientAuthToken(siteUrl, spfxTokenType = auth_1.SPFxAuthTokenType.Graph) {
-    try {
-        let acquireURL = `${(0, common_1.GetRestBaseUrl)(siteUrl)}/SP.OAuth.Token/Acquire`;
-        //todo: add all the resource end points (ie. OneNote, Yammer, Stream)
-        let resource = "";
-        let isSPOToken = false;
-        switch (spfxTokenType) {
-            case auth_1.SPFxAuthTokenType.Outlook:
-                resource = "https://outlook.office365.com";
-                break;
-            case auth_1.SPFxAuthTokenType.SharePoint:
-            case auth_1.SPFxAuthTokenType.MySite:
-                isSPOToken = true;
-                resource = new URL(acquireURL).origin;
-                if (spfxTokenType === auth_1.SPFxAuthTokenType.MySite) {
-                    let split = resource.split(".");
-                    split[0] += "-my";
-                    resource = split.join(".");
-                }
-                break;
-            case auth_1.SPFxAuthTokenType.MySite:
-                resource = new URL(acquireURL).origin;
-                break;
-            default:
-                resource = "https://graph.microsoft.com";
-        }
-        let data = {
-            resource: resource,
-            tokenType: isSPOToken ? "SPO" : undefined
-        };
-        let result = await (0, rest_1.GetJson)(acquireURL, JSON.stringify(data), {
-            ...rest_1.shortLocalCache,
-            postCacheKey: `${spfxTokenType}_${_spPageContextInfo.webId}`,
+function _getGetSPFxClientAuthTokenParams(siteUrl, spfxTokenType = auth_1.SPFxAuthTokenType.Graph) {
+    let acquireURL = `${(0, common_1.GetRestBaseUrl)(siteUrl)}/SP.OAuth.Token/Acquire`;
+    //todo: add all the resource end points (ie. OneNote, Yammer, Stream)
+    let resource = "";
+    let isSPOToken = false;
+    switch (spfxTokenType) {
+        case auth_1.SPFxAuthTokenType.Outlook:
+            resource = "https://outlook.office365.com/search";
+            break;
+        case auth_1.SPFxAuthTokenType.SharePoint:
+        case auth_1.SPFxAuthTokenType.MySite:
+            isSPOToken = true;
+            resource = new URL(acquireURL).origin;
+            if (spfxTokenType === auth_1.SPFxAuthTokenType.MySite) {
+                let split = resource.split(".");
+                split[0] += "-my";
+                resource = split.join(".");
+            }
+            break;
+        default:
+            resource = "https://graph.microsoft.com";
+    }
+    let data = {
+        resource: resource,
+        tokenType: isSPOToken ? "SPO" : undefined
+    };
+    let params = {
+        url: acquireURL,
+        body: JSON.stringify(data),
+        options: {
+            allowCache: false,
+            // ...shortLocalCache,
+            // postCacheKey: `${spfxTokenType}_${_spPageContextInfo.webId}`,
             includeDigestInPost: true,
             headers: {
                 "Accept": "application/json;odata.metadata=minimal",
                 "content-type": "application/json; charset=UTF-8",
                 "odata-version": "4.0",
             }
-        });
-        return !(0, typecheckers_1.isNullOrUndefined)(result) && !(0, typecheckers_1.isNullOrEmptyString)(result.access_token) ? result.access_token : null;
+        }
+    };
+    return params;
+}
+function _parseAndCacheGetSPFxClientAuthTokenResult(result, spfxTokenType = auth_1.SPFxAuthTokenType.Graph) {
+    if (!(0, typecheckers_1.isNullOrUndefined)(result) && !(0, typecheckers_1.isNullOrEmptyString)(result.access_token)) {
+        let expiration = (0, typecheckers_1.isNumber)(result.expires_on) ?
+            new Date(result.expires_on * 1000) :
+            {
+                minutes: 15
+            };
+        (0, exports_index_1.setCacheItem)(`access_token_${spfxTokenType}_${_spPageContextInfo.webId}`, result.access_token, expiration);
+        return result.access_token;
+    }
+    return null;
+}
+function _getSPFxClientAuthTokenFromCache(spfxTokenType = auth_1.SPFxAuthTokenType.Graph) {
+    let cachedToken = (0, exports_index_1.getCacheItem)(`access_token_${spfxTokenType}_${_spPageContextInfo.webId}`);
+    if (!(0, typecheckers_1.isNullOrEmptyString)(cachedToken)) {
+        return cachedToken;
+    }
+    return null;
+}
+/** Acquire an authorization token for a Outlook, Graph, or SharePoint the same way SPFx clients do */
+async function GetSPFxClientAuthToken(siteUrl, spfxTokenType = auth_1.SPFxAuthTokenType.Graph) {
+    try {
+        let cachedToken = _getSPFxClientAuthTokenFromCache(spfxTokenType);
+        if (!(0, typecheckers_1.isNullOrEmptyString)(cachedToken)) {
+            return cachedToken;
+        }
+        let { url, body, options } = _getGetSPFxClientAuthTokenParams(siteUrl, spfxTokenType);
+        let result = await (0, rest_1.GetJson)(url, body, options);
+        return _parseAndCacheGetSPFxClientAuthTokenResult(result, spfxTokenType);
     }
     catch {
     }
     return null;
 }
 exports.GetSPFxClientAuthToken = GetSPFxClientAuthToken;
+/** Acquire an authorization token for a Outlook, Graph, or SharePoint the same way SPFx clients do */
+function GetSPFxClientAuthTokenSync(siteUrl, spfxTokenType = auth_1.SPFxAuthTokenType.Graph) {
+    try {
+        let cachedToken = _getSPFxClientAuthTokenFromCache(spfxTokenType);
+        if (!(0, typecheckers_1.isNullOrEmptyString)(cachedToken)) {
+            return cachedToken;
+        }
+        let { url, body, options } = _getGetSPFxClientAuthTokenParams(siteUrl, spfxTokenType);
+        let response = (0, rest_1.GetJsonSync)(url, body, options);
+        return _parseAndCacheGetSPFxClientAuthTokenResult(response.result, spfxTokenType);
+    }
+    catch {
+    }
+    return null;
+}
+exports.GetSPFxClientAuthTokenSync = GetSPFxClientAuthTokenSync;
 //# sourceMappingURL=common.js.map

package/lib/cjs/utils/auth/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/utils/auth/common.ts"],"names":[],"mappings":";;;AAAA,6DAAoF;AACpF,2CAAqD;AACrD,kCAAmD;AACnD,sDAA2D;AAE3D,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;AAED,sGAAsG;AAC/F,KAAK,UAAU,sBAAsB,CAAC,OAAe,EAAE,gBAAmC,wBAAiB,CAAC,KAAK;IACpH,IAAI,CAAC;QACD,IAAI,UAAU,GAAG,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,yBAAyB,CAAC;QAErE,qEAAqE;QACrE,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,QAAQ,aAAa,EAAE,CAAC;YACpB,KAAK,wBAAiB,CAAC,OAAO;gBAC1B,QAAQ,GAAG,+BAA+B,CAAC;gBAC3C,MAAM;YACV,KAAK,wBAAiB,CAAC,UAAU,CAAC;YAClC,KAAK,wBAAiB,CAAC,MAAM;gBACzB,UAAU,GAAG,IAAI,CAAC;gBAClB,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;gBACtC,IAAI,aAAa,KAAK,wBAAiB,CAAC,MAAM,EAAE,CAAC;oBAC7C,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAChC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;oBAClB,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC/B,CAAC;gBACD,MAAM;YACV,KAAK,wBAAiB,CAAC,MAAM;gBACzB,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAA;gBACrC,MAAM;YACV;gBACI,QAAQ,GAAG,6BAA6B,CAAC;QACjD,CAAC;QAED,IAAI,IAAI,GAAG;YACP,QAAQ,EAAE,QAAQ;YAClB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;SAC5C,CAAC;QAEF,IAAI,MAAM,GAAG,MAAM,IAAA,cAAO,EAOtB,UAAU,EACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EACpB;YACI,GAAG,sBAAe;YAClB,YAAY,EAAE,GAAG,aAAa,IAAI,kBAAkB,CAAC,KAAK,EAAE;YAC5D,mBAAmB,EAAE,IAAI;YACzB,OAAO,EAAE;gBACL,QAAQ,EAAE,yCAAyC;gBACnD,cAAc,EAAE,iCAAiC;gBACjD,eAAe,EAAE,KAAK;aACzB;SACJ,CAAC,CAAC;QAEP,OAAO,CAAC,IAAA,gCAAiB,EAAC,MAAM,CAAC,IAAI,CAAC,IAAA,kCAAmB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;IAChH,CAAC;IAAC,MAAM,CAAC;IACT,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAzDD,wDAyDC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/utils/auth/common.ts"],"names":[],"mappings":"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"}

package/lib/cjs/utils/sharepoint.rest/user.js

@@ -410,17 +410,17 @@ async function SetGroupOwner(siteUrl, groupId, ownerId, ownerIsAGroup) {
         try {
             let soapUrl = `${(0, common_1.GetSiteUrl)(siteUrl)}_vti_bin/client.svc/ProcessQuery`;
             let siteId = await (0, web_1.GetSiteId)(siteUrl);
-            let serviceJSONResponse = await (0, rest_1.GetJson)(soapUrl, `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="15.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009">
-<Actions>
-  <SetProperty Id="1" ObjectPathId="2" Name="Owner">
-    <Parameter ObjectPathId="3" />
-  </SetProperty>
-  <Method Name="Update" Id="4" ObjectPathId="2" />
-</Actions>
-<ObjectPaths>
-  <Identity Id="2" Name="740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:g:${groupId}" />
-  <Identity Id="3" Name="740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:g:${ownerId}" />
-</ObjectPaths>
+            let serviceJSONResponse = await (0, rest_1.GetJson)(soapUrl, `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="15.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009">
+<Actions>
+  <SetProperty Id="1" ObjectPathId="2" Name="Owner">
+    <Parameter ObjectPathId="3" />
+  </SetProperty>
+  <Method Name="Update" Id="4" ObjectPathId="2" />
+</Actions>
+<ObjectPaths>
+  <Identity Id="2" Name="740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:g:${groupId}" />
+  <Identity Id="3" Name="740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:g:${ownerId}" />
+</ObjectPaths>
 </Request>`, {
                 headers: {
                     Accept: rest_types_1.jsonTypes.standard,

package/lib/esm/types/libs/msal.types.js

@@ -1,28 +1,28 @@
-export const MSALSampleLoginPopupScript = `<p id="msg">please wait...</p>
-<script>
-function finish() {
-    try {
-        var hash = window.location.hash;
-        if (hash[0] === "#") hash = hash.slice(1);//get rid of #
-        var hashDictionary = {};
-        hash.split("&").forEach(function (keyValue) {
-            if (keyValue !== "") {
-                var vals = keyValue.split("=");
-                hashDictionary[vals[0]] = decodeURIComponent(vals[1]);
-            }
-        });
-        if (Object.keys(hashDictionary).length < 1)
-            window.close();//we lose the hash!
-        else if (hashDictionary.error && hashDictionary.error_description)
-            document.getElementById("msg").innerHTML = hashDictionary.error_description.replace(/\\+/g," ").replace(/\\n/g,"<br /><br />");
-        else if (hashDictionary.state) {
-            var origin = hashDictionary.state.split("|")[1];
-            if (origin) {
-                window.location.href = origin.split("#")[0] + window.location.hash;
-            }
-        }
-    } catch (e) { }
-}
-finish();
+export const MSALSampleLoginPopupScript = `<p id="msg">please wait...</p>
+<script>
+function finish() {
+    try {
+        var hash = window.location.hash;
+        if (hash[0] === "#") hash = hash.slice(1);//get rid of #
+        var hashDictionary = {};
+        hash.split("&").forEach(function (keyValue) {
+            if (keyValue !== "") {
+                var vals = keyValue.split("=");
+                hashDictionary[vals[0]] = decodeURIComponent(vals[1]);
+            }
+        });
+        if (Object.keys(hashDictionary).length < 1)
+            window.close();//we lose the hash!
+        else if (hashDictionary.error && hashDictionary.error_description)
+            document.getElementById("msg").innerHTML = hashDictionary.error_description.replace(/\\+/g," ").replace(/\\n/g,"<br /><br />");
+        else if (hashDictionary.state) {
+            var origin = hashDictionary.state.split("|")[1];
+            if (origin) {
+                window.location.href = origin.split("#")[0] + window.location.hash;
+            }
+        }
+    } catch (e) { }
+}
+finish();
 </script>`;
 //# sourceMappingURL=msal.types.js.map

package/lib/esm/utils/auth/common.js

@@ -1,6 +1,7 @@
-import { isNullOrEmptyString, isNullOrUndefined } from "../../helpers/typecheckers";
+import { getCacheItem, setCacheItem } from "../../exports-index";
+import { isNullOrEmptyString, isNullOrUndefined, isNumber } from "../../helpers/typecheckers";
 import { SPFxAuthTokenType } from "../../types/auth";
-import { GetJson, shortLocalCache } from "../rest";
+import { GetJson, GetJsonSync } from "../rest";
 import { GetRestBaseUrl } from "../sharepoint.rest/common";
 export function GetTokenAudiencePrefix(appId) {
     return `api://${appId}`;
@@ -11,48 +12,93 @@ export function GetDefaultScope(appId) {
 export function GetMSALSiteScope(hostName) {
     return `https://${hostName}`;
 }
-/** Acquire an authorization token for a Outlook, Graph, or SharePoint the same way SPFx clients do */
-export async function GetSPFxClientAuthToken(siteUrl, spfxTokenType = SPFxAuthTokenType.Graph) {
-    try {
-        let acquireURL = `${GetRestBaseUrl(siteUrl)}/SP.OAuth.Token/Acquire`;
-        //todo: add all the resource end points (ie. OneNote, Yammer, Stream)
-        let resource = "";
-        let isSPOToken = false;
-        switch (spfxTokenType) {
-            case SPFxAuthTokenType.Outlook:
-                resource = "https://outlook.office365.com";
-                break;
-            case SPFxAuthTokenType.SharePoint:
-            case SPFxAuthTokenType.MySite:
-                isSPOToken = true;
-                resource = new URL(acquireURL).origin;
-                if (spfxTokenType === SPFxAuthTokenType.MySite) {
-                    let split = resource.split(".");
-                    split[0] += "-my";
-                    resource = split.join(".");
-                }
-                break;
-            case SPFxAuthTokenType.MySite:
-                resource = new URL(acquireURL).origin;
-                break;
-            default:
-                resource = "https://graph.microsoft.com";
-        }
-        let data = {
-            resource: resource,
-            tokenType: isSPOToken ? "SPO" : undefined
-        };
-        let result = await GetJson(acquireURL, JSON.stringify(data), {
-            ...shortLocalCache,
-            postCacheKey: `${spfxTokenType}_${_spPageContextInfo.webId}`,
+function _getGetSPFxClientAuthTokenParams(siteUrl, spfxTokenType = SPFxAuthTokenType.Graph) {
+    let acquireURL = `${GetRestBaseUrl(siteUrl)}/SP.OAuth.Token/Acquire`;
+    //todo: add all the resource end points (ie. OneNote, Yammer, Stream)
+    let resource = "";
+    let isSPOToken = false;
+    switch (spfxTokenType) {
+        case SPFxAuthTokenType.Outlook:
+            resource = "https://outlook.office365.com/search";
+            break;
+        case SPFxAuthTokenType.SharePoint:
+        case SPFxAuthTokenType.MySite:
+            isSPOToken = true;
+            resource = new URL(acquireURL).origin;
+            if (spfxTokenType === SPFxAuthTokenType.MySite) {
+                let split = resource.split(".");
+                split[0] += "-my";
+                resource = split.join(".");
+            }
+            break;
+        default:
+            resource = "https://graph.microsoft.com";
+    }
+    let data = {
+        resource: resource,
+        tokenType: isSPOToken ? "SPO" : undefined
+    };
+    let params = {
+        url: acquireURL,
+        body: JSON.stringify(data),
+        options: {
+            allowCache: false,
+            // ...shortLocalCache,
+            // postCacheKey: `${spfxTokenType}_${_spPageContextInfo.webId}`,
             includeDigestInPost: true,
             headers: {
                 "Accept": "application/json;odata.metadata=minimal",
                 "content-type": "application/json; charset=UTF-8",
                 "odata-version": "4.0",
             }
-        });
-        return !isNullOrUndefined(result) && !isNullOrEmptyString(result.access_token) ? result.access_token : null;
+        }
+    };
+    return params;
+}
+function _parseAndCacheGetSPFxClientAuthTokenResult(result, spfxTokenType = SPFxAuthTokenType.Graph) {
+    if (!isNullOrUndefined(result) && !isNullOrEmptyString(result.access_token)) {
+        let expiration = isNumber(result.expires_on) ?
+            new Date(result.expires_on * 1000) :
+            {
+                minutes: 15
+            };
+        setCacheItem(`access_token_${spfxTokenType}_${_spPageContextInfo.webId}`, result.access_token, expiration);
+        return result.access_token;
+    }
+    return null;
+}
+function _getSPFxClientAuthTokenFromCache(spfxTokenType = SPFxAuthTokenType.Graph) {
+    let cachedToken = getCacheItem(`access_token_${spfxTokenType}_${_spPageContextInfo.webId}`);
+    if (!isNullOrEmptyString(cachedToken)) {
+        return cachedToken;
+    }
+    return null;
+}
+/** Acquire an authorization token for a Outlook, Graph, or SharePoint the same way SPFx clients do */
+export async function GetSPFxClientAuthToken(siteUrl, spfxTokenType = SPFxAuthTokenType.Graph) {
+    try {
+        let cachedToken = _getSPFxClientAuthTokenFromCache(spfxTokenType);
+        if (!isNullOrEmptyString(cachedToken)) {
+            return cachedToken;
+        }
+        let { url, body, options } = _getGetSPFxClientAuthTokenParams(siteUrl, spfxTokenType);
+        let result = await GetJson(url, body, options);
+        return _parseAndCacheGetSPFxClientAuthTokenResult(result, spfxTokenType);
+    }
+    catch {
+    }
+    return null;
+}
+/** Acquire an authorization token for a Outlook, Graph, or SharePoint the same way SPFx clients do */
+export function GetSPFxClientAuthTokenSync(siteUrl, spfxTokenType = SPFxAuthTokenType.Graph) {
+    try {
+        let cachedToken = _getSPFxClientAuthTokenFromCache(spfxTokenType);
+        if (!isNullOrEmptyString(cachedToken)) {
+            return cachedToken;
+        }
+        let { url, body, options } = _getGetSPFxClientAuthTokenParams(siteUrl, spfxTokenType);
+        let response = GetJsonSync(url, body, options);
+        return _parseAndCacheGetSPFxClientAuthTokenResult(response.result, spfxTokenType);
     }
     catch {
     }

package/lib/esm/utils/auth/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/utils/auth/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,MAAM,UAAU,sBAAsB,CAAC,KAAa;IAChD,OAAO,SAAS,KAAK,EAAE,CAAC;AAC5B,CAAC;AACD,MAAM,UAAU,eAAe,CAAC,KAAa;IACzC,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,iBAAiB,CAAC;AAC7D,CAAC;AACD,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC7C,OAAO,WAAW,QAAQ,EAAE,CAAC;AACjC,CAAC;AAED,sGAAsG;AACtG,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,OAAe,EAAE,gBAAmC,iBAAiB,CAAC,KAAK;IACpH,IAAI,CAAC;QACD,IAAI,UAAU,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,yBAAyB,CAAC;QAErE,qEAAqE;QACrE,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,QAAQ,aAAa,EAAE,CAAC;YACpB,KAAK,iBAAiB,CAAC,OAAO;gBAC1B,QAAQ,GAAG,+BAA+B,CAAC;gBAC3C,MAAM;YACV,KAAK,iBAAiB,CAAC,UAAU,CAAC;YAClC,KAAK,iBAAiB,CAAC,MAAM;gBACzB,UAAU,GAAG,IAAI,CAAC;gBAClB,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;gBACtC,IAAI,aAAa,KAAK,iBAAiB,CAAC,MAAM,EAAE,CAAC;oBAC7C,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAChC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;oBAClB,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC/B,CAAC;gBACD,MAAM;YACV,KAAK,iBAAiB,CAAC,MAAM;gBACzB,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAA;gBACrC,MAAM;YACV;gBACI,QAAQ,GAAG,6BAA6B,CAAC;QACjD,CAAC;QAED,IAAI,IAAI,GAAG;YACP,QAAQ,EAAE,QAAQ;YAClB,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;SAC5C,CAAC;QAEF,IAAI,MAAM,GAAG,MAAM,OAAO,CAOtB,UAAU,EACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EACpB;YACI,GAAG,eAAe;YAClB,YAAY,EAAE,GAAG,aAAa,IAAI,kBAAkB,CAAC,KAAK,EAAE;YAC5D,mBAAmB,EAAE,IAAI;YACzB,OAAO,EAAE;gBACL,QAAQ,EAAE,yCAAyC;gBACnD,cAAc,EAAE,iCAAiC;gBACjD,eAAe,EAAE,KAAK;aACzB;SACJ,CAAC,CAAC;QAEP,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;IAChH,CAAC;IAAC,MAAM,CAAC;IACT,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/utils/auth/common.ts"],"names":[],"mappings":"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"}