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

package/dist/m365/spo/commands/page/page-column-get.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -59,7 +60,7 @@ class SpoPageColumnGetCommand extends SpoCommand_1.default {
         if (isNaN(args.options.column)) {
             return `${args.options.column} is not a number`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoPageColumnGetCommand();

package/dist/m365/spo/commands/page/page-column-list.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -46,7 +47,7 @@ class SpoPageColumnListCommand extends SpoCommand_1.default {
         if (isNaN(args.options.section)) {
             return `${args.options.section} is not a number`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoPageColumnListCommand();

package/dist/m365/spo/commands/page/page-control-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");
 const pageMethods_1 = require("./pageMethods");
@@ -65,10 +65,10 @@ class SpoPageControlGetCommand 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 SpoPageControlGetCommand();

package/dist/m365/spo/commands/page/page-control-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");
 const pageMethods_1 = require("./pageMethods");
@@ -58,7 +59,7 @@ class SpoPageControlListCommand 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 SpoPageControlListCommand();

package/dist/m365/spo/commands/page/page-control-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");
 const Page_1 = require("./Page");
@@ -139,7 +139,7 @@ class SpoPageControlSetCommand 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.webPartData && args.options.webPartProperties) {
@@ -161,7 +161,7 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
                 return `Specified webPartData is not a valid JSON string. Input: ${args.options.webPartData}. Error: ${e}`;
             }
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoPageControlSetCommand();

package/dist/m365/spo/commands/page/page-copy.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoPageCopyCommand extends SpoCommand_1.default {
@@ -92,7 +93,7 @@ class SpoPageCopyCommand 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);
     }
     getTargetSiteUrl(webUrl, targetFullName) {
         const siteSplit = targetFullName.split('sitepages/');

package/dist/m365/spo/commands/page/page-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 SpoPageGetCommand extends SpoCommand_1.default {
@@ -23,7 +23,7 @@ class SpoPageGetCommand extends SpoCommand_1.default {
             pageName += '.aspx';
         }
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${Utils_1.default.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
+            url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
             headers: {
                 'content-type': 'application/json;charset=utf-8',
                 accept: 'application/json;odata=nometadata'
@@ -86,7 +86,7 @@ class SpoPageGetCommand 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 SpoPageGetCommand();

package/dist/m365/spo/commands/page/page-header-set.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 SpoPageHeaderSetCommand extends SpoCommand_1.default {
@@ -389,7 +390,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
             args.options.textAlignment !== 'Center') {
             return `${args.options.textAlignment} is not a valid textAlignment value. Allowed values Left|Center`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoPageHeaderSetCommand();

package/dist/m365/spo/commands/page/page-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 SpoPageListCommand extends SpoCommand_1.default {
@@ -65,7 +66,7 @@ class SpoPageListCommand 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 SpoPageListCommand();

package/dist/m365/spo/commands/page/page-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 SpoPageRemoveCommand extends SpoCommand_1.default {
@@ -16,7 +16,7 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
         let requestDigest = '';
         let pageName = args.options.name;
         const removePage = () => {
-            this
+            utils_1.spo
                 .getRequestDigest(args.options.webUrl)
                 .then((res) => {
                 requestDigest = res.FormDigestValue;
@@ -28,7 +28,7 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                 }
                 const requestOptions = {
                     url: `${args.options
-                        .webUrl}/_api/web/getfilebyserverrelativeurl('${Utils_1.default.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                        .webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
                     headers: {
                         'X-RequestDigest': requestDigest,
                         'X-HTTP-Method': 'DELETE',
@@ -76,7 +76,7 @@ class SpoPageRemoveCommand 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 SpoPageRemoveCommand();

package/dist/m365/spo/commands/page/page-section-add.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const clientsidepages_1 = require("./clientsidepages");
@@ -169,7 +170,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
                 return 'The value of parameter order must be 1 or higher';
             }
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoPageSectionAddCommand();

package/dist/m365/spo/commands/page/page-section-get.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -42,7 +43,7 @@ class SpoPageSectionGetCommand extends SpoCommand_1.default {
         if (isNaN(args.options.section)) {
             return `${args.options.section} is not a number`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoPageSectionGetCommand();

package/dist/m365/spo/commands/page/page-section-list.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
@@ -46,7 +47,7 @@ class SpoPageSectionListCommand 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 SpoPageSectionListCommand();

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 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");
 const Page_1 = require("./Page");
@@ -41,9 +41,9 @@ class SpoPageSetCommand extends SpoCommand_1.default {
         if (!pageName.endsWith('.aspx')) {
             pageName += '.aspx';
         }
-        const serverRelativeFileUrl = `${Utils_1.default.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}`;
+        const serverRelativeFileUrl = `${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}`;
         const needsToSavePage = !!args.options.title || !!args.options.description;
-        this
+        utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((res) => {
             requestDigest = res.FormDigestValue;
@@ -310,7 +310,7 @@ class SpoPageSetCommand 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;
         }

package/dist/m365/spo/commands/page/page-template-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 SpoPageTemplateListCommand extends SpoCommand_1.default {
@@ -52,7 +53,7 @@ class SpoPageTemplateListCommand 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 SpoPageTemplateListCommand();

package/dist/m365/spo/commands/page/page-text-add.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 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");
 const clientsidepages_1 = require("./clientsidepages");
@@ -30,7 +30,7 @@ class SpoPageTextAddCommand extends SpoCommand_1.default {
         if (this.verbose) {
             logger.logToStderr(`Retrieving request digest...`);
         }
-        this
+        utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((res) => {
             // Keep the reference of request digest for subsequent requests
@@ -75,7 +75,7 @@ class SpoPageTextAddCommand extends SpoCommand_1.default {
         }
         const requestOptions = {
             url: `${args.options
-                .webUrl}/_api/web/getfilebyserverrelativeurl('${Utils_1.default.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')/ListItemAllFields`,
+                .webUrl}/_api/web/getfilebyserverrelativeurl('${utils_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')/ListItemAllFields`,
             headers: {
                 'X-RequestDigest': requestDigest,
                 'content-type': 'application/json;odata=nometadata',
@@ -121,7 +121,7 @@ class SpoPageTextAddCommand extends SpoCommand_1.default {
         if (args.options.column && (!(0, util_1.isNumber)(args.options.column) || args.options.column < 1)) {
             return 'The value of parameter column must be 1 or higher';
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoPageTextAddCommand();

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpoPropertyBagBaseCommand = void 0;
 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 base_permissions_1 = require("../../base-permissions");
 class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
@@ -120,7 +120,7 @@ class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
             headers: {
                 'X-RequestDigest': formDigest
             },
-            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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(name)}</Parameter><Parameter Type="String">${Utils_1.default.escapeXml(value)}</Parameter></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(name)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(value)}</Parameter></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
         return new Promise((resolve, reject) => {
             request_1.default.post(requestOptions).then((res) => {
@@ -143,9 +143,9 @@ class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
      * @param options command options
      * @param cmd command instance
      */
-    static isNoScriptSite(webUrl, formDigest, webIdentityResp, clientSvcCommons) {
+    static isNoScriptSite(webUrl, formDigest, webIdentityResp, logger, debug) {
         return new Promise((resolve, reject) => {
-            clientSvcCommons.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest)
+            utils_1.spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug)
                 .then((basePermissionsResp) => {
                 resolve(basePermissionsResp.has(base_permissions_1.PermissionKind.AddAndCustomizePages) === false);
             })

package/dist/m365/spo/commands/propertybag/propertybag-get.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 SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -17,12 +16,11 @@ class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const clientSvcCommons = new ClientSvc_1.ClientSvc(logger, this.debug);
-        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) => {
             const opts = args.options;
@@ -58,7 +56,7 @@ class SpoPropertyBagGetCommand extends propertybag_base_1.SpoPropertyBagBaseComm
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
     filterByKey(propertyBag, key) {
         const keys = Object.keys(propertyBag);

package/dist/m365/spo/commands/propertybag/propertybag-list.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 SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -17,12 +16,11 @@ class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCom
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const clientSvcCommons = new ClientSvc_1.ClientSvc(logger, this.debug);
-        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) => {
             const opts = args.options;
@@ -49,7 +47,7 @@ class SpoPropertyBagListCommand extends propertybag_base_1.SpoPropertyBagBaseCom
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
     /**
      * The property bag data returned from the client.svc/ProcessQuery response

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

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-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 SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseCommand {
@@ -23,18 +21,17 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
     }
     commandAction(logger, args, cb) {
         const removeProperty = () => {
-            const clientSvcCommons = new ClientSvc_1.ClientSvc(logger, this.debug);
-            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) => {
                 const opts = args.options;
                 if (opts.folder) {
                     // get the folder guid instead of the web guid
-                    return clientSvcCommons.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+                    return utils_1.spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
                 }
                 return new Promise(resolve => { return resolve(identityResp); });
             })
@@ -72,7 +69,7 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
             headers: {
                 'X-RequestDigest': this.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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(options.key)}</Parameter><Parameter Type="Null" /></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(options.key)}</Parameter><Parameter Type="Null" /></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
         return new Promise((resolve, reject) => {
             request_1.default.post(requestOptions).then((res) => {
@@ -106,7 +103,7 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
         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/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 = {