@pnp/cli-microsoft365 5.0.0-beta.fc638c4 → 5.1.0-beta.04832fc

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const SpoCommand_1 = require("../../../base/SpoCommand");
-const ClientSvc_1 = require("../../ClientSvc");
+const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("./propertybag-base");
 class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -17,19 +16,18 @@ class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const clientSvcCommons = new ClientSvc_1.ClientSvc(logger, this.debug);
         let webIdentityResp;
-        this
+        utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((contextResponse) => {
             this.formDigestValue = contextResponse.FormDigestValue;
-            return clientSvcCommons.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
         })
             .then((identityResp) => {
             webIdentityResp = identityResp;
             // Check if web no script enabled or not
             // Cannot set property bag value if no script is enabled
-            return this.isNoScriptSite(identityResp, args.options, clientSvcCommons);
+            return this.isNoScriptSite(identityResp, args.options, logger);
         })
             .then((isNoScriptSite) => {
             if (isNoScriptSite) {
@@ -38,7 +36,7 @@ class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
             const opts = args.options;
             if (opts.folder) {
                 // get the folder guid instead of the web guid
-                return clientSvcCommons.getFolderIdentity(webIdentityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+                return utils_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
             }
             return new Promise(resolve => { return resolve(webIdentityResp); });
         })
@@ -50,8 +48,8 @@ class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
     setProperty(identityResp, options, logger) {
         return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty(options.key, options.value, options.webUrl, this.formDigestValue, identityResp, logger, this.debug, options.folder);
     }
-    isNoScriptSite(webIdentityResp, options, clientSvcCommons) {
-        return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(options.webUrl, this.formDigestValue, webIdentityResp, clientSvcCommons);
+    isNoScriptSite(webIdentityResp, options, logger) {
+        return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(options.webUrl, this.formDigestValue, webIdentityResp, logger, this.debug);
     }
     options() {
         const options = [
@@ -72,7 +70,7 @@ class SpoPropertyBagSetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl) !== true) {
+        if (utils_1.validation.isValidSharePointUrl(args.options.webUrl) !== true) {
             return 'Missing required option url';
         }
         if (!args.options.key) {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-add.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalGrantAddCommand extends SpoCommand_1.default {
@@ -18,14 +18,14 @@ class SpoServicePrincipalGrantAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
             if (this.verbose) {
                 logger.logToStderr(`Retrieving request digest...`);
             }
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -33,7 +33,7 @@ class SpoServicePrincipalGrantAddCommand 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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><ObjectPath Id="8" ObjectPathId="7" /><Query Id="9" ObjectPathId="7"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="5" ParentId="3" Name="PermissionRequests" /><Method Id="7" ParentId="5" Name="Approve"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.resource)}</Parameter><Parameter Type="String">${Utils_1.default.escapeXml(args.options.scope)}</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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><ObjectPath Id="8" ObjectPathId="7" /><Query Id="9" ObjectPathId="7"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="5" ParentId="3" Name="PermissionRequests" /><Method Id="7" ParentId="5" Name="Approve"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.resource)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.scope)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-list.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalGrantListCommand extends SpoCommand_1.default {
@@ -17,14 +18,14 @@ class SpoServicePrincipalGrantListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
             if (this.verbose) {
                 logger.logToStderr(`Retrieving request digest...`);
             }
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-revoke.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
@@ -18,14 +18,14 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
             if (this.verbose) {
                 logger.logToStderr(`Retrieving request digest...`);
             }
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -33,7 +33,7 @@ class SpoServicePrincipalGrantRevokeCommand 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="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Method Name="DeleteObject" Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="9" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="11" ParentId="9" Name="PermissionGrants" /><Method Id="13" ParentId="11" Name="GetByObjectId"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.grantId)}</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="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Method Name="DeleteObject" Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="9" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="11" ParentId="9" Name="PermissionGrants" /><Method Id="13" ParentId="11" Name="GetByObjectId"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.grantId)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-approve.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.default {
@@ -18,14 +18,14 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
             if (this.verbose) {
                 logger.logToStderr(`Retrieving request digest...`);
             }
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -33,7 +33,7 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
                 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="16" ObjectPathId="15" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${Utils_1.default.escapeXml(args.options.requestId)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></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="16" ObjectPathId="15" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.requestId)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -60,7 +60,7 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.requestId)) {
+        if (!utils_1.validation.isValidGuid(args.options.requestId)) {
             return `${args.options.requestId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-deny.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.default {
@@ -18,14 +18,14 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.defau
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
             if (this.verbose) {
                 logger.logToStderr(`Retrieving request digest...`);
             }
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -33,7 +33,7 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.defau
                 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="160" ObjectPathId="159" /><ObjectPath Id="162" ObjectPathId="161" /><ObjectPath Id="164" ObjectPathId="163" /><Method Name="Deny" Id="165" ObjectPathId="163" /></Actions><ObjectPaths><Constructor Id="159" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="161" ParentId="159" Name="PermissionRequests" /><Method Id="163" ParentId="161" Name="GetById"><Parameters><Parameter Type="Guid">{${Utils_1.default.escapeXml(args.options.requestId)}}</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="160" ObjectPathId="159" /><ObjectPath Id="162" ObjectPathId="161" /><ObjectPath Id="164" ObjectPathId="163" /><Method Name="Deny" Id="165" ObjectPathId="163" /></Actions><ObjectPaths><Constructor Id="159" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="161" ParentId="159" Name="PermissionRequests" /><Method Id="163" ParentId="161" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.requestId)}}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -55,7 +55,7 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.defau
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.requestId)) {
+        if (!utils_1.validation.isValidGuid(args.options.requestId)) {
             return `${args.options.requestId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-list.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.default {
@@ -17,14 +18,14 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
             if (this.verbose) {
                 logger.logToStderr(`Retrieving request digest...`);
             }
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {

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

@@ -4,6 +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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
@@ -25,11 +26,11 @@ class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
         const enabled = args.options.enabled === 'true';
         const toggleServicePrincipal = () => {
             let spoAdminUrl = '';
-            this
+            utils_1.spo
                 .getSpoAdminUrl(logger, this.debug)
                 .then((_spoAdminUrl) => {
                 spoAdminUrl = _spoAdminUrl;
-                return this.getRequestDigest(spoAdminUrl);
+                return utils_1.spo.getRequestDigest(spoAdminUrl);
             })
                 .then((res) => {
                 if (this.verbose) {

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

@@ -4,7 +4,7 @@ const chalk = require("chalk");
 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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAddCommand extends SpoCommand_1.default {
@@ -59,7 +59,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
     createModernSite(logger, args, cb) {
         const isTeamSite = args.options.type !== 'CommunicationSite';
         let spoUrl = '';
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((_spoUrl) => {
             spoUrl = _spoUrl;
@@ -175,11 +175,11 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
     }
     createClassicSite(logger, args, cb) {
         this.dots = '';
-        this
+        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;
@@ -206,7 +206,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
             }
         })
             .then(() => {
-            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;
@@ -224,7 +224,7 @@ class SpoSiteAddCommand 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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcid}</Property><Property Name="Owner" Type="String">${Utils_1.default.escapeXml(args.options.owners)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuota}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevel}</Property><Property Name="Template" Type="String">${Utils_1.default.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${Utils_1.default.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${Utils_1.default.escapeXml(args.options.url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuota}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevel}</Property></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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcid}</Property><Property Name="Owner" Type="String">${utils_1.formatting.escapeXml(args.options.owners)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuota}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevel}</Property><Property Name="Template" Type="String">${utils_1.formatting.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuota}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevel}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -243,7 +243,17 @@ class SpoSiteAddCommand 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,
+                            verbose: this.verbose,
+                            debug: this.debug
+                        });
                     }, operation.PollingInterval);
                 }
             });
@@ -252,7 +262,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
     }
     siteExistsInTheRecycleBin(url, logger) {
         return new Promise((resolve, reject) => {
-            this
+            utils_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -264,7 +274,7 @@ class SpoSiteAddCommand 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="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</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="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -298,7 +308,7 @@ class SpoSiteAddCommand 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="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><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="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><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);
             })
@@ -334,7 +344,7 @@ class SpoSiteAddCommand 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;
@@ -346,7 +356,7 @@ class SpoSiteAddCommand 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);
             })
@@ -364,7 +374,17 @@ class SpoSiteAddCommand 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,
+                            verbose: this.verbose,
+                            debug: this.debug
+                        });
                     }, operation.PollingInterval);
                 }
             });
@@ -464,7 +484,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
             if (!args.options.url) {
                 return 'Required option url missing';
             }
-            const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+            const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
             if (isValidSharePointUrl !== true) {
                 return isValidSharePointUrl;
             }
@@ -479,7 +499,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                 return 'The CommunicationSite supports only one owner in the owners option';
             }
             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`;
                 }
             }
@@ -494,7 +514,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
             if (!args.options.url) {
                 return 'Required option url missing';
             }
-            const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+            const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
             if (isValidSharePointUrl !== true) {
                 return isValidSharePointUrl;
             }

package/dist/m365/spo/commands/site/site-appcatalog-add.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppCatalogAddCommand extends SpoCommand_1.default {
@@ -21,11 +21,11 @@ class SpoSiteAppCatalogAddCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const url = args.options.url;
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
@@ -36,7 +36,7 @@ class SpoSiteAppCatalogAddCommand 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="38" ObjectPathId="37" /><ObjectPath Id="40" ObjectPathId="39" /><ObjectPath Id="42" ObjectPathId="41" /><ObjectPath Id="44" ObjectPathId="43" /><ObjectPath Id="46" ObjectPathId="45" /><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Constructor Id="37" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="39" ParentId="37" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(url)}</Parameter></Parameters></Method><Property Id="41" ParentId="39" Name="RootWeb" /><Property Id="43" ParentId="41" Name="TenantAppCatalog" /><Property Id="45" ParentId="43" Name="SiteCollectionAppCatalogsSites" /><Method Id="47" ParentId="45" Name="Add"><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="38" ObjectPathId="37" /><ObjectPath Id="40" ObjectPathId="39" /><ObjectPath Id="42" ObjectPathId="41" /><ObjectPath Id="44" ObjectPathId="43" /><ObjectPath Id="46" ObjectPathId="45" /><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Constructor Id="37" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="39" ParentId="37" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="41" ParentId="39" Name="RootWeb" /><Property Id="43" ParentId="41" Name="TenantAppCatalog" /><Property Id="45" ParentId="43" Name="SiteCollectionAppCatalogsSites" /><Method Id="47" ParentId="45" Name="Add"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -65,7 +65,7 @@ class SpoSiteAppCatalogAddCommand 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 SpoSiteAppCatalogAddCommand();

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppCatalogRemoveCommand extends SpoCommand_1.default {
@@ -21,11 +21,11 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const url = args.options.url;
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
@@ -36,7 +36,7 @@ class SpoSiteAppCatalogRemoveCommand 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="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></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="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -65,7 +65,7 @@ class SpoSiteAppCatalogRemoveCommand 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 SpoSiteAppCatalogRemoveCommand();

package/dist/m365/spo/commands/site/site-apppermission-add.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
-const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
     constructor() {
@@ -127,7 +126,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         if (!args.options.appId && !args.options.appDisplayName) {
             return `Specify appId or appDisplayName, one is required`;
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
         const permissions = args.options.permission.split(',');
@@ -136,7 +135,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
                 return `${permissions[i]} is not a valid permission value. Allowed values read|write|read,write`;
             }
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoSiteAppPermissionAddCommand();

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
-const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
     get name() {
@@ -65,7 +65,7 @@ class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
 }
 module.exports = new SpoSiteAppPermissionGetCommand();