@pnp/cli-microsoft365 6.11.0-beta.ee225fb → 6.11.0

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

@@ -41,69 +41,71 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeSite = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (args.options.fromRecycleBin) {
+            if (args.options.confirm) {
+                yield this.removeSite(logger, args);
+            }
+            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 this.removeSite(logger, args);
+                }
+            }
+        });
+    }
+    removeSite(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.fromRecycleBin) {
+                    yield this.deleteSiteWithoutGroup(logger, args);
+                }
+                else {
+                    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);
                     }
                     else {
-                        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);
+                        if (this.debug) {
+                            logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
                         }
-                        else {
-                            if (this.debug) {
-                                logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
+                        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.`));
                             }
-                            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);
+                            yield this.deleteGroup(group.id, logger);
+                            yield this.deleteSite(args.options.url, args.options.wait, logger);
+                        }
+                        catch (err) {
+                            if (this.verbose) {
+                                logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
                             }
-                            catch (err) {
+                            const deletedGroups = yield this.isSiteGroupDeleted(groupId);
+                            if (deletedGroups.value.length === 0) {
                                 if (this.verbose) {
-                                    logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
+                                    logger.logToStderr("Site group doesn't exist anymore. Deleting the site.");
                                 }
-                                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.");
-                                    }
-                                    if (args.options.wait) {
-                                        logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
-                                    }
-                                    yield this.deleteOrphanedSite(logger, args.options.url);
-                                }
-                                else {
-                                    throw `Site group still exists in the deleted groups. The site won't be removed.`;
+                                if (args.options.wait) {
+                                    logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
                                 }
+                                yield 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.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();
-                }
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
         });
     }
@@ -118,9 +120,8 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         return request_1.default.get(requestOptions);
     }
     deleteOrphanedSite(logger, url) {
-        return spo_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((spoAdminUrl) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
             const requestOptions = {
                 url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${url}'`,
                 headers: {
@@ -129,140 +130,111 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.post(requestOptions);
+            return yield request_1.default.post(requestOptions);
         });
     }
     deleteSiteWithoutGroup(logger, args) {
-        return spo_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((spoAdminUrl) => {
-            this.spoAdminUrl = spoAdminUrl;
-            return spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then((res) => {
-            this.context = res;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+            this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
             if (args.options.fromRecycleBin) {
                 if (this.verbose) {
                     logger.logToStderr(`Deleting site from recycle bin ${args.options.url}...`);
                 }
-                return this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
+                yield this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
             }
             else {
-                return this.deleteSite(args.options.url, args.options.wait, logger);
+                yield this.deleteSite(args.options.url, args.options.wait, logger);
             }
-        })
-            .then(() => {
             if (args.options.skipRecycleBin) {
                 if (this.verbose) {
                     logger.logToStderr(`Also deleting site from tenant recycle bin ${args.options.url}...`);
                 }
-                return this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
-            }
-            else {
-                return Promise.resolve();
+                yield this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
             }
         });
     }
     deleteSite(url, wait, logger) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo
-                .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-                .then((res) => {
-                this.context = res;
-                if (this.verbose) {
-                    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_1.default.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_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
-                };
-                return request_1.default.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_1.spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            debug: this.debug,
-                            verbose: this.verbose
-                        });
-                    }, operation.PollingInterval);
-                }
+        return __awaiter(this, void 0, void 0, function* () {
+            this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            if (this.verbose) {
+                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_1.default.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_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+            };
+            const response = yield request_1.default.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;
+            }
+            yield new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    spo_1.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_1.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_1.default.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_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" 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) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!wait || isComplete) {
-                        resolve();
-                        return;
-                    }
-                    setTimeout(() => {
-                        spo_1.spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            debug: this.debug,
-                            verbose: this.verbose
-                        });
-                    }, operation.PollingInterval);
-                }
+        return __awaiter(this, void 0, void 0, function* () {
+            this.context = yield spo_1.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_1.default.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_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            const response = yield request_1.default.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;
+            }
+            yield new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    spo_1.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_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            this.spoAdminUrl = _spoAdminUrl;
-            return spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then((res) => {
-            this.context = res;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+            this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
             if (this.verbose) {
                 logger.logToStderr(`Retrieving the group Id of the site ${url}`);
             }
@@ -273,18 +245,14 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                 },
                 data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.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_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
-            return request_1.default.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);
+            const response = yield request_1.default.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;
         });
     }
     deleteGroup(groupId, logger) {