@pnp/cli-microsoft365 7.0.0-beta.b7ec1d3 → 7.0.0-beta.c2db9df

package/dist/utils/spo.js

@@ -1,26 +1,16 @@
-"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';
+import { aadGroup } from './aadGroup.js';
+import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js';
+export const spo = {
     getRequestDigest(siteUrl) {
         const requestOptions = {
             url: `${siteUrl}/_api/contextinfo`,
@@ -29,18 +19,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 +48,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 +81,7 @@ exports.spo = {
                     return;
                 }
                 setTimeout(() => {
-                    exports.spo.waitUntilFinished({
+                    spo.waitUntilFinished({
                         operationId: JSON.stringify(operation._ObjectIdentity_),
                         siteUrl,
                         resolve,
@@ -105,57 +95,16 @@ exports.spo = {
             }
         });
     },
-    waitUntilCopyJobFinished({ copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, debug, verbose }) {
-        const requestUrl = `${siteUrl}/_api/site/GetCopyJobProgress`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: { "copyJobInfo": copyJobInfo },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((resp) => {
-            if (debug) {
-                logger.logToStderr('getCopyJobProgress response...');
-                logger.logToStderr(resp);
-            }
-            for (const item of resp.Logs) {
-                const log = JSON.parse(item);
-                // reject if progress error
-                if (log.Event === "JobError" || log.Event === "JobFatalError") {
-                    return reject(log.Message);
-                }
-            }
-            // two possible scenarios
-            // job done = success promise returned
-            // job in progress = recursive call using setTimeout returned
-            if (resp.JobState === 0) {
-                // job done
-                if (verbose) {
-                    process.stdout.write('\n');
-                }
-                resolve();
-            }
-            else {
-                setTimeout(() => {
-                    exports.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 +113,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 +133,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 +142,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 +167,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 +192,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 +210,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 +224,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 +236,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/GetFolderByServerRelativePath(DecodedUrl='${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 +304,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 +332,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 +371,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 +403,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 +429,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 +449,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 +512,697 @@ 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* () {
+    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
+    */
+    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
+    */
+    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;
+    },
+    /**
+    * Adds a SharePoint site.
+    * @param type Type of sites to add. Allowed values TeamSite, CommunicationSite, ClassicSite, default TeamSite
+    * @param title Site title
+    * @param alias Site alias, used in the URL and in the team site group e-mail (applies to type TeamSite)
+    * @param url Site URL (applies to type CommunicationSite, ClassicSite)
+    * @param timeZone Integer representing time zone to use for the site (applies to type ClassicSite)
+    * @param description Site description
+    * @param lcid Site language in the LCID format
+    * @param owners Comma-separated list of users to set as site owners (applies to type TeamSite, ClassicSite)
+    * @param isPublic Determines if the associated group is public or not (applies to type TeamSite)
+    * @param classification Site classification (applies to type TeamSite, CommunicationSite)
+    * @param siteDesignType of communication site to create. Allowed values Topic, Showcase, Blank, default Topic. When creating a communication site, specify either siteDesign or siteDesignId (applies to type CommunicationSite)
+    * @param siteDesignId Id of the custom site design to use to create the site. When creating a communication site, specify either siteDesign or siteDesignId (applies to type CommunicationSite)
+    * @param shareByEmailEnabled Determines whether it's allowed to share file with guests (applies to type CommunicationSite)
+    * @param webTemplate Template to use for creating the site. Default `STS#0` (applies to type ClassicSite)
+    * @param resourceQuota The quota for this site collection in Sandboxed Solutions units. Default 0 (applies to type ClassicSite)
+    * @param resourceQuotaWarningLevel The warning level for the resource quota. Default 0 (applies to type ClassicSite)
+    * @param storageQuota The storage quota for this site collection in megabytes. Default 100 (applies to type ClassicSite)
+    * @param storageQuotaWarningLevel The warning level for the storage quota in megabytes. Default 100 (applies to type ClassicSite)
+    * @param removeDeletedSite Set, to remove existing deleted site with the same URL from the Recycle Bin (applies to type ClassicSite)
+    * @param wait Wait for the site to be provisioned before completing the command (applies to type ClassicSite)
+    * @param logger the Logger object
+    * @param verbose set if verbose logging should be logged
+    */
+    async addSite(title, logger, verbose, wait, type, alias, description, owners, shareByEmailEnabled, removeDeletedSite, classification, isPublic, lcid, url, siteDesign, siteDesignId, timeZone, webTemplate, resourceQuota, resourceQuotaWarningLevel, storageQuota, storageQuotaWarningLevel) {
+        if (type === 'ClassicSite') {
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, verbose);
+            let context = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+            let exists;
+            if (removeDeletedSite) {
+                exists = await spo.siteExists(url, logger, verbose);
+            }
+            else {
+                // assume site doesn't exist
+                exists = false;
+            }
+            if (exists) {
+                if (verbose) {
+                    await logger.logToStderr('Site exists in the recycle bin');
+                }
+                await spo.deleteSiteFromTheRecycleBin(url, logger, verbose, wait);
+            }
+            else {
+                if (verbose) {
+                    await logger.logToStderr('Site not found');
+                }
+            }
+            context = await spo.ensureFormDigest(spoAdminUrl, logger, context, verbose);
+            if (verbose) {
+                await logger.logToStderr(`Creating site collection ${url}...`);
+            }
+            const lcidOption = typeof lcid === 'number' ? lcid : 1033;
+            const storageQuotaOption = typeof storageQuota === 'number' ? storageQuota : 100;
+            const storageQuotaWarningLevelOption = typeof storageQuotaWarningLevel === 'number' ? storageQuotaWarningLevel : 100;
+            const resourceQuotaOption = typeof resourceQuota === 'number' ? resourceQuota : 0;
+            const resourceQuotaWarningLevelOption = typeof resourceQuotaWarningLevel === 'number' ? resourceQuotaWarningLevel : 0;
+            const webTemplateOption = webTemplate || 'STS#0';
             const requestOptions = {
-                url: `${webUrl}/_api/navigation/SaveMenuState`,
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
-                    accept: 'application/json;odata=nometadata'
+                    'X-RequestDigest': context.FormDigestValue
                 },
-                data: { menuState: menuState },
-                responseType: 'json'
+                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" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcidOption}</Property><Property Name="Owner" Type="String">${formatting.escapeXml(owners)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuotaOption}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevelOption}</Property><Property Name="Template" Type="String">${formatting.escapeXml(webTemplateOption)}</Property><Property Name="TimeZoneId" Type="Int32">${timeZone}</Property><Property Name="Title" Type="String">${formatting.escapeXml(title)}</Property><Property Name="Url" Type="String">${formatting.escapeXml(url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuotaOption}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevelOption}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
             };
-            return request_1.default.post(requestOptions);
+            const res = await request.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            else {
+                const operation = json[json.length - 1];
+                const isComplete = operation.IsComplete;
+                if (!wait || isComplete) {
+                    return;
+                }
+                await new Promise((resolve, reject) => {
+                    setTimeout(() => {
+                        spo.waitUntilFinished({
+                            operationId: JSON.stringify(operation._ObjectIdentity_),
+                            siteUrl: spoAdminUrl,
+                            resolve,
+                            reject,
+                            logger,
+                            currentContext: context,
+                            verbose: verbose,
+                            debug: verbose
+                        });
+                    }, operation.PollingInterval);
+                });
+            }
+        }
+        else {
+            const isTeamSite = type !== 'CommunicationSite';
+            const spoUrl = await spo.getSpoUrl(logger, verbose);
+            if (verbose) {
+                await logger.logToStderr(`Creating new site...`);
+            }
+            let requestOptions = {};
+            if (isTeamSite) {
+                requestOptions = {
+                    url: `${spoUrl}/_api/GroupSiteManager/CreateGroupEx`,
+                    headers: {
+                        'content-type': 'application/json; odata=verbose; charset=utf-8',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: {
+                        displayName: title,
+                        alias: alias,
+                        isPublic: isPublic,
+                        optionalParams: {
+                            Description: description || '',
+                            CreationOptions: {
+                                results: [],
+                                Classification: classification || ''
+                            }
+                        }
+                    }
+                };
+                if (lcid) {
+                    requestOptions.data.optionalParams.CreationOptions.results.push(`SPSiteLanguage:${lcid}`);
+                }
+                if (owners) {
+                    requestOptions.data.optionalParams.Owners = {
+                        results: owners.split(',').map(o => o.trim())
+                    };
+                }
+            }
+            else {
+                if (siteDesignId) {
+                    siteDesignId = siteDesignId;
+                }
+                else {
+                    if (siteDesign) {
+                        switch (siteDesign) {
+                            case 'Topic':
+                                siteDesignId = '00000000-0000-0000-0000-000000000000';
+                                break;
+                            case 'Showcase':
+                                siteDesignId = '6142d2a0-63a5-4ba0-aede-d9fefca2c767';
+                                break;
+                            case 'Blank':
+                                siteDesignId = 'f6cc5403-0d63-442e-96c0-285923709ffc';
+                                break;
+                        }
+                    }
+                    else {
+                        siteDesignId = '00000000-0000-0000-0000-000000000000';
+                    }
+                }
+                requestOptions = {
+                    url: `${spoUrl}/_api/SPSiteManager/Create`,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: {
+                        request: {
+                            Title: title,
+                            Url: url,
+                            ShareByEmailEnabled: shareByEmailEnabled,
+                            Description: description || '',
+                            Classification: classification || '',
+                            WebTemplate: 'SITEPAGEPUBLISHING#0',
+                            SiteDesignId: siteDesignId
+                        }
+                    }
+                };
+                if (lcid) {
+                    requestOptions.data.request.Lcid = lcid;
+                }
+                if (owners) {
+                    requestOptions.data.request.Owner = owners;
+                }
+            }
+            const res = await request.post(requestOptions);
+            if (isTeamSite) {
+                if (res.ErrorMessage !== null) {
+                    throw res.ErrorMessage;
+                }
+                else {
+                    return res.SiteUrl;
+                }
+            }
+            else {
+                if (res.SiteStatus === 2) {
+                    return res.SiteUrl;
+                }
+                else {
+                    throw 'An error has occurred while creating the site';
+                }
+            }
+        }
+    },
+    /**
+    * Checks if a site exists
+    * Returns a boolean
+    * @param url The url of the site
+    * @param logger the Logger object
+    * @param verbose set if verbose logging should be logged
+    */
+    async siteExists(url, logger, verbose) {
+        const spoAdminUrl = await spo.getSpoAdminUrl(logger, verbose);
+        const context = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+        if (verbose) {
+            await logger.logToStderr(`Checking if the site ${url} exists...`);
+        }
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': context.FormDigestValue
+            },
+            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="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
+        };
+        const res1 = await request.post(requestOptions);
+        const json = JSON.parse(res1);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            if (response.ErrorInfo.ErrorTypeName === 'Microsoft.Online.SharePoint.Common.SpoNoSiteException') {
+                return await this.siteExistsInTheRecycleBin(url, logger, verbose);
+            }
+            else {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+        }
+        else {
+            const site = json[json.length - 1];
+            return site.Status === 'Recycled';
+        }
+    },
+    /**
+    * Checks if a site exists in the recycle bin
+    * Returns a boolean
+    * @param url The url of the site
+    * @param logger the Logger object
+    * @param verbose set if verbose logging should be logged
+    */
+    async siteExistsInTheRecycleBin(url, logger, verbose) {
+        if (verbose) {
+            await logger.logToStderr(`Site doesn't exist. Checking if the site ${url} exists in the recycle bin...`);
+        }
+        const spoAdminUrl = await spo.getSpoAdminUrl(logger, verbose);
+        const context = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': context.FormDigestValue
+            },
+            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="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            if (response.ErrorInfo.ErrorTypeName === 'Microsoft.SharePoint.Client.UnknownError') {
+                return false;
+            }
+            throw response.ErrorInfo.ErrorMessage;
+        }
+        const site = json[json.length - 1];
+        return site.Status === 'Recycled';
+    },
+    /**
+    * Deletes a site from the recycle bin
+    * @param url The url of the site
+    * @param logger the Logger object
+    * @param verbose set if verbose logging should be logged
+    * @param wait set to wait until finished
+    */
+    async deleteSiteFromTheRecycleBin(url, logger, verbose, wait) {
+        const spoAdminUrl = await spo.getSpoAdminUrl(logger, verbose);
+        const context = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+        if (verbose) {
+            await logger.logToStderr(`Deleting site ${url} from the recycle bin...`);
+        }
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': context.FormDigestValue
+            },
+            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="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const response = await request.post(requestOptions);
+        const json = JSON.parse(response);
+        const responseContent = json[0];
+        if (responseContent.ErrorInfo) {
+            throw responseContent.ErrorInfo.ErrorMessage;
+        }
+        const operation = json[json.length - 1];
+        const isComplete = operation.IsComplete;
+        if (!wait || isComplete) {
+            return;
+        }
+        await new Promise((resolve, reject) => {
+            setTimeout(() => {
+                spo.waitUntilFinished({
+                    operationId: JSON.stringify(operation._ObjectIdentity_),
+                    siteUrl: spoAdminUrl,
+                    resolve,
+                    reject,
+                    logger,
+                    currentContext: context,
+                    verbose: verbose,
+                    debug: verbose
+                });
+            }, operation.PollingInterval);
         });
     },
     /**
-  * 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}`);
+     * Updates a site with the given properties
+     * @param url The url of the site
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     * @param title The new title
+     * @param classification The classification to be updated
+     * @param disableFlows If flows should be disabled or not
+     * @param isPublic If site should be public or private
+     * @param owners The owners to be updated
+     * @param shareByEmailEnabled If share by e-mail should be enabled or not
+     * @param siteDesignId The site design to be updated
+     * @param sharingCapability The sharing capability to be updated
+     */
+    async updateSite(url, logger, verbose, title, classification, disableFlows, isPublic, owners, shareByEmailEnabled, siteDesignId, sharingCapability) {
+        const tenantId = await spo.getTenantId(logger, verbose);
+        const spoAdminUrl = await spo.getSpoAdminUrl(logger, verbose);
+        let context = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+        if (verbose) {
+            await logger.logToStderr('Loading site IDs...');
+        }
+        const requestOptions = {
+            url: `${url}/_api/site?$select=GroupId,Id`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const siteInfo = await request.get(requestOptions);
+        const groupId = siteInfo.GroupId;
+        const siteId = siteInfo.Id;
+        const isGroupConnectedSite = groupId !== '00000000-0000-0000-0000-000000000000';
+        if (verbose) {
+            await logger.logToStderr(`Retrieved site IDs. siteId: ${siteId}, groupId: ${groupId}`);
+        }
+        if (isGroupConnectedSite) {
+            if (verbose) {
+                await logger.logToStderr(`Site attached to group ${groupId}`);
             }
-            const requestUrl = `${webUrl}/_api/web/sitegroups/GetByName('${formatting_1.formatting.encodeQueryParameter(name)}')`;
-            const requestOptions = {
-                url: requestUrl,
+            if (typeof title !== 'undefined' &&
+                typeof isPublic !== 'undefined' &&
+                typeof owners !== 'undefined') {
+                const promises = [];
+                if (typeof title !== 'undefined') {
+                    const requestOptions = {
+                        url: `${spoAdminUrl}/_api/SPOGroup/UpdateGroupPropertiesBySiteId`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata',
+                            'content-type': 'application/json;charset=utf-8',
+                            'X-RequestDigest': context.FormDigestValue
+                        },
+                        data: {
+                            groupId: groupId,
+                            siteId: siteId,
+                            displayName: title
+                        },
+                        responseType: 'json'
+                    };
+                    promises.push(request.post(requestOptions));
+                }
+                if (typeof isPublic !== 'undefined') {
+                    promises.push(aadGroup.setGroup(groupId, (isPublic === false), logger, verbose));
+                }
+                if (typeof owners !== 'undefined') {
+                    promises.push(spo.setGroupifiedSiteOwners(spoAdminUrl, groupId, owners, logger, verbose));
+                }
+                await Promise.all(promises);
+            }
+        }
+        else {
+            if (verbose) {
+                await logger.logToStderr('Site is not group connected');
+            }
+            if (typeof isPublic !== 'undefined') {
+                throw `The isPublic option can't be set on a site that is not groupified`;
+            }
+            if (owners) {
+                await Promise.all(owners.split(',').map(async (o) => {
+                    await spo.setSiteAdmin(spoAdminUrl, context, url, o.trim());
+                }));
+            }
+        }
+        context = await spo.ensureFormDigest(spoAdminUrl, logger, context, verbose);
+        if (verbose) {
+            await logger.logToStderr(`Updating site ${url} properties...`);
+        }
+        let updatedProperties = false;
+        if (!isGroupConnectedSite) {
+            if (title !== undefined) {
+                updatedProperties = true;
+            }
+        }
+        else {
+            if (classification !== undefined || disableFlows !== undefined || shareByEmailEnabled !== undefined || sharingCapability !== undefined) {
+                updatedProperties = true;
+            }
+        }
+        if (updatedProperties) {
+            let propertyId = 27;
+            const payload = [];
+            if (!isGroupConnectedSite) {
+                if (title) {
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${formatting.escapeXml(title)}</Parameter></SetProperty>`);
+                }
+            }
+            if (typeof classification === 'string') {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting.escapeXml(classification)}</Parameter></SetProperty>`);
+            }
+            if (typeof disableFlows !== 'undefined') {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${disableFlows}</Parameter></SetProperty>`);
+            }
+            if (typeof shareByEmailEnabled !== 'undefined') {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${shareByEmailEnabled}</Parameter></SetProperty>`);
+            }
+            if (sharingCapability) {
+                const sharingCapabilityOption = SharingCapabilities[sharingCapability];
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapabilityOption}</Parameter></SetProperty>`);
+            }
+            const pos = tenantId.indexOf('|') + 1;
+            const requestOptionsUpdateProperties = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
-                    'accept': 'application/json;odata=nometadata'
+                    'X-RequestDigest': context.FormDigestValue
                 },
-                responseType: 'json'
+                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>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${tenantId.substr(pos, tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
-            const groupInstance = yield request_1.default.get(requestOptions);
-            return groupInstance;
-        });
+            const res = await request.post(requestOptionsUpdateProperties);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            else {
+                const operation = json[json.length - 1];
+                const isComplete = operation.IsComplete;
+                if (!isComplete) {
+                    await new Promise((resolve, reject) => {
+                        setTimeout(() => {
+                            spo.waitUntilFinished({
+                                operationId: JSON.stringify(operation._ObjectIdentity_),
+                                siteUrl: spoAdminUrl,
+                                resolve,
+                                reject,
+                                logger,
+                                currentContext: context,
+                                verbose: verbose,
+                                debug: verbose
+                            });
+                        }, operation.PollingInterval);
+                    });
+                }
+            }
+        }
+        if (siteDesignId) {
+            await spo.applySiteDesign(siteDesignId, url, logger, verbose);
+        }
     },
     /**
-  * 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;
+     * Updates the groupified site owners
+     * @param spoAdminUrl The SharePoint admin url
+     * @param groupId The ID of the group
+     * @param owners The owners to be updated
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     */
+    async setGroupifiedSiteOwners(spoAdminUrl, groupId, owners, logger, verbose) {
+        const splittedOwners = owners.split(',').map(o => o.trim());
+        if (verbose) {
+            await logger.logToStderr('Retrieving user information to set group owners...');
+        }
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/users?$filter=${splittedOwners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request.get(requestOptions)
+            .then((res) => {
+            if (res.value.length === 0) {
+                return Promise.resolve();
+            }
+            return Promise.all(res.value.map(user => {
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
+                    headers: {
+                        'content-type': 'application/json;odata=verbose'
+                    }
+                };
+                return request.post(requestOptions);
+            }));
         });
+    },
+    /**
+     * Updates the site admin
+     * @param spoAdminUrl The SharePoint admin url
+     * @param context The FormDigestInfo
+     * @param siteUrl The url of the site where the owners has to be updated
+     * @param principal The principal of the admin
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     */
+    async setSiteAdmin(spoAdminUrl, context, siteUrl, principal, logger, verbose) {
+        if (verbose && logger) {
+            await logger.logToStderr(`Updating site admin ${principal} on ${siteUrl}...`);
+        }
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': context.FormDigestValue
+            },
+            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="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            throw response.ErrorInfo.ErrorMessage;
+        }
+        else {
+            return;
+        }
+    },
+    /**
+     * Applies a site design
+     * @param id The ID of the site design (GUID)
+     * @param webUrl The url of the site where the design should be applied
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     */
+    async applySiteDesign(id, webUrl, logger, verbose) {
+        if (verbose) {
+            await logger.logToStderr(`Applying site design ${id}...`);
+        }
+        const spoUrl = await spo.getSpoUrl(logger, verbose);
+        const requestOptions = {
+            url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.ApplySiteDesign`,
+            headers: {
+                'content-type': 'application/json;charset=utf-8',
+                accept: 'application/json;odata=nometadata'
+            },
+            data: {
+                siteDesignId: id,
+                webUrl: webUrl
+            },
+            responseType: 'json'
+        };
+        await request.post(requestOptions);
+    },
+    /**
+     * Gets the web properties for a given url
+     * @param url The url of the web
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     */
+    async getWeb(url, logger, verbose) {
+        if (verbose && logger) {
+            await logger.logToStderr(`Getting the web properties for ${url}`);
+        }
+        const requestOptions = {
+            url: `${url}/_api/web`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const webProperties = await request.get(requestOptions);
+        return webProperties;
     }
 };
 //# sourceMappingURL=spo.js.map