@pnp/cli-microsoft365 7.0.0-beta.7e7b4f8 → 7.0.0-beta.7f98bac

package/dist/utils/spo.js

@@ -1,26 +1,14 @@
-"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.spo = void 0;
-const url = require("url");
-const urlUtil_1 = require("./urlUtil");
-const validation_1 = require("./validation");
-const Auth_1 = require("../Auth");
-const config_1 = require("../config");
-const base_permissions_1 = require("../m365/spo/base-permissions");
-const request_1 = require("../request");
-const formatting_1 = require("./formatting");
-const odata_1 = require("./odata");
-const RoleType_1 = require("../m365/spo/commands/roledefinition/RoleType");
-exports.spo = {
+import url from 'url';
+import { urlUtil } from "./urlUtil.js";
+import { validation } from "./validation.js";
+import auth from '../Auth.js';
+import config from "../config.js";
+import { BasePermissions } from '../m365/spo/base-permissions.js';
+import request from "../request.js";
+import { formatting } from './formatting.js';
+import { odata } from './odata.js';
+import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js';
+export const spo = {
     getRequestDigest(siteUrl) {
         const requestOptions = {
             url: `${siteUrl}/_api/contextinfo`,
@@ -29,18 +17,18 @@ exports.spo = {
             },
             responseType: 'json'
         };
-        return request_1.default.post(requestOptions);
+        return request.post(requestOptions);
     },
     ensureFormDigest(siteUrl, logger, context, debug) {
-        return new Promise((resolve, reject) => {
-            if (validation_1.validation.isValidFormDigest(context)) {
+        return new Promise(async (resolve, reject) => {
+            if (validation.isValidFormDigest(context)) {
                 if (debug) {
-                    logger.logToStderr('Existing form digest still valid');
+                    await logger.logToStderr('Existing form digest still valid');
                 }
                 resolve(context);
                 return;
             }
-            exports.spo
+            spo
                 .getRequestDigest(siteUrl)
                 .then((res) => {
                 const now = new Date();
@@ -58,21 +46,21 @@ exports.spo = {
         });
     },
     waitUntilFinished({ operationId, siteUrl, resolve, reject, logger, currentContext, debug, verbose }) {
-        exports.spo
+        spo
             .ensureFormDigest(siteUrl, logger, currentContext, debug)
-            .then((res) => {
+            .then(async (res) => {
             currentContext = res;
             if (debug) {
-                logger.logToStderr(`Checking if operation ${operationId} completed...`);
+                await logger.logToStderr(`Checking if operation ${operationId} completed...`);
             }
             const requestOptions = {
                 url: `${siteUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
                     'X-RequestDigest': currentContext.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="188" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="184" Name="${operationId.replace(/\\n/g, '&#xA;').replace(/"/g, '')}" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="188" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="184" Name="${operationId.replace(/\\n/g, '&#xA;').replace(/"/g, '')}" /></ObjectPaths></Request>`
             };
-            return request_1.default.post(requestOptions);
+            return request.post(requestOptions);
         })
             .then((res) => {
             const json = JSON.parse(res);
@@ -91,7 +79,7 @@ exports.spo = {
                     return;
                 }
                 setTimeout(() => {
-                    exports.spo.waitUntilFinished({
+                    spo.waitUntilFinished({
                         operationId: JSON.stringify(operation._ObjectIdentity_),
                         siteUrl,
                         resolve,
@@ -115,12 +103,12 @@ exports.spo = {
             data: { "copyJobInfo": copyJobInfo },
             responseType: 'json'
         };
-        request_1.default
+        request
             .post(requestOptions)
-            .then((resp) => {
+            .then(async (resp) => {
             if (debug) {
-                logger.logToStderr('getCopyJobProgress response...');
-                logger.logToStderr(resp);
+                await logger.logToStderr('getCopyJobProgress response...');
+                await logger.logToStderr(resp);
             }
             for (const item of resp.Logs) {
                 const log = JSON.parse(item);
@@ -141,21 +129,21 @@ exports.spo = {
             }
             else {
                 setTimeout(() => {
-                    exports.spo.waitUntilCopyJobFinished({ copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, debug, verbose });
+                    spo.waitUntilCopyJobFinished({ copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, debug, verbose });
                 }, pollingInterval);
             }
         });
     },
-    getSpoUrl(logger, debug) {
-        if (Auth_1.default.service.spoUrl) {
+    async getSpoUrl(logger, debug) {
+        if (auth.service.spoUrl) {
             if (debug) {
-                logger.logToStderr(`SPO URL previously retrieved ${Auth_1.default.service.spoUrl}. Returning...`);
+                await logger.logToStderr(`SPO URL previously retrieved ${auth.service.spoUrl}. Returning...`);
             }
-            return Promise.resolve(Auth_1.default.service.spoUrl);
+            return Promise.resolve(auth.service.spoUrl);
         }
-        return new Promise((resolve, reject) => {
+        return new Promise(async (resolve, reject) => {
             if (debug) {
-                logger.logToStderr(`No SPO URL available. Retrieving from MS Graph...`);
+                await logger.logToStderr(`No SPO URL available. Retrieving from MS Graph...`);
             }
             const requestOptions = {
                 url: `https://graph.microsoft.com/v1.0/sites/root?$select=webUrl`,
@@ -164,17 +152,17 @@ exports.spo = {
                 },
                 responseType: 'json'
             };
-            request_1.default
+            request
                 .get(requestOptions)
                 .then((res) => {
-                Auth_1.default.service.spoUrl = res.webUrl;
-                return Auth_1.default.storeConnectionInfo();
+                auth.service.spoUrl = res.webUrl;
+                return auth.storeConnectionInfo();
             })
                 .then(() => {
-                resolve(Auth_1.default.service.spoUrl);
+                resolve(auth.service.spoUrl);
             }, (err) => {
-                if (Auth_1.default.service.spoUrl) {
-                    resolve(Auth_1.default.service.spoUrl);
+                if (auth.service.spoUrl) {
+                    resolve(auth.service.spoUrl);
                 }
                 else {
                     reject(err);
@@ -184,7 +172,7 @@ exports.spo = {
     },
     getSpoAdminUrl(logger, debug) {
         return new Promise((resolve, reject) => {
-            exports.spo
+            spo
                 .getSpoUrl(logger, debug)
                 .then((spoUrl) => {
                 resolve(spoUrl.replace(/(https:\/\/)([^\.]+)(.*)/, '$1$2-admin$3'));
@@ -193,23 +181,23 @@ exports.spo = {
             });
         });
     },
-    getTenantId(logger, debug) {
-        if (Auth_1.default.service.tenantId) {
+    async getTenantId(logger, debug) {
+        if (auth.service.tenantId) {
             if (debug) {
-                logger.logToStderr(`SPO Tenant ID previously retrieved ${Auth_1.default.service.tenantId}. Returning...`);
+                await logger.logToStderr(`SPO Tenant ID previously retrieved ${auth.service.tenantId}. Returning...`);
             }
-            return Promise.resolve(Auth_1.default.service.tenantId);
+            return Promise.resolve(auth.service.tenantId);
         }
-        return new Promise((resolve, reject) => {
+        return new Promise(async (resolve, reject) => {
             if (debug) {
-                logger.logToStderr(`No SPO Tenant ID available. Retrieving...`);
+                await logger.logToStderr(`No SPO Tenant ID available. Retrieving...`);
             }
             let spoAdminUrl = '';
-            exports.spo
+            spo
                 .getSpoAdminUrl(logger, debug)
                 .then((_spoAdminUrl) => {
                 spoAdminUrl = _spoAdminUrl;
-                return exports.spo.getRequestDigest(spoAdminUrl);
+                return spo.getRequestDigest(spoAdminUrl);
             })
                 .then((contextInfo) => {
                 const tenantInfoRequestOptions = {
@@ -218,20 +206,20 @@ exports.spo = {
                         'X-RequestDigest': contextInfo.FormDigestValue,
                         accept: 'application/json;odata=nometadata'
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
-                return request_1.default.post(tenantInfoRequestOptions);
+                return request.post(tenantInfoRequestOptions);
             })
                 .then((res) => {
                 const json = JSON.parse(res);
-                Auth_1.default.service.tenantId = json[json.length - 1]._ObjectIdentity_.replace('\n', '&#xA;');
-                return Auth_1.default.storeConnectionInfo();
+                auth.service.tenantId = json[json.length - 1]._ObjectIdentity_.replace('\n', '&#xA;');
+                return auth.storeConnectionInfo();
             })
                 .then(() => {
-                resolve(Auth_1.default.service.tenantId);
+                resolve(auth.service.tenantId);
             }, (err) => {
-                if (Auth_1.default.service.tenantId) {
-                    resolve(Auth_1.default.service.tenantId);
+                if (auth.service.tenantId) {
+                    resolve(auth.service.tenantId);
                 }
                 else {
                     reject(err);
@@ -243,19 +231,17 @@ exports.spo = {
      * Returns the Graph id of a site
      * @param webUrl web url e.g. https://contoso.sharepoint.com/sites/site1
      */
-    getSpoGraphSiteId(webUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const url = new URL(webUrl);
-            const requestOptions = {
-                url: `https://graph.microsoft.com/v1.0/sites/${url.hostname}:${url.pathname}?$select=id`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const result = yield request_1.default.get(requestOptions);
-            return result.id;
-        });
+    async getSpoGraphSiteId(webUrl) {
+        const url = new URL(webUrl);
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/sites/${url.hostname}:${url.pathname}?$select=id`,
+            headers: {
+                'accept': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const result = await request.get(requestOptions);
+        return result.id;
     },
     /**
      * Ensures the folder path exists
@@ -263,7 +249,7 @@ exports.spo = {
      * @param folderToEnsure web relative or server relative folder path e.g. /Documents/MyFolder or /sites/site1/Documents/MyFolder
      * @param siteAccessToken a valid access token for the site specified in the webFullUrl param
      */
-    ensureFolder(webFullUrl, folderToEnsure, logger, debug) {
+    async ensureFolder(webFullUrl, folderToEnsure, logger, debug) {
         const webUrl = url.parse(webFullUrl);
         if (!webUrl.protocol || !webUrl.hostname) {
             return Promise.reject('webFullUrl is not a valid URL');
@@ -277,11 +263,11 @@ exports.spo = {
             webFullUrl[webFullUrlLastCharPos] === '/') {
             webFullUrl = webFullUrl.substring(0, webFullUrlLastCharPos);
         }
-        folderToEnsure = urlUtil_1.urlUtil.getWebRelativePath(webFullUrl, folderToEnsure);
+        folderToEnsure = urlUtil.getWebRelativePath(webFullUrl, folderToEnsure);
         if (debug) {
-            logger.log(`folderToEnsure`);
-            logger.log(folderToEnsure);
-            logger.log('');
+            await logger.log(`folderToEnsure`);
+            await logger.log(folderToEnsure);
+            await logger.log('');
         }
         let nextFolder = '';
         let prevFolder = '';
@@ -289,51 +275,51 @@ exports.spo = {
         // build array of folders e.g. ["Shared%20Documents","22","54","55"]
         const folders = folderToEnsure.substring(1).split('/');
         if (debug) {
-            logger.log('folders to process');
-            logger.log(JSON.stringify(folders));
-            logger.log('');
+            await logger.log('folders to process');
+            await logger.log(JSON.stringify(folders));
+            await logger.log('');
         }
         // recursive function
-        const checkOrAddFolder = (resolve, reject) => {
+        const checkOrAddFolder = async (resolve, reject) => {
             if (folderIndex === folders.length) {
                 if (debug) {
-                    logger.log(`All sub-folders exist`);
+                    await logger.log(`All sub-folders exist`);
                 }
                 return resolve();
             }
             // append the next sub-folder to the folder path and check if it exists
             prevFolder = nextFolder;
             nextFolder += `/${folders[folderIndex]}`;
-            const folderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webFullUrl, nextFolder);
+            const folderServerRelativeUrl = urlUtil.getServerRelativePath(webFullUrl, nextFolder);
             const requestOptions = {
-                url: `${webFullUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderServerRelativeUrl)}')`,
+                url: `${webFullUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderServerRelativeUrl)}')`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 }
             };
-            request_1.default
+            request
                 .get(requestOptions)
                 .then(() => {
                 folderIndex++;
                 checkOrAddFolder(resolve, reject);
             })
                 .catch(() => {
-                const prevFolderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webFullUrl, prevFolder);
+                const prevFolderServerRelativeUrl = urlUtil.getServerRelativePath(webFullUrl, prevFolder);
                 const requestOptions = {
-                    url: `${webFullUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl=@a1)/AddSubFolderUsingPath(DecodedUrl=@a2)?@a1=%27${formatting_1.formatting.encodeQueryParameter(prevFolderServerRelativeUrl)}%27&@a2=%27${formatting_1.formatting.encodeQueryParameter(folders[folderIndex])}%27`,
+                    url: `${webFullUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl=@a1)/AddSubFolderUsingPath(DecodedUrl=@a2)?@a1=%27${formatting.encodeQueryParameter(prevFolderServerRelativeUrl)}%27&@a2=%27${formatting.encodeQueryParameter(folders[folderIndex])}%27`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
                     responseType: 'json'
                 };
-                return request_1.default.post(requestOptions)
+                return request.post(requestOptions)
                     .then(() => {
                     folderIndex++;
                     checkOrAddFolder(resolve, reject);
                 })
-                    .catch((err) => {
+                    .catch(async (err) => {
                     if (debug) {
-                        logger.log(`Could not create sub-folder ${folderServerRelativeUrl}`);
+                        await logger.log(`Could not create sub-folder ${folderServerRelativeUrl}`);
                     }
                     reject(err);
                 });
@@ -357,10 +343,10 @@ exports.spo = {
             headers: {
                 'X-RequestDigest': formDigestValue
             },
-            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
         };
         return new Promise((resolve, reject) => {
-            request_1.default.post(requestOptions).then((res) => {
+            request.post(requestOptions).then((res) => {
                 const json = JSON.parse(res);
                 const contents = json.find(x => { return x.ErrorInfo; });
                 if (contents && contents.ErrorInfo) {
@@ -385,18 +371,18 @@ exports.spo = {
      * @param formDigestValue formDigestValue
      */
     getEffectiveBasePermissions(webObjectIdentity, webUrl, formDigestValue, logger, debug) {
-        const basePermissionsResult = new base_permissions_1.BasePermissions();
+        const basePermissionsResult = new BasePermissions();
         const requestOptions = {
             url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
             headers: {
                 'X-RequestDigest': formDigestValue
             },
-            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="11" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="EffectiveBasePermissions" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="${webObjectIdentity}" /></ObjectPaths></Request>`
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="11" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="EffectiveBasePermissions" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="${webObjectIdentity}" /></ObjectPaths></Request>`
         };
         return new Promise((resolve, reject) => {
-            request_1.default.post(requestOptions).then((res) => {
+            request.post(requestOptions).then(async (res) => {
                 if (debug) {
-                    logger.log('Attempt to get the web EffectiveBasePermissions');
+                    await logger.log('Attempt to get the web EffectiveBasePermissions');
                 }
                 const json = JSON.parse(res);
                 const contents = json.find(x => { return x.ErrorInfo; });
@@ -424,16 +410,16 @@ exports.spo = {
       * @param formDigestValue formDigestValue
       */
     getFolderIdentity(webObjectIdentity, webUrl, siteRelativeUrl, formDigestValue) {
-        const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(webUrl, siteRelativeUrl);
+        const serverRelativePath = urlUtil.getServerRelativePath(webUrl, siteRelativeUrl);
         const requestOptions = {
             url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
             headers: {
                 'X-RequestDigest': formDigestValue
             },
-            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><ObjectIdentityQuery Id="11" ObjectPathId="9" /><Query Id="12" ObjectPathId="9"><Query SelectAllProperties="false"><Properties><Property Name="Properties" SelectAll="true"><Query SelectAllProperties="false"><Properties /></Query></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="9" ParentId="5" Name="GetFolderByServerRelativeUrl"><Parameters><Parameter Type="String">${serverRelativePath}</Parameter></Parameters></Method><Identity Id="5" Name="${webObjectIdentity}" /></ObjectPaths></Request>`
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><ObjectIdentityQuery Id="11" ObjectPathId="9" /><Query Id="12" ObjectPathId="9"><Query SelectAllProperties="false"><Properties><Property Name="Properties" SelectAll="true"><Query SelectAllProperties="false"><Properties /></Query></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="9" ParentId="5" Name="GetFolderByServerRelativeUrl"><Parameters><Parameter Type="String">${serverRelativePath}</Parameter></Parameters></Method><Identity Id="5" Name="${webObjectIdentity}" /></ObjectPaths></Request>`
         };
         return new Promise((resolve, reject) => {
-            return request_1.default.post(requestOptions).then((res) => {
+            return request.post(requestOptions).then((res) => {
                 const json = JSON.parse(res);
                 const contents = json.find(x => { return x.ErrorInfo; });
                 if (contents && contents.ErrorInfo) {
@@ -456,27 +442,25 @@ exports.spo = {
      * @param fileId GUID ID of the file
      * @param fileUrl Decoded site-relative or server-relative URL of the file
      */
-    getVroomFileDetails(webUrl, fileId, fileUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${webUrl}/_api/web/`;
-            if (fileUrl) {
-                const fileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, fileUrl);
-                requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')`;
-            }
-            else {
-                requestUrl += `GetFileById('${fileId}')`;
-            }
-            requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId';
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const res = yield request_1.default.get(requestOptions);
-            return res;
-        });
+    async getVroomFileDetails(webUrl, fileId, fileUrl) {
+        let requestUrl = `${webUrl}/_api/web/`;
+        if (fileUrl) {
+            const fileServerRelativeUrl = urlUtil.getServerRelativePath(webUrl, fileUrl);
+            requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting.encodeQueryParameter(fileServerRelativeUrl)}')`;
+        }
+        else {
+            requestUrl += `GetFileById('${fileId}')`;
+        }
+        requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId';
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        return res;
     },
     /**
      * Retrieves a list of Custom Actions from a SharePoint site.
@@ -484,21 +468,19 @@ exports.spo = {
      * @param scope The scope of custom actions to retrieve, allowed values "Site", "Web" or "All".
      * @param filter An OData filter query to limit the results.
      */
-    getCustomActions(webUrl, scope, filter) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (scope && scope !== "All" && scope !== "Site" && scope !== "Web") {
-                throw `Invalid scope '${scope}'. Allowed values are 'Site', 'Web' or 'All'.`;
-            }
-            const queryString = filter ? `?$filter=${filter}` : "";
-            if (scope && scope !== "All") {
-                return yield odata_1.odata.getAllItems(`${webUrl}/_api/${scope}/UserCustomActions${queryString}`);
-            }
-            const customActions = [
-                ...yield odata_1.odata.getAllItems(`${webUrl}/_api/Site/UserCustomActions${queryString}`),
-                ...yield odata_1.odata.getAllItems(`${webUrl}/_api/Web/UserCustomActions${queryString}`)
-            ];
-            return customActions;
-        });
+    async getCustomActions(webUrl, scope, filter) {
+        if (scope && scope !== "All" && scope !== "Site" && scope !== "Web") {
+            throw `Invalid scope '${scope}'. Allowed values are 'Site', 'Web' or 'All'.`;
+        }
+        const queryString = filter ? `?$filter=${filter}` : "";
+        if (scope && scope !== "All") {
+            return await odata.getAllItems(`${webUrl}/_api/${scope}/UserCustomActions${queryString}`);
+        }
+        const customActions = [
+            ...await odata.getAllItems(`${webUrl}/_api/Site/UserCustomActions${queryString}`),
+            ...await odata.getAllItems(`${webUrl}/_api/Web/UserCustomActions${queryString}`)
+        ];
+        return customActions;
     },
     /**
      * Retrieves a Custom Actions from a SharePoint site by Id.
@@ -506,69 +488,61 @@ exports.spo = {
      * @param id The Id of the Custom Action
      * @param scope The scope of custom actions to retrieve, allowed values "Site", "Web" or "All".
      */
-    getCustomActionById(webUrl, id, scope) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (scope && scope !== "All" && scope !== "Site" && scope !== "Web") {
-                throw `Invalid scope '${scope}'. Allowed values are 'Site', 'Web' or 'All'.`;
-            }
-            function getById(webUrl, id, scope) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    const requestOptions = {
-                        url: `${webUrl}/_api/${scope}/UserCustomActions(guid'${id}')`,
-                        headers: {
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        responseType: 'json'
-                    };
-                    const result = yield request_1.default.get(requestOptions);
-                    if (result["odata.null"] === true) {
-                        return undefined;
-                    }
-                    return result;
-                });
-            }
-            if (scope && scope !== "All") {
-                return yield getById(webUrl, id, scope);
-            }
-            const customActionOnWeb = yield getById(webUrl, id, "Web");
-            if (customActionOnWeb) {
-                return customActionOnWeb;
-            }
-            const customActionOnSite = yield getById(webUrl, id, "Site");
-            return customActionOnSite;
-        });
-    },
-    getTenantAppCatalogUrl(logger, debug) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const spoUrl = yield exports.spo.getSpoUrl(logger, debug);
+    async getCustomActionById(webUrl, id, scope) {
+        if (scope && scope !== "All" && scope !== "Site" && scope !== "Web") {
+            throw `Invalid scope '${scope}'. Allowed values are 'Site', 'Web' or 'All'.`;
+        }
+        async function getById(webUrl, id, scope) {
             const requestOptions = {
-                url: `${spoUrl}/_api/SP_TenantSettings_Current`,
+                url: `${webUrl}/_api/${scope}/UserCustomActions(guid'${id}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
-            const result = yield request_1.default.get(requestOptions);
-            return result.CorporateCatalogUrl;
-        });
+            const result = await request.get(requestOptions);
+            if (result["odata.null"] === true) {
+                return undefined;
+            }
+            return result;
+        }
+        if (scope && scope !== "All") {
+            return await getById(webUrl, id, scope);
+        }
+        const customActionOnWeb = await getById(webUrl, id, "Web");
+        if (customActionOnWeb) {
+            return customActionOnWeb;
+        }
+        const customActionOnSite = await getById(webUrl, id, "Site");
+        return customActionOnSite;
+    },
+    async getTenantAppCatalogUrl(logger, debug) {
+        const spoUrl = await spo.getSpoUrl(logger, debug);
+        const requestOptions = {
+            url: `${spoUrl}/_api/SP_TenantSettings_Current`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const result = await request.get(requestOptions);
+        return result.CorporateCatalogUrl;
     },
     /**
      * Retrieves the Azure AD ID from a SP user.
      * @param webUrl Web url
      * @param id The Id of the user
      */
-    getUserAzureIdBySpoId(webUrl, id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestOptions = {
-                url: `${webUrl}/_api/web/siteusers/GetById('${formatting_1.formatting.encodeQueryParameter(id)}')?$select=AadObjectId`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const res = yield request_1.default.get(requestOptions);
-            return res.AadObjectId.NameId;
-        });
+    async getUserAzureIdBySpoId(webUrl, id) {
+        const requestOptions = {
+            url: `${webUrl}/_api/web/siteusers/GetById('${formatting.encodeQueryParameter(id)}')?$select=AadObjectId`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        return res.AadObjectId.NameId;
     },
     /**
    * Retrieves the spo user by email.
@@ -577,131 +551,117 @@ exports.spo = {
    * @param logger the Logger object
    * @param debug set if debug logging should be logged
    */
-    getUserByEmail(webUrl, email, logger, debug) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (debug) {
-                logger.logToStderr(`Retrieving the spo user by email ${email}`);
-            }
-            const requestUrl = `${webUrl}/_api/web/siteusers/GetByEmail('${formatting_1.formatting.encodeQueryParameter(email)}')`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const userInstance = yield request_1.default.get(requestOptions);
-            return userInstance;
-        });
+    async getUserByEmail(webUrl, email, logger, debug) {
+        if (debug) {
+            await logger.logToStderr(`Retrieving the spo user by email ${email}`);
+        }
+        const requestUrl = `${webUrl}/_api/web/siteusers/GetByEmail('${formatting.encodeQueryParameter(email)}')`;
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const userInstance = await request.get(requestOptions);
+        return userInstance;
     },
     /**
      * Retrieves the menu state for the quick launch.
      * @param webUrl Web url
      */
-    getQuickLaunchMenuState(webUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getMenuState(webUrl);
-        });
+    async getQuickLaunchMenuState(webUrl) {
+        return this.getMenuState(webUrl);
     },
     /**
      * Retrieves the menu state for the top navigation.
      * @param webUrl Web url
      */
-    getTopNavigationMenuState(webUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getMenuState(webUrl, '1002');
-        });
+    async getTopNavigationMenuState(webUrl) {
+        return this.getMenuState(webUrl, '1002');
     },
     /**
      * Retrieves the menu state.
      * @param webUrl Web url
      * @param menuNodeKey Menu node key
      */
-    getMenuState(webUrl, menuNodeKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestBody = {
-                customProperties: null,
-                depth: 10,
-                mapProviderName: null,
-                menuNodeKey: menuNodeKey || null
-            };
-            const requestOptions = {
-                url: `${webUrl}/_api/navigation/MenuState`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: requestBody,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        });
+    async getMenuState(webUrl, menuNodeKey) {
+        const requestBody = {
+            customProperties: null,
+            depth: 10,
+            mapProviderName: null,
+            menuNodeKey: menuNodeKey || null
+        };
+        const requestOptions = {
+            url: `${webUrl}/_api/navigation/MenuState`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            data: requestBody,
+            responseType: 'json'
+        };
+        return request.post(requestOptions);
     },
     /**
     * Saves the menu state.
     * @param webUrl Web url
     * @param menuState Updated menu state
     */
-    saveMenuState(webUrl, menuState) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestOptions = {
-                url: `${webUrl}/_api/navigation/SaveMenuState`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: { menuState: menuState },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        });
+    async saveMenuState(webUrl, menuState) {
+        const requestOptions = {
+            url: `${webUrl}/_api/navigation/SaveMenuState`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            data: { menuState: menuState },
+            responseType: 'json'
+        };
+        return request.post(requestOptions);
     },
     /**
-  * Retrieves the spo group by name.
-  * @param webUrl Web url
-  * @param name The name of the group
-  * @param logger the Logger object
-  * @param debug set if debug logging should be logged
-  */
-    getGroupByName(webUrl, name, logger, debug) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (debug) {
-                logger.logToStderr(`Retrieving the group by name ${name}`);
-            }
-            const requestUrl = `${webUrl}/_api/web/sitegroups/GetByName('${formatting_1.formatting.encodeQueryParameter(name)}')`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const groupInstance = yield request_1.default.get(requestOptions);
-            return groupInstance;
-        });
+      * Retrieves the spo group by name.
+      * @param webUrl Web url
+      * @param name The name of the group
+      * @param logger the Logger object
+      * @param debug set if debug logging should be logged
+      */
+    async getGroupByName(webUrl, name, logger, debug) {
+        if (debug) {
+            await logger.logToStderr(`Retrieving the group by name ${name}`);
+        }
+        const requestUrl = `${webUrl}/_api/web/sitegroups/GetByName('${formatting.encodeQueryParameter(name)}')`;
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const groupInstance = await request.get(requestOptions);
+        return groupInstance;
     },
     /**
-  * Retrieves the role definition by name.
-  * @param webUrl Web url
-  * @param name the name of the role definition
-  * @param logger the Logger object
-  * @param debug set if debug logging should be logged
-  */
-    getRoleDefinitionByName(webUrl, name, logger, debug) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (debug) {
-                logger.logToStderr(`Retrieving the role definitions for ${name}`);
-            }
-            const roledefinitions = yield odata_1.odata.getAllItems(`${webUrl}/_api/web/roledefinitions`);
-            const roledefinition = roledefinitions.find((role) => role.Name === name);
-            if (!roledefinition) {
-                throw `No roledefinition is found for ${name}`;
-            }
-            const permissions = new base_permissions_1.BasePermissions();
-            permissions.high = roledefinition.BasePermissions.High;
-            permissions.low = roledefinition.BasePermissions.Low;
-            roledefinition.BasePermissionsValue = permissions.parse();
-            roledefinition.RoleTypeKindValue = RoleType_1.RoleType[roledefinition.RoleTypeKind];
-            return roledefinition;
-        });
+      * Retrieves the role definition by name.
+      * @param webUrl Web url
+      * @param name the name of the role definition
+      * @param logger the Logger object
+      * @param debug set if debug logging should be logged
+      */
+    async getRoleDefinitionByName(webUrl, name, logger, debug) {
+        if (debug) {
+            await logger.logToStderr(`Retrieving the role definitions for ${name}`);
+        }
+        const roledefinitions = await odata.getAllItems(`${webUrl}/_api/web/roledefinitions`);
+        const roledefinition = roledefinitions.find((role) => role.Name === name);
+        if (!roledefinition) {
+            throw `No roledefinition is found for ${name}`;
+        }
+        const permissions = new BasePermissions();
+        permissions.high = roledefinition.BasePermissions.High;
+        permissions.low = roledefinition.BasePermissions.Low;
+        roledefinition.BasePermissionsValue = permissions.parse();
+        roledefinition.RoleTypeKindValue = RoleType[roledefinition.RoleTypeKind];
+        return roledefinition;
     }
 };
 //# sourceMappingURL=spo.js.map