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

package/dist/m365/spo/commands/site/site-ensure.js

@@ -5,14 +5,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteEnsureCommand_instances, _SpoSiteEnsureCommand_initOptions, _SpoSiteEnsureCommand_initTypes, _SpoSiteEnsureCommand_initValidators;
 import chalk from 'chalk';
-import { Cli } from '../../../../cli/Cli.js';
+import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoWebGetCommand from '../web/web-get.js';
 import { SharingCapabilities } from './SharingCapabilities.js';
-import spoSiteAddCommand from './site-add.js';
-import spoSiteSetCommand from './site-set.js';
 class SpoSiteEnsureCommand extends SpoCommand {
     get name() {
         return commands.SITE_ENSURE;
@@ -30,10 +27,7 @@ class SpoSiteEnsureCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             const res = await this.ensureSite(logger, args);
-            if (this.debug) {
-                await logger.logToStderr(res.stderr);
-            }
-            await logger.log(res.stdout);
+            await logger.log(res);
             if (this.verbose) {
                 await logger.logToStderr(chalk.green('DONE'));
             }
@@ -49,9 +43,9 @@ class SpoSiteEnsureCommand extends SpoCommand {
         }
         catch (err) {
             if (this.debug) {
-                await logger.logToStderr(err.stderr);
+                await logger.logToStderr(err);
             }
-            if (err.error.message !== '404 FILE NOT FOUND') {
+            if (err.error !== '404 FILE NOT FOUND') {
                 throw err;
             }
             if (this.verbose) {
@@ -60,12 +54,15 @@ class SpoSiteEnsureCommand extends SpoCommand {
             return this.createSite(args, logger);
         }
         if (this.debug) {
-            await logger.logToStderr(getWebOutput.stderr);
+            await logger.logToStderr(getWebOutput);
         }
         if (this.verbose) {
             await logger.logToStderr(`Site found at ${args.options.url}. Checking if site matches conditions...`);
         }
-        const web = JSON.parse(getWebOutput.stdout);
+        const web = {
+            Configuration: getWebOutput.Configuration,
+            WebTemplate: getWebOutput.WebTemplate
+        };
         if (args.options.type) {
             // type was specified so we need to check if the existing site matches
             // it. If not, we throw an error and stop
@@ -100,70 +97,20 @@ class SpoSiteEnsureCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Checking if site ${args.options.url} exists...`);
         }
-        const options = {
-            url: args.options.url,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli.executeCommandWithOutput(spoWebGetCommand, { options: { ...options, _: [] } });
+        return await spo.getWeb(args.options.url, logger, this.verbose);
     }
     async createSite(args, logger) {
         if (this.verbose) {
             await logger.logToStderr(`Creating site...`);
         }
-        const options = {
-            type: args.options.type,
-            title: args.options.title,
-            alias: args.options.alias,
-            description: args.options.description,
-            classification: args.options.classification,
-            isPublic: args.options.isPublic,
-            lcid: args.options.lcid,
-            url: typeof args.options.type === 'undefined' || args.options.type === 'TeamSite' ? undefined : args.options.url,
-            owners: args.options.owners,
-            shareByEmailEnabled: args.options.shareByEmailEnabled,
-            siteDesign: args.options.siteDesign,
-            siteDesignId: args.options.siteDesignId,
-            timeZone: args.options.timeZone,
-            webTemplate: args.options.webTemplate,
-            resourceQuota: args.options.resourceQuota,
-            resourceQuotaWarningLevel: args.options.resourceQuotaWarningLevel,
-            storageQuota: args.options.storageQuota,
-            storageQuotaWarningLevel: args.options.storageQuotaWarningLevel,
-            removeDeletedSite: args.options.removeDeletedSite,
-            wait: args.options.wait,
-            verbose: this.verbose,
-            debug: this.debug
-        };
-        const validationResult = await spoSiteAddCommand.validate({ options: options }, Cli.getCommandInfo(spoSiteAddCommand));
-        if (validationResult !== true) {
-            throw validationResult;
-        }
-        return Cli.executeCommandWithOutput(spoSiteAddCommand, { options: { ...options, _: [] } });
+        const url = typeof args.options.type === 'undefined' || args.options.type === 'TeamSite' ? undefined : args.options.url;
+        return await spo.addSite(args.options.title, logger, this.verbose, args.options.wait, args.options.type, args.options.alias, args.options.description, args.options.owners, args.options.shareByEmailEnabled, args.options.removeDeletedSite, args.options.classification, args.options.isPublic, args.options.lcid, url, args.options.siteDesign, args.options.siteDesignId, args.options.timeZone, args.options.webTemplate, args.options.resourceQuota, args.options.resourceQuotaWarningLevel, args.options.storageQuota, args.options.storageQuotaWarningLevel);
     }
     async updateSite(args, logger) {
         if (this.verbose) {
             await logger.logToStderr(`Updating site...`);
         }
-        const options = {
-            classification: args.options.classification,
-            disableFlows: args.options.disableFlows,
-            isPublic: args.options.isPublic,
-            owners: args.options.owners,
-            shareByEmailEnabled: args.options.shareByEmailEnabled,
-            siteDesignId: args.options.siteDesignId,
-            title: args.options.title,
-            url: args.options.url,
-            sharingCapability: args.options.sharingCapability,
-            verbose: this.verbose,
-            debug: this.debug
-        };
-        const validationResult = await spoSiteSetCommand.validate({ options: options }, Cli.getCommandInfo(spoSiteSetCommand));
-        if (validationResult !== true) {
-            throw validationResult;
-        }
-        return Cli.executeCommandWithOutput(spoSiteSetCommand, { options: { ...options, _: [] } });
+        return await spo.updateSite(args.options.url, logger, this.verbose, args.options.title, args.options.classification, args.options.disableFlows, args.options.isPublic, args.options.owners, args.options.shareByEmailEnabled, args.options.siteDesignId, args.options.sharingCapability);
     }
     /**
      * Maps the base sharingCapability enum to string array so it can

package/dist/m365/spo/commands/site/site-list.js

@@ -54,16 +54,14 @@ class SpoSiteListCommand extends SpoCommand {
             },
             data: requestBody
         };
-        const res1 = await request.post(requestOptions);
-        const json = JSON.parse(res1);
-        const response = json[0];
-        logger.log(response);
-        if (response.ErrorInfo) {
-            throw response.ErrorInfo.ErrorMessage;
+        const response = await request.post(requestOptions);
+        const json = JSON.parse(response);
+        const responseContent = json[0];
+        if (responseContent.ErrorInfo) {
+            throw responseContent.ErrorInfo.ErrorMessage;
         }
         else {
             const sites = json[json.length - 1];
-            logger.log(sites);
             this.allSites.push(...sites._Child_Items_);
             if (sites.NextStartIndexFromSharePoint) {
                 await this.getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, logger);

package/dist/m365/spo/commands/site/site-recyclebinitem-list.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoSiteRecycleBinItemListCommand_instances, _SpoSiteRecycleBinItemListCommand_initTelemetry, _SpoSiteRecycleBinItemListCommand_initOptions, _SpoSiteRecycleBinItemListCommand_initValidators;
+var _SpoSiteRecycleBinItemListCommand_instances, _a, _SpoSiteRecycleBinItemListCommand_initTelemetry, _SpoSiteRecycleBinItemListCommand_initOptions, _SpoSiteRecycleBinItemListCommand_initValidators;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -32,7 +32,7 @@ class SpoSiteRecycleBinItemListCommand extends SpoCommand {
         const state = args.options.secondary ? '2' : '1';
         let requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin?$filter=(ItemState eq ${state})`;
         if (typeof args.options.type !== 'undefined') {
-            const type = SpoSiteRecycleBinItemListCommand.recycleBinItemType.find(item => item.value === args.options.type);
+            const type = _a.recycleBinItemType.find(item => item.value === args.options.type);
             if (typeof type !== 'undefined') {
                 requestUrl += ` and (ItemType eq ${type.id})`;
             }
@@ -53,7 +53,7 @@ class SpoSiteRecycleBinItemListCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemListCommand_initTelemetry = function _SpoSiteRecycleBinItemListCommand_initTelemetry() {
+_a = SpoSiteRecycleBinItemListCommand, _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemListCommand_initTelemetry = function _SpoSiteRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             type: args.options.type,
@@ -65,7 +65,7 @@ _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
         option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '-t, --type [type]',
-        autocomplete: SpoSiteRecycleBinItemListCommand.recycleBinItemType.map(item => item.value)
+        autocomplete: _a.recycleBinItemType.map(item => item.value)
     }, {
         option: '-s, --secondary'
     });
@@ -76,8 +76,8 @@ _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
             return isValidSharePointUrl;
         }
         if (typeof args.options.type !== 'undefined' &&
-            !SpoSiteRecycleBinItemListCommand.recycleBinItemType.some(item => item.value === args.options.type)) {
-            return `${args.options.type} is not a valid value. Allowed values are ${SpoSiteRecycleBinItemListCommand.recycleBinItemType.map(item => item.value).join(', ')}`;
+            !_a.recycleBinItemType.some(item => item.value === args.options.type)) {
+            return `${args.options.type} is not a valid value. Allowed values are ${_a.recycleBinItemType.map(item => item.value).join(', ')}`;
         }
         return true;
     });

package/dist/m365/spo/commands/site/site-remove.js

@@ -29,69 +29,69 @@ class SpoSiteRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const removeSite = async () => {
-            try {
-                if (args.options.fromRecycleBin) {
+        if (args.options.force) {
+            await this.removeSite(logger, args);
+        }
+        else {
+            const result = await Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove the site ${args.options.url}?`
+            });
+            if (result.continue) {
+                await this.removeSite(logger, args);
+            }
+        }
+    }
+    async removeSite(logger, args) {
+        try {
+            if (args.options.fromRecycleBin) {
+                await this.deleteSiteWithoutGroup(logger, args);
+            }
+            else {
+                const groupId = await this.getSiteGroupId(args.options.url, logger);
+                if (groupId === '00000000-0000-0000-0000-000000000000') {
+                    if (this.debug) {
+                        await logger.logToStderr('Site is not groupified. Going ahead with the conventional site deletion options');
+                    }
                     await this.deleteSiteWithoutGroup(logger, args);
                 }
                 else {
-                    const groupId = await this.getSiteGroupId(args.options.url, logger);
-                    if (groupId === '00000000-0000-0000-0000-000000000000') {
-                        if (this.debug) {
-                            await logger.logToStderr('Site is not groupified. Going ahead with the conventional site deletion options');
-                        }
-                        await this.deleteSiteWithoutGroup(logger, args);
+                    if (this.debug) {
+                        await logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
                     }
-                    else {
-                        if (this.debug) {
-                            await logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
+                    try {
+                        const group = await aadGroup.getGroupById(groupId);
+                        if (args.options.skipRecycleBin || args.options.wait) {
+                            await logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
                         }
-                        try {
-                            const group = await aadGroup.getGroupById(groupId);
-                            if (args.options.skipRecycleBin || args.options.wait) {
-                                await logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
-                            }
-                            await this.deleteGroup(group.id, logger);
-                            await this.deleteSite(args.options.url, args.options.wait, logger);
+                        await this.deleteGroup(group.id, logger);
+                        await this.deleteSite(args.options.url, args.options.wait, logger);
+                    }
+                    catch (err) {
+                        if (this.verbose) {
+                            await logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
                         }
-                        catch (err) {
+                        const deletedGroups = await this.isSiteGroupDeleted(groupId);
+                        if (deletedGroups.value.length === 0) {
                             if (this.verbose) {
-                                await logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
-                            }
-                            const deletedGroups = await this.isSiteGroupDeleted(groupId);
-                            if (deletedGroups.value.length === 0) {
-                                if (this.verbose) {
-                                    await logger.logToStderr("Site group doesn't exist anymore. Deleting the site.");
-                                }
-                                if (args.options.wait) {
-                                    await logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
-                                }
-                                await this.deleteOrphanedSite(logger, args.options.url);
+                                await logger.logToStderr("Site group doesn't exist anymore. Deleting the site.");
                             }
-                            else {
-                                throw `Site group still exists in the deleted groups. The site won't be removed.`;
+                            if (args.options.wait) {
+                                await logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
                             }
+                            await this.deleteOrphanedSite(logger, args.options.url);
+                        }
+                        else {
+                            throw `Site group still exists in the deleted groups. The site won't be removed.`;
                         }
                     }
                 }
             }
-            catch (err) {
-                this.handleRejectedPromise(err);
-            }
-        };
-        if (args.options.force) {
-            await removeSite();
         }
-        else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the site ${args.options.url}?`
-            });
-            if (result.continue) {
-                await removeSite();
-            }
+        catch (err) {
+            this.handleRejectedPromise(err);
         }
     }
     isSiteGroupDeleted(groupId) {
@@ -104,175 +104,131 @@ class SpoSiteRemoveCommand extends SpoCommand {
         };
         return request.get(requestOptions);
     }
-    deleteOrphanedSite(logger, url) {
-        return spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((spoAdminUrl) => {
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${url}'`,
-                headers: {
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request.post(requestOptions);
-        });
+    async deleteOrphanedSite(logger, url) {
+        const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${url}'`,
+            headers: {
+                'content-type': 'application/json;odata=nometadata',
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        return await request.post(requestOptions);
     }
-    deleteSiteWithoutGroup(logger, args) {
-        return spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((spoAdminUrl) => {
-            this.spoAdminUrl = spoAdminUrl;
-            return spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then(async (res) => {
-            this.context = res;
-            if (args.options.fromRecycleBin) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Deleting site from recycle bin ${args.options.url}...`);
-                }
-                return this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
-            }
-            else {
-                return this.deleteSite(args.options.url, args.options.wait, logger);
-            }
-        })
-            .then(async () => {
-            if (args.options.skipRecycleBin) {
-                if (this.verbose) {
-                    await logger.logToStderr(`Also deleting site from tenant recycle bin ${args.options.url}...`);
-                }
-                return this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
+    async deleteSiteWithoutGroup(logger, args) {
+        this.spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+        if (args.options.fromRecycleBin) {
+            if (this.verbose) {
+                await logger.logToStderr(`Deleting site from recycle bin ${args.options.url}...`);
             }
-            else {
-                return Promise.resolve();
+            await this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
+        }
+        else {
+            await this.deleteSite(args.options.url, args.options.wait, logger);
+        }
+        if (args.options.skipRecycleBin) {
+            if (this.verbose) {
+                await logger.logToStderr(`Also deleting site from tenant recycle bin ${args.options.url}...`);
             }
-        });
+            await this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
+        }
     }
-    deleteSite(url, wait, logger) {
-        return new Promise((resolve, reject) => {
-            spo
-                .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-                .then(async (res) => {
-                this.context = res;
-                if (this.verbose) {
-                    await logger.logToStderr(`Deleting site ${url}...`);
-                }
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.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="55" ObjectPathId="54"/><ObjectPath Id="57" ObjectPathId="56"/><Query Id="58" ObjectPathId="54"><Query SelectAllProperties="true"><Properties/></Query></Query><Query Id="59" ObjectPathId="56"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true"/><Property Name="PollingInterval" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="54" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="56" ParentId="54" Name="RemoveSite"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
-                };
-                return request.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!wait || isComplete) {
-                        resolve();
-                        return;
-                    }
-                    setTimeout(() => {
-                        spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            debug: this.debug,
-                            verbose: this.verbose
-                        });
-                    }, operation.PollingInterval);
-                }
-            });
+    async deleteSite(url, wait, logger) {
+        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+        if (this.verbose) {
+            await logger.logToStderr(`Deleting site ${url}...`);
+        }
+        const requestOptions = {
+            url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': this.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="55" ObjectPathId="54"/><ObjectPath Id="57" ObjectPathId="56"/><Query Id="58" ObjectPathId="54"><Query SelectAllProperties="true"><Properties/></Query></Query><Query Id="59" ObjectPathId="56"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true"/><Property Name="PollingInterval" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="54" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="56" ParentId="54" Name="RemoveSite"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></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: this.spoAdminUrl,
+                    resolve,
+                    reject,
+                    logger,
+                    currentContext: this.context,
+                    debug: this.debug,
+                    verbose: this.verbose
+                });
+            }, operation.PollingInterval);
         });
     }
-    deleteSiteFromTheRecycleBin(url, wait, logger) {
-        return new Promise((resolve, reject) => {
-            spo
-                .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-                .then((res) => {
-                this.context = res;
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.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>`
-                };
-                return request.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!wait || isComplete) {
-                        resolve();
-                        return;
-                    }
-                    setTimeout(() => {
-                        spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            debug: this.debug,
-                            verbose: this.verbose
-                        });
-                    }, operation.PollingInterval);
-                }
-            });
+    async deleteSiteFromTheRecycleBin(url, wait, logger) {
+        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+        const requestOptions = {
+            url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': this.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: this.spoAdminUrl,
+                    resolve,
+                    reject,
+                    logger,
+                    currentContext: this.context,
+                    debug: this.debug,
+                    verbose: this.verbose
+                });
+            }, operation.PollingInterval);
         });
     }
-    getSiteGroupId(url, logger) {
-        return spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            this.spoAdminUrl = _spoAdminUrl;
-            return spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then(async (res) => {
-            this.context = res;
-            if (this.verbose) {
-                await logger.logToStderr(`Retrieving the group Id of the site ${url}`);
-            }
-            const requestOptions = {
-                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': this.context.FormDigestValue
-                },
-                data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}"><Actions><ObjectPath Id="4" ObjectPathId="3"/><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="GroupId" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="3" ParentId="1" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
-            };
-            return request.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                return Promise.reject(response.ErrorInfo.ErrorMessage);
-            }
-            else {
-                const groupId = json[json.length - 1].GroupId.replace('/Guid(', '').replace(')/', '');
-                return Promise.resolve(groupId);
-            }
-        });
+    async getSiteGroupId(url, logger) {
+        this.spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving the group Id of the site ${url}`);
+        }
+        const requestOptions = {
+            url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': this.context.FormDigestValue
+            },
+            data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}"><Actions><ObjectPath Id="4" ObjectPathId="3"/><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="GroupId" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="3" ParentId="1" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></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 groupId = json[json.length - 1].GroupId.replace('/Guid(', '').replace(')/', '');
+        return groupId;
     }
     async deleteGroup(groupId, logger) {
         if (this.verbose) {