@pnp/cli-microsoft365 7.0.0-beta.99e75a7 → 7.0.0-beta.aa2d71e

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) {