@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

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

@@ -17,7 +17,8 @@ var _SpoSiteListCommand_instances, _SpoSiteListCommand_initTelemetry, _SpoSiteLi
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteListCommand extends SpoCommand_1.default {
@@ -37,29 +38,28 @@ 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 spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving list of site collections...`);
+                }
+                this.allSites = [];
+                yield this.getAllSites(spoAdminUrl, formatting_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) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
                 .then((res) => {
                 let requestBody = `<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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteRecycleBinItemListCommand_instances, _SpoSiteRecycleBinItemListCommand_initTelemetry, _SpoSiteRecycleBinItemListCommand_initOptions, _SpoSiteRecycleBinItemListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteRecycleBinItemListCommand extends SpoCommand_1.default {
@@ -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() {
@@ -81,7 +84,7 @@ _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
     });
 }, _SpoSiteRecycleBinItemListCommand_initValidators = function _SpoSiteRecycleBinItemListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteRecycleBinItemRestoreCommand_instances, _SpoSiteRecycleBinItemRestoreCommand_initOptions, _SpoSiteRecycleBinItemRestoreCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteRecycleBinItemRestoreCommand extends SpoCommand_1.default {
@@ -32,30 +33,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 = formatting_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() {
@@ -66,13 +74,13 @@ _SpoSiteRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoSiteRecycleB
     });
 }, _SpoSiteRecycleBinItemRestoreCommand_initValidators = function _SpoSiteRecycleBinItemRestoreCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        const invalidIds = utils_1.formatting
+        const invalidIds = formatting_1.formatting
             .splitAndTrim(args.options.ids)
-            .filter(id => !utils_1.validation.isValidGuid(id));
+            .filter(id => !validation_1.validation.isValidGuid(id));
         if (invalidIds.length > 0) {
             return `The following IDs are invalid: ${invalidIds.join(', ')}`;
         }

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

@@ -16,10 +16,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteRemoveCommand_instances, _SpoSiteRemoveCommand_initTelemetry, _SpoSiteRemoveCommand_initOptions, _SpoSiteRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -37,43 +39,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 +79,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 = {
@@ -126,7 +119,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         return request_1.default.get(requestOptions);
     }
     deleteOrphanedSite(logger, url) {
-        return utils_1.spo
+        return spo_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             const requestOptions = {
@@ -141,11 +134,11 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         });
     }
     deleteSiteWithoutGroup(logger, args) {
-        return utils_1.spo
+        return spo_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             this.spoAdminUrl = spoAdminUrl;
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            return spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
@@ -173,7 +166,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
     }
     deleteSite(url, wait, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -185,7 +178,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                     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">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                    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);
             })
@@ -203,7 +196,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        utils_1.spo.waitUntilFinished({
+                        spo_1.spo.waitUntilFinished({
                             operationId: JSON.stringify(operation._ObjectIdentity_),
                             siteUrl: this.spoAdminUrl,
                             resolve,
@@ -221,7 +214,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
     }
     deleteSiteFromTheRecycleBin(url, wait, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -230,7 +223,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                     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">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    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);
             })
@@ -248,7 +241,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        utils_1.spo.waitUntilFinished({
+                        spo_1.spo.waitUntilFinished({
                             operationId: JSON.stringify(operation._ObjectIdentity_),
                             siteUrl: this.spoAdminUrl,
                             resolve,
@@ -265,11 +258,11 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         });
     }
     getSiteGroupId(url, logger) {
-        return utils_1.spo
+        return spo_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             this.spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            return spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
@@ -281,7 +274,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                 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_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">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                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);
         })
@@ -332,7 +325,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         option: '--confirm'
     });
 }, _SpoSiteRemoveCommand_initValidators = function _SpoSiteRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteRemoveCommand();
 //# sourceMappingURL=site-remove.js.map