@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

package/dist/m365/spo/commands/site/site-commsite-enable.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -35,37 +34,33 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
     get description() {
         return 'Enables communication site features on the specified site';
     }
-    commandAction(logger, args, cb) {
-        const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            if (this.debug) {
-                logger.logToStderr(`Retrieving request digest...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.debug) {
+                    logger.logToStderr(`Retrieving request digest...`);
+                }
+                const ctxInfo = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': ctxInfo.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="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${utils_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
             }
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.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="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${utils_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableCommand_initTelemetry = function _SpoSiteCommSiteEnableCommand_initTelemetry() {

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

@@ -37,10 +37,41 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
     get description() {
         return 'Ensures that the particular site collection exists and updates its properties if necessary';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getWeb(args, logger)
-            .then((getWebOutput) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const res = yield this.ensureSite(logger, args);
+                if (this.debug) {
+                    logger.logToStderr(res.stderr);
+                }
+                logger.log(res.stdout);
+                if (this.verbose) {
+                    logger.logToStderr(chalk.green('DONE'));
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    ensureSite(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let getWebOutput;
+            try {
+                getWebOutput = yield this.getWeb(args, logger);
+            }
+            catch (err) {
+                if (this.debug) {
+                    logger.logToStderr(err.stderr);
+                }
+                if (err.error.message !== '404 FILE NOT FOUND') {
+                    throw err;
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`No site found at ${args.options.url}`);
+                }
+                return this.createSite(args, logger);
+            }
             if (this.debug) {
                 logger.logToStderr(getWebOutput.stderr);
             }
@@ -64,12 +95,12 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                         expectedWebTemplate = args.options.webTemplate;
                         break;
                     default:
-                        return Promise.reject(`${args.options.type} is not a valid site type. Allowed types are TeamSite,CommunicationSite,ClassicSite`);
+                        throw `${args.options.type} is not a valid site type. Allowed types are TeamSite,CommunicationSite,ClassicSite`;
                 }
                 if (expectedWebTemplate) {
                     const currentWebTemplate = `${web.WebTemplate}#${web.Configuration}`;
                     if (expectedWebTemplate !== currentWebTemplate) {
-                        return Promise.reject(`Expected web template ${expectedWebTemplate} but site found at ${args.options.url} is based on ${currentWebTemplate}`);
+                        throw `Expected web template ${expectedWebTemplate} but site found at ${args.options.url} is based on ${currentWebTemplate}`;
                     }
                 }
             }
@@ -77,28 +108,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Site matches conditions. Updating...`);
             }
             return this.updateSite(args, logger);
-        }, (err) => {
-            if (this.debug) {
-                logger.logToStderr(err.stderr);
-            }
-            if (err.error.message !== '404 FILE NOT FOUND') {
-                return Promise.reject(err);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`No site found at ${args.options.url}`);
-            }
-            return this.createSite(args, logger);
-        })
-            .then((res) => {
-            if (this.debug) {
-                logger.logToStderr(res.stderr);
-            }
-            logger.log(res.stdout);
-            if (this.verbose) {
-                logger.logToStderr(chalk.green('DONE'));
-            }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getWeb(args, logger) {
         if (this.verbose) {

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

@@ -32,20 +32,23 @@ class SpoSiteGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about the specific site collection';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${args.options.url}/_api/site`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.url}/_api/site`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteGetCommand_instances = new WeakSet(), _SpoSiteGetCommand_initOptions = function _SpoSiteGetCommand_initOptions() {

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

@@ -33,39 +33,42 @@ class SpoSiteGroupifyCommand extends SpoCommand_1.default {
     get description() {
         return 'Connects site collection to an Microsoft 365 Group';
     }
-    commandAction(logger, args, cb) {
-        const optionalParams = {};
-        const payload = {
-            displayName: args.options.displayName,
-            alias: args.options.alias,
-            isPublic: args.options.isPublic === true,
-            optionalParams: optionalParams
-        };
-        if (args.options.description) {
-            optionalParams.Description = args.options.description;
-        }
-        if (args.options.classification) {
-            optionalParams.Classification = args.options.classification;
-        }
-        if (args.options.keepOldHomepage) {
-            optionalParams.CreationOptions = ["SharePointKeepOldHomepage"];
-        }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/GroupSiteManager/CreateGroupForSite`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                accept: 'application/json;odata=nometadata',
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const optionalParams = {};
+            const payload = {
+                displayName: args.options.displayName,
+                alias: args.options.alias,
+                isPublic: args.options.isPublic === true,
+                optionalParams: optionalParams
+            };
+            if (args.options.description) {
+                optionalParams.Description = args.options.description;
+            }
+            if (args.options.classification) {
+                optionalParams.Classification = args.options.classification;
+            }
+            if (args.options.keepOldHomepage) {
+                optionalParams.CreationOptions = ["SharePointKeepOldHomepage"];
+            }
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/GroupSiteManager/CreateGroupForSite`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata',
+                    responseType: 'json'
+                },
+                data: payload,
                 responseType: 'json'
-            },
-            data: payload,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteGroupifyCommand_instances = new WeakSet(), _SpoSiteGroupifyCommand_initTelemetry = function _SpoSiteGroupifyCommand_initTelemetry() {

package/dist/m365/spo/commands/site/site-inplacerecordsmanagement-set.js

@@ -33,25 +33,30 @@ class SpoSiteInPlaceRecordsManagementSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Activates or deactivates in-place records management for a site collection';
     }
-    commandAction(logger, args, cb) {
-        const enabled = args.options.enabled.toLocaleLowerCase() === 'true';
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/site/features/${enabled ? 'add' : 'remove'}`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            data: {
-                featureId: 'da2e115b-07e4-49d9-bb2c-35e93bb9fca9',
-                force: true
-            },
-            responseType: 'json'
-        };
-        if (this.verbose) {
-            logger.logToStderr(`${enabled ? 'Activating' : 'Deactivating'} in-place records management for site ${args.options.siteUrl}`);
-        }
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const enabled = args.options.enabled.toLocaleLowerCase() === 'true';
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/site/features/${enabled ? 'add' : 'remove'}`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                data: {
+                    featureId: 'da2e115b-07e4-49d9-bb2c-35e93bb9fca9',
+                    force: true
+                },
+                responseType: 'json'
+            };
+            if (this.verbose) {
+                logger.logToStderr(`${enabled ? 'Activating' : 'Deactivating'} in-place records management for site ${args.options.siteUrl}`);
+            }
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteInPlaceRecordsManagementSetCommand_instances = new WeakSet(), _SpoSiteInPlaceRecordsManagementSetCommand_initTelemetry = function _SpoSiteInPlaceRecordsManagementSetCommand_initTelemetry() {

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

@@ -37,25 +37,24 @@ class SpoSiteListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'Url'];
     }
-    commandAction(logger, args, cb) {
-        const webTemplate = this.getWebTemplateId(args.options);
-        const includeOneDriveSites = args.options.includeOneDriveSites || false;
-        const personalSite = includeOneDriveSites === false ? '0' : '1';
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving list of site collections...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const webTemplate = this.getWebTemplateId(args.options);
+            const includeOneDriveSites = args.options.includeOneDriveSites || false;
+            const personalSite = includeOneDriveSites === false ? '0' : '1';
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving list of site collections...`);
+                }
+                this.allSites = [];
+                yield this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, args.options.deleted, logger);
+                logger.log(this.allSites);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            this.allSites = [];
-            return this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, args.options.deleted, logger);
-        })
-            .then(_ => {
-            logger.log(this.allSites);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
         return new Promise((resolve, reject) => {

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

@@ -36,31 +36,34 @@ class SpoSiteRecycleBinItemListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Title', 'DirName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving all items from recycle bin at ${args.options.siteUrl}...`);
-        }
-        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);
-            if (typeof type !== 'undefined') {
-                requestUrl += ` and (ItemType eq ${type.id})`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving all items from recycle bin at ${args.options.siteUrl}...`);
             }
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((response) => {
-            logger.log(response.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            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);
+                if (typeof type !== 'undefined') {
+                    requestUrl += ` and (ItemType eq ${type.id})`;
+                }
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const response = yield request_1.default.get(requestOptions);
+                logger.log(response.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemListCommand_initTelemetry = function _SpoSiteRecycleBinItemListCommand_initTelemetry() {

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

@@ -32,30 +32,37 @@ class SpoSiteRecycleBinItemRestoreCommand extends SpoCommand_1.default {
     get description() {
         return 'Restores given items from the site recycle bin';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Restoring items from recycle bin at ${args.options.siteUrl}...`);
-        }
-        const requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin/RestoreByIds`;
-        const ids = utils_1.formatting.splitAndTrim(args.options.ids);
-        const idsChunks = [];
-        while (ids.length) {
-            idsChunks.push(ids.splice(0, 20));
-        }
-        Promise.all(idsChunks.map((idsChunk) => {
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: {
-                    ids: idsChunk
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })).then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Restoring items from recycle bin at ${args.options.siteUrl}...`);
+            }
+            const requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin/RestoreByIds`;
+            const ids = utils_1.formatting.splitAndTrim(args.options.ids);
+            const idsChunks = [];
+            while (ids.length) {
+                idsChunks.push(ids.splice(0, 20));
+            }
+            try {
+                yield Promise.all(idsChunks.map((idsChunk) => {
+                    const requestOptions = {
+                        url: requestUrl,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json',
+                        data: {
+                            ids: idsChunk
+                        }
+                    };
+                    return request_1.default.post(requestOptions);
+                }));
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemRestoreCommand_initOptions = function _SpoSiteRecycleBinItemRestoreCommand_initOptions() {

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

@@ -37,43 +37,39 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified site';
     }
-    commandAction(logger, args, cb) {
-        const removeSite = () => {
-            this.dots = '';
-            if (args.options.fromRecycleBin) {
-                this
-                    .deleteSiteWithoutGroup(logger, args)
-                    .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
-            }
-            else {
-                this
-                    .getSiteGroupId(args.options.url, logger)
-                    .then((groupId) => {
-                    if (groupId === '00000000-0000-0000-0000-000000000000') {
-                        if (this.debug) {
-                            logger.logToStderr('Site is not groupified. Going ahead with the conventional site deletion options');
-                        }
-                        return this.deleteSiteWithoutGroup(logger, args);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    this.dots = '';
+                    if (args.options.fromRecycleBin) {
+                        yield this.deleteSiteWithoutGroup(logger, args);
                     }
                     else {
-                        if (this.debug) {
-                            logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
+                        const groupId = yield this.getSiteGroupId(args.options.url, logger);
+                        if (groupId === '00000000-0000-0000-0000-000000000000') {
+                            if (this.debug) {
+                                logger.logToStderr('Site is not groupified. Going ahead with the conventional site deletion options');
+                            }
+                            yield this.deleteSiteWithoutGroup(logger, args);
                         }
-                        return aadGroup_1.aadGroup
-                            .getGroupById(groupId)
-                            .then((group) => {
-                            if (args.options.skipRecycleBin || args.options.wait) {
-                                logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
+                        else {
+                            if (this.debug) {
+                                logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
                             }
-                            return this.deleteGroup(group.id, logger);
-                        })
-                            .catch(() => {
-                            if (this.verbose) {
-                                logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
+                            try {
+                                const group = yield aadGroup_1.aadGroup.getGroupById(groupId);
+                                if (args.options.skipRecycleBin || args.options.wait) {
+                                    logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
+                                }
+                                yield this.deleteGroup(group.id, logger);
+                                yield this.deleteSite(args.options.url, args.options.wait, logger);
                             }
-                            return this
-                                .isSiteGroupDeleted(groupId)
-                                .then((deletedGroups) => {
+                            catch (err) {
+                                if (this.verbose) {
+                                    logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
+                                }
+                                const deletedGroups = yield this.isSiteGroupDeleted(groupId);
                                 if (deletedGroups.value.length === 0) {
                                     if (this.verbose) {
                                         logger.logToStderr("Site group doesn't exist anymore. Deleting the site.");
@@ -81,39 +77,34 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                                     if (args.options.wait) {
                                         logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
                                     }
-                                    return Promise.resolve();
+                                    yield this.deleteOrphanedSite(logger, args.options.url);
                                 }
                                 else {
-                                    return Promise.reject(`Site group still exists in the deleted groups. The site won't be removed.`);
+                                    throw `Site group still exists in the deleted groups. The site won't be removed.`;
                                 }
-                            })
-                                .then(_ => this.deleteOrphanedSite(logger, args.options.url))
-                                .catch((err) => Promise.reject(err));
-                        })
-                            .then(_ => this.deleteSite(args.options.url, args.options.wait, logger));
+                            }
+                        }
                     }
-                })
-                    .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
-            }
-        };
-        if (args.options.confirm) {
-            removeSite();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the site ${args.options.url}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
                 }
-                else {
-                    removeSite();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeSite();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the site ${args.options.url}?`
+                });
+                if (result.continue) {
+                    yield removeSite();
+                }
+            }
+        });
     }
     isSiteGroupDeleted(groupId) {
         const requestOptions = {