@pnp/cli-microsoft365 6.0.0-beta.ff232be → 6.1.0-beta.17b053d

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

@@ -1,9 +1,17 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 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 spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoContentTypeHubGetCommand extends SpoCommand_1.default {
@@ -13,59 +21,54 @@ class SpoContentTypeHubGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Returns the URL of the SharePoint Content Type Hub of the Tenant';
     }
-    commandAction(logger, args, cb) {
-        let spoUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            spoUrl = _spoUrl;
-            return utils_1.spo.getRequestDigest(spoUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving Content Type Hub URL`);
-            }
-            const requestOptions = {
-                url: `${spoUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.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="2" ObjectPathId="1" />
-    <ObjectIdentityQuery Id="3" ObjectPathId="1" />
-    <ObjectPath Id="5" ObjectPathId="4" />
-    <ObjectIdentityQuery Id="6" ObjectPathId="4" />
-    <Query Id="7" ObjectPathId="4">
-      <Query SelectAllProperties="false">
-        <Properties>
-          <Property Name="ContentTypePublishingHub" ScalarProperty="true" />
-        </Properties>
-      </Query>
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving Content Type Hub URL`);
+                }
+                const requestOptions = {
+                    url: `${spoUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.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="2" ObjectPathId="1" />
+  <ObjectIdentityQuery Id="3" ObjectPathId="1" />
+  <ObjectPath Id="5" ObjectPathId="4" />
+  <ObjectIdentityQuery Id="6" ObjectPathId="4" />
+  <Query Id="7" ObjectPathId="4">
+    <Query SelectAllProperties="false">
+      <Properties>
+        <Property Name="ContentTypePublishingHub" ScalarProperty="true" />
+      </Properties>
     </Query>
-  </Actions>
-  <ObjectPaths>
-    <StaticMethod Id="1" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" />
-    <Method Id="4" ParentId="1" Name="GetDefaultSiteCollectionTermStore" />
-  </ObjectPaths>
+  </Query>
+</Actions>
+<ObjectPaths>
+  <StaticMethod Id="1" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" />
+  <Method Id="4" ParentId="1" Name="GetDefaultSiteCollectionTermStore" />
+</ObjectPaths>
 </Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-            }
-            else {
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
                 const result = {
                     ContentTypePublishingHub: json[json.length - 1]["ContentTypePublishingHub"]
                 };
                 logger.log(result);
-                cb();
             }
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
 }
 module.exports = new SpoContentTypeHubGetCommand();

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

@@ -1,7 +1,22 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoCustomActionAddCommand_instances, _SpoCustomActionAddCommand_initTelemetry, _SpoCustomActionAddCommand_initOptions, _SpoCustomActionAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
@@ -12,6 +27,13 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds a user custom action for site or site collection';
     }
+    constructor() {
+        super();
+        _SpoCustomActionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoCustomActionAddCommand_instances, "m", _SpoCustomActionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionAddCommand_instances, "m", _SpoCustomActionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoCustomActionAddCommand_instances, "m", _SpoCustomActionAddCommand_initValidators).call(this);
+    }
     /**
      * Maps the base PermissionsKind enum to string array so it can
      * more easily be used in validation or descriptions.
@@ -25,187 +47,50 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
         }
         return result;
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.location = args.options.location;
-        telemetryProps.scope = args.options.scope || 'Web';
-        telemetryProps.group = (!(!args.options.group)).toString();
-        telemetryProps.description = (!(!args.options.description)).toString();
-        telemetryProps.sequence = (!(!args.options.sequence)).toString();
-        telemetryProps.actionUrl = (!(!args.options.actionUrl)).toString();
-        telemetryProps.imageUrl = (!(!args.options.imageUrl)).toString();
-        telemetryProps.commandUIExtension = (!(!args.options.commandUIExtension)).toString();
-        telemetryProps.registrationId = args.options.registrationId;
-        telemetryProps.registrationType = args.options.registrationType;
-        telemetryProps.rights = args.options.rights;
-        telemetryProps.scriptSrc = (!(!args.options.scriptSrc)).toString();
-        telemetryProps.scriptBlock = (!(!args.options.scriptBlock)).toString();
-        telemetryProps.clientSideComponentId = (!(!args.options.clientSideComponentId)).toString();
-        telemetryProps.clientSideComponentProperties = (!(!args.options.clientSideComponentProperties)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        if (!args.options.scope) {
-            args.options.scope = 'Web';
-        }
-        const requestBody = this.mapRequestBody(args.options);
-        const requestOptions = {
-            url: `${args.options.url}/_api/${args.options.scope}/UserCustomActions`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            data: requestBody,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((customAction) => {
-            if (this.verbose) {
-                logger.logToStderr({
-                    ClientSideComponentId: customAction.ClientSideComponentId,
-                    ClientSideComponentProperties: customAction.ClientSideComponentProperties,
-                    CommandUIExtension: customAction.CommandUIExtension,
-                    Description: customAction.Description,
-                    Group: customAction.Group,
-                    Id: customAction.Id,
-                    ImageUrl: customAction.ImageUrl,
-                    Location: customAction.Location,
-                    Name: customAction.Name,
-                    RegistrationId: customAction.RegistrationId,
-                    RegistrationType: customAction.RegistrationType,
-                    Rights: JSON.stringify(customAction.Rights),
-                    Scope: args.options.scope,
-                    ScriptBlock: customAction.ScriptBlock,
-                    ScriptSrc: customAction.ScriptSrc,
-                    Sequence: customAction.Sequence,
-                    Title: customAction.Title,
-                    Url: customAction.Url,
-                    VersionOfUserCustomAction: customAction.VersionOfUserCustomAction
-                });
-            }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-t, --title <title>'
-            },
-            {
-                option: '-l, --location <location>'
-            },
-            {
-                option: '-g, --group [group]'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '--sequence [sequence]'
-            },
-            {
-                option: '--actionUrl [actionUrl]'
-            },
-            {
-                option: '--imageUrl [imageUrl]'
-            },
-            {
-                option: '-e, --commandUIExtension [commandUIExtension]'
-            },
-            {
-                option: '--registrationId [registrationId]'
-            },
-            {
-                option: '--registrationType [registrationType]',
-                autocomplete: ['None', 'List', 'ContentType', 'ProgId', 'FileType']
-            },
-            {
-                option: '--rights [rights]',
-                autocomplete: this.permissionsKindMap
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['Site', 'Web']
-            },
-            {
-                option: '--scriptBlock [scriptBlock]'
-            },
-            {
-                option: '--scriptSrc [scriptSrc]'
-            },
-            {
-                option: '-c, --clientSideComponentId [clientSideComponentId]'
-            },
-            {
-                option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.registrationId && !args.options.registrationType) {
-            return 'Option registrationId is specified, but registrationType is missing';
-        }
-        if (args.options.registrationType && !args.options.registrationId) {
-            return 'Option registrationType is specified, but registrationId is missing';
-        }
-        const location = args.options.location.toLowerCase();
-        const locationsRequireGroup = [
-            'microsoft.sharepoint.standardmenu', 'microsoft.sharepoint.contenttypesettings',
-            'microsoft.sharepoint.contenttypetemplatesettings', 'microsoft.sharepoint.create',
-            'microsoft.sharepoint.groupspage', 'microsoft.sharepoint.listedit',
-            'microsoft.sharepoint.listedit.documentlibrary', 'microsoft.sharepoint.peoplepage',
-            'microsoft.sharepoint.sitesettings'
-        ];
-        if (locationsRequireGroup.indexOf(location) > -1 && !args.options.group) {
-            return `The location specified requires the group option to be specified as well`;
-        }
-        if (location === 'scriptlink' &&
-            !args.options.scriptSrc &&
-            !args.options.scriptBlock) {
-            return 'Option scriptSrc or scriptBlock is required when the location is set to ScriptLink';
-        }
-        if ((args.options.scriptSrc || args.options.scriptBlock) && location !== 'scriptlink') {
-            return 'Option scriptSrc or scriptBlock is specified, but the location option is different than ScriptLink. Please use --actionUrl, if the location should be different than ScriptLink';
-        }
-        if (args.options.scriptSrc && args.options.scriptBlock) {
-            return 'Either option scriptSrc or scriptBlock can be specified, but not both';
-        }
-        if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
-            return 'Invalid option sequence. Expected value in range from 0 to 65536';
-        }
-        if (args.options.clientSideComponentId && utils_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
-            return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
-        }
-        if (args.options.clientSideComponentProperties && !args.options.clientSideComponentId) {
-            return `Option clientSideComponentProperties is specified, but the clientSideComponentId option is missing`;
-        }
-        if (args.options.scope &&
-            args.options.scope !== 'Site' &&
-            args.options.scope !== 'Web') {
-            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web`;
-        }
-        if (args.options.rights) {
-            const rights = args.options.rights.split(',');
-            for (const item of rights) {
-                const kind = base_permissions_1.PermissionKind[item.trim()];
-                if (!kind) {
-                    return `Rights option '${item}' is not recognized as valid PermissionKind choice. Please note it is case sensitive`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (!args.options.scope) {
+                    args.options.scope = 'Web';
+                }
+                const requestBody = this.mapRequestBody(args.options);
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/${args.options.scope}/UserCustomActions`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                const customAction = yield request_1.default.post(requestOptions);
+                if (this.verbose) {
+                    logger.logToStderr({
+                        ClientSideComponentId: customAction.ClientSideComponentId,
+                        ClientSideComponentProperties: customAction.ClientSideComponentProperties,
+                        CommandUIExtension: customAction.CommandUIExtension,
+                        Description: customAction.Description,
+                        Group: customAction.Group,
+                        Id: customAction.Id,
+                        ImageUrl: customAction.ImageUrl,
+                        Location: customAction.Location,
+                        Name: customAction.Name,
+                        RegistrationId: customAction.RegistrationId,
+                        RegistrationType: customAction.RegistrationType,
+                        Rights: JSON.stringify(customAction.Rights),
+                        Scope: args.options.scope,
+                        ScriptBlock: customAction.ScriptBlock,
+                        ScriptSrc: customAction.ScriptSrc,
+                        Sequence: customAction.Sequence,
+                        Title: customAction.Title,
+                        Url: customAction.Url,
+                        VersionOfUserCustomAction: customAction.VersionOfUserCustomAction
+                    });
                 }
             }
-        }
-        return true;
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
     mapRequestBody(options) {
         const requestBody = {
@@ -277,5 +162,126 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
         return 0; // None
     }
 }
+_SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand_initTelemetry = function _SpoCustomActionAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            location: args.options.location,
+            scope: args.options.scope || 'Web',
+            group: (!(!args.options.group)).toString(),
+            description: (!(!args.options.description)).toString(),
+            sequence: (!(!args.options.sequence)).toString(),
+            actionUrl: (!(!args.options.actionUrl)).toString(),
+            imageUrl: (!(!args.options.imageUrl)).toString(),
+            commandUIExtension: (!(!args.options.commandUIExtension)).toString(),
+            registrationId: args.options.registrationId,
+            registrationType: args.options.registrationType,
+            rights: args.options.rights,
+            scriptSrc: (!(!args.options.scriptSrc)).toString(),
+            scriptBlock: (!(!args.options.scriptBlock)).toString(),
+            clientSideComponentId: (!(!args.options.clientSideComponentId)).toString(),
+            clientSideComponentProperties: (!(!args.options.clientSideComponentProperties)).toString()
+        });
+    });
+}, _SpoCustomActionAddCommand_initOptions = function _SpoCustomActionAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-n, --name <name>'
+    }, {
+        option: '-t, --title <title>'
+    }, {
+        option: '-l, --location <location>'
+    }, {
+        option: '-g, --group [group]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--sequence [sequence]'
+    }, {
+        option: '--actionUrl [actionUrl]'
+    }, {
+        option: '--imageUrl [imageUrl]'
+    }, {
+        option: '-e, --commandUIExtension [commandUIExtension]'
+    }, {
+        option: '--registrationId [registrationId]'
+    }, {
+        option: '--registrationType [registrationType]',
+        autocomplete: ['None', 'List', 'ContentType', 'ProgId', 'FileType']
+    }, {
+        option: '--rights [rights]',
+        autocomplete: this.permissionsKindMap
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['Site', 'Web']
+    }, {
+        option: '--scriptBlock [scriptBlock]'
+    }, {
+        option: '--scriptSrc [scriptSrc]'
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
+    }, {
+        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
+    });
+}, _SpoCustomActionAddCommand_initValidators = function _SpoCustomActionAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.registrationId && !args.options.registrationType) {
+            return 'Option registrationId is specified, but registrationType is missing';
+        }
+        if (args.options.registrationType && !args.options.registrationId) {
+            return 'Option registrationType is specified, but registrationId is missing';
+        }
+        const location = args.options.location.toLowerCase();
+        const locationsRequireGroup = [
+            'microsoft.sharepoint.standardmenu', 'microsoft.sharepoint.contenttypesettings',
+            'microsoft.sharepoint.contenttypetemplatesettings', 'microsoft.sharepoint.create',
+            'microsoft.sharepoint.groupspage', 'microsoft.sharepoint.listedit',
+            'microsoft.sharepoint.listedit.documentlibrary', 'microsoft.sharepoint.peoplepage',
+            'microsoft.sharepoint.sitesettings'
+        ];
+        if (locationsRequireGroup.indexOf(location) > -1 && !args.options.group) {
+            return `The location specified requires the group option to be specified as well`;
+        }
+        if (location === 'scriptlink' &&
+            !args.options.scriptSrc &&
+            !args.options.scriptBlock) {
+            return 'Option scriptSrc or scriptBlock is required when the location is set to ScriptLink';
+        }
+        if ((args.options.scriptSrc || args.options.scriptBlock) && location !== 'scriptlink') {
+            return 'Option scriptSrc or scriptBlock is specified, but the location option is different than ScriptLink. Please use --actionUrl, if the location should be different than ScriptLink';
+        }
+        if (args.options.scriptSrc && args.options.scriptBlock) {
+            return 'Either option scriptSrc or scriptBlock can be specified, but not both';
+        }
+        if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
+            return 'Invalid option sequence. Expected value in range from 0 to 65536';
+        }
+        if (args.options.clientSideComponentId && validation_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
+            return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.clientSideComponentProperties && !args.options.clientSideComponentId) {
+            return `Option clientSideComponentProperties is specified, but the clientSideComponentId option is missing`;
+        }
+        if (args.options.scope &&
+            args.options.scope !== 'Site' &&
+            args.options.scope !== 'Web') {
+            return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web`;
+        }
+        if (args.options.rights) {
+            const rights = args.options.rights.split(',');
+            for (const item of rights) {
+                const kind = base_permissions_1.PermissionKind[item.trim()];
+                if (!kind) {
+                    return `Rights option '${item}' is not recognized as valid PermissionKind choice. Please note it is case sensitive`;
+                }
+            }
+        }
+        return true;
+    }));
+};
 module.exports = new SpoCustomActionAddCommand();
 //# sourceMappingURL=customaction-add.js.map