@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.efe1dcb

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

@@ -4,7 +4,7 @@ const chalk = require("chalk");
 const cli_1 = require("../../../../cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteRemoveCommand extends SpoCommand_1.default {
@@ -125,7 +125,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         return request_1.default.get(requestOptions);
     }
     deleteOrphanedSite(logger, url) {
-        return this
+        return utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             const requestOptions = {
@@ -140,11 +140,11 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         });
     }
     deleteSiteWithoutGroup(logger, args) {
-        return this
+        return utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             this.spoAdminUrl = spoAdminUrl;
-            return this.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
@@ -172,7 +172,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
     }
     deleteSite(url, wait, logger) {
         return new Promise((resolve, reject) => {
-            this
+            utils_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -184,7 +184,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.default.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">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -202,7 +202,17 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        this.waitUntilFinished(JSON.stringify(operation._ObjectIdentity_), this.spoAdminUrl, resolve, reject, logger, this.context, this.dots);
+                        utils_1.spo.waitUntilFinished({
+                            operationId: JSON.stringify(operation._ObjectIdentity_),
+                            siteUrl: this.spoAdminUrl,
+                            resolve,
+                            reject,
+                            logger,
+                            currentContext: this.context,
+                            dots: this.dots,
+                            debug: this.debug,
+                            verbose: this.verbose
+                        });
                     }, operation.PollingInterval);
                 }
             });
@@ -210,7 +220,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
     }
     deleteSiteFromTheRecycleBin(url, wait, logger) {
         return new Promise((resolve, reject) => {
-            this
+            utils_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -219,7 +229,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.default.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">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -237,18 +247,28 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        this.waitUntilFinished(JSON.stringify(operation._ObjectIdentity_), this.spoAdminUrl, resolve, reject, logger, this.context, this.dots);
+                        utils_1.spo.waitUntilFinished({
+                            operationId: JSON.stringify(operation._ObjectIdentity_),
+                            siteUrl: this.spoAdminUrl,
+                            resolve,
+                            reject,
+                            logger,
+                            currentContext: this.context,
+                            dots: this.dots,
+                            debug: this.debug,
+                            verbose: this.verbose
+                        });
                     }, operation.PollingInterval);
                 }
             });
         });
     }
     getSiteGroupId(url, logger) {
-        return this
+        return utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             this.spoAdminUrl = _spoAdminUrl;
-            return this.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
@@ -260,7 +280,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.default.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">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -310,7 +330,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.url);
     }
 }
 module.exports = new SpoSiteRemoveCommand();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteRenameCommand extends SpoCommand_1.default {
@@ -21,11 +22,11 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         let spoAdminUrl = "";
         const options = args.options;
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             this.context = res;

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

@@ -4,7 +4,7 @@ const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const aadO365GroupSetCommand = require("../../../aad/commands/o365group/o365group-set");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -67,7 +67,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         if (this.debug) {
             logger.logToStderr(`Setting the site its logo...`);
         }
-        const logoUrl = args.options.siteLogoUrl ? Utils_1.default.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
+        const logoUrl = args.options.siteLogoUrl ? utils_1.urlUtil.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
         const requestOptions = {
             url: `${args.options.url}/_api/siteiconmanager/setsitelogo`,
             headers: {
@@ -111,11 +111,11 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             let spoAdminUrl;
             const promises = [];
             if (typeof args.options.title !== 'undefined') {
-                promises.push(this
+                promises.push(utils_1.spo
                     .getSpoAdminUrl(logger, this.debug)
                     .then((_spoAdminUrl) => {
                     spoAdminUrl = _spoAdminUrl;
-                    return this.getRequestDigest(spoAdminUrl);
+                    return utils_1.spo.getRequestDigest(spoAdminUrl);
                 })
                     .then((formDigest) => {
                     const requestOptions = {
@@ -178,7 +178,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             logger.logToStderr('Retrieving user information to set group owners...');
         }
         let spoAdminUrl;
-        return this
+        return utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
@@ -216,7 +216,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving request digest...`);
             }
-            this
+            utils_1.spo
                 .getRequestDigest(args.options.url)
                 .then((res) => {
                 if (this.verbose) {
@@ -225,7 +225,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 let propertyId = 27;
                 const payload = [];
                 if (typeof args.options.classification === 'string') {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${Utils_1.default.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
                 }
                 if (typeof args.options.disableFlows === 'string') {
                     payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows === 'true'}</Parameter></SetProperty>`);
@@ -279,11 +279,11 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving request digest...`);
             }
             const sharingCapability = SharingCapabilities_1.SharingCapabilities[args.options.sharingCapability];
-            this
+            utils_1.spo
                 .getSpoAdminUrl(logger, this.debug)
                 .then((_spoAdminUrl) => {
                 this.spoAdminUrl = _spoAdminUrl;
-                return this.getRequestDigest(this.spoAdminUrl);
+                return utils_1.spo.getRequestDigest(this.spoAdminUrl);
             })
                 .then((res) => {
                 if (this.verbose) {
@@ -294,7 +294,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                     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="2" ObjectPathId="1"/><ObjectPath Id="4" ObjectPathId="3"/><SetProperty Id="5" ObjectPathId="3" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty><ObjectPath Id="7" ObjectPathId="6"/><ObjectIdentityQuery Id="8" ObjectPathId="3"/></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="3" ParentId="1" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="6" ParentId="3" Name="Update"/></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="2" ObjectPathId="1"/><ObjectPath Id="4" ObjectPathId="3"/><SetProperty Id="5" ObjectPathId="3" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty><ObjectPath Id="7" ObjectPathId="6"/><ObjectIdentityQuery Id="8" ObjectPathId="3"/></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(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="6" ParentId="3" Name="Update"/></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -391,7 +391,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -426,7 +426,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             return `${args.options.shareByEmailEnabled} is not a valid value for the shareByEmailEnabled option. Allowed values are true|false`;
         }
         if (args.options.siteDesignId) {
-            if (!Utils_1.default.isValidGuid(args.options.siteDesignId)) {
+            if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
                 return `${args.options.siteDesignId} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/sitedesign/sitedesign-add.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignAddCommand extends SpoCommand_1.default {
@@ -23,11 +23,11 @@ class SpoSiteDesignAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoUrl = '';
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((_spoUrl) => {
             spoUrl = _spoUrl;
-            return this.getRequestDigest(spoUrl);
+            return utils_1.spo.getRequestDigest(spoUrl);
         })
             .then((res) => {
             const info = {
@@ -100,7 +100,7 @@ class SpoSiteDesignAddCommand extends SpoCommand_1.default {
         const siteScripts = args.options.siteScripts.split(',');
         for (let i = 0; i < siteScripts.length; i++) {
             const trimmedId = siteScripts[i].trim();
-            if (!Utils_1.default.isValidGuid(trimmedId)) {
+            if (!utils_1.validation.isValidGuid(trimmedId)) {
                 return `${trimmedId} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/sitedesign/sitedesign-apply.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignApplyCommand extends SpoCommand_1.default {
@@ -17,7 +17,7 @@ class SpoSiteDesignApplyCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             const requestBody = {
@@ -61,10 +61,10 @@ class SpoSiteDesignApplyCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoSiteDesignApplyCommand();

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignGetCommand extends SpoCommand_1.default {
@@ -40,7 +40,7 @@ class SpoSiteDesignGetCommand extends SpoCommand_1.default {
         });
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((_spoUrl) => {
             this.spoUrl = _spoUrl;
@@ -82,7 +82,7 @@ class SpoSiteDesignGetCommand extends SpoCommand_1.default {
         if (!args.options.id && !args.options.title) {
             return 'Specify id or title, one is required';
         }
-        if (args.options.id && !Utils_1.default.isValidGuid(args.options.id)) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignListCommand extends SpoCommand_1.default {
@@ -14,7 +15,7 @@ class SpoSiteDesignListCommand extends SpoCommand_1.default {
         return ['Id', 'IsDefault', 'Title', 'Version', 'WebTemplate'];
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             const requestOptions = {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
@@ -20,11 +20,11 @@ class SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const removeSiteDesign = () => {
             let spoUrl = '';
-            this
+            utils_1.spo
                 .getSpoUrl(logger, this.debug)
                 .then((_spoUrl) => {
                 spoUrl = _spoUrl;
-                return this.getRequestDigest(spoUrl);
+                return utils_1.spo.getRequestDigest(spoUrl);
             })
                 .then((res) => {
                 const requestOptions = {
@@ -73,7 +73,7 @@ class SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-grant.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
@@ -13,11 +13,11 @@ class SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoUrl = '';
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((_spoUrl) => {
             spoUrl = _spoUrl;
-            return this.getRequestDigest(spoUrl);
+            return utils_1.spo.getRequestDigest(spoUrl);
         })
             .then((res) => {
             const grantedRights = '1';
@@ -56,7 +56,7 @@ class SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.rights !== 'View') {

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-list.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
@@ -13,11 +13,11 @@ class SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoUrl = '';
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((_spoUrl) => {
             spoUrl = _spoUrl;
-            return this.getRequestDigest(spoUrl);
+            return utils_1.spo.getRequestDigest(spoUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -50,7 +50,7 @@ class SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-revoke.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
@@ -20,11 +20,11 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const revokePermissions = () => {
             let spoUrl = '';
-            this
+            utils_1.spo
                 .getSpoUrl(logger, this.debug)
                 .then((_spoUrl) => {
                 spoUrl = _spoUrl;
-                return this.getRequestDigest(spoUrl);
+                return utils_1.spo.getRequestDigest(spoUrl);
             })
                 .then((res) => {
                 const requestOptions = {
@@ -79,7 +79,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-run-list.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignRunListCommand extends SpoCommand_1.default {
@@ -57,12 +57,12 @@ class SpoSiteDesignRunListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.siteDesignId) {
-            if (!Utils_1.default.isValidGuid(args.options.siteDesignId)) {
+            if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
                 return `${args.options.siteDesignId} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/sitedesign/sitedesign-run-status-get.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignRunStatusGetCommand extends SpoCommand_1.default {
@@ -46,11 +46,11 @@ class SpoSiteDesignRunStatusGetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!Utils_1.default.isValidGuid(args.options.runId)) {
+        if (!utils_1.validation.isValidGuid(args.options.runId)) {
             return `${args.options.runId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-set.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignSetCommand extends SpoCommand_1.default {
@@ -25,7 +25,7 @@ class SpoSiteDesignSetCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             const updateInfo = {
@@ -113,7 +113,7 @@ class SpoSiteDesignSetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.webTemplate &&
@@ -125,7 +125,7 @@ class SpoSiteDesignSetCommand extends SpoCommand_1.default {
             const siteScripts = args.options.siteScripts.split(',');
             for (let i = 0; i < siteScripts.length; i++) {
                 const trimmedId = siteScripts[i].trim();
-                if (!Utils_1.default.isValidGuid(trimmedId)) {
+                if (!utils_1.validation.isValidGuid(trimmedId)) {
                     return `${trimmedId} is not a valid GUID`;
                 }
             }

package/dist/m365/spo/commands/sitedesign/sitedesign-task-get.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
@@ -12,7 +12,7 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
         return 'Gets information about the specified site design scheduled for execution';
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             const requestOptions = {
@@ -44,7 +44,7 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.taskId)) {
+        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
             return `${args.options.taskId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-task-list.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignTaskListCommand extends SpoCommand_1.default {
@@ -37,7 +38,7 @@ class SpoSiteDesignTaskListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoSiteDesignTaskListCommand();