@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3da776c

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

@@ -13,12 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoContentTypeRemoveCommand_instances, _SpoContentTypeRemoveCommand_initTelemetry, _SpoContentTypeRemoveCommand_initOptions, _SpoContentTypeRemoveCommand_initValidators, _SpoContentTypeRemoveCommand_initTypes;
+var _SpoContentTypeRemoveCommand_instances, _SpoContentTypeRemoveCommand_initTelemetry, _SpoContentTypeRemoveCommand_initOptions, _SpoContentTypeRemoveCommand_initValidators, _SpoContentTypeRemoveCommand_initTypes, _SpoContentTypeRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
-const Command_1 = require("../../../../Command");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoContentTypeRemoveCommand extends SpoCommand_1.default {
@@ -29,6 +28,7 @@ class SpoContentTypeRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoContentTypeRemoveCommand_instances, "m", _SpoContentTypeRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeRemoveCommand_instances, "m", _SpoContentTypeRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeRemoveCommand_instances, "m", _SpoContentTypeRemoveCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeRemoveCommand_instances, "m", _SpoContentTypeRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CONTENTTYPE_REMOVE;
@@ -36,75 +36,72 @@ class SpoContentTypeRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Deletes site content type';
     }
-    commandAction(logger, args, cb) {
-        let contentTypeId = '';
-        const contentTypeIdentifierLabel = args.options.id ?
-            `with id ${args.options.id}` :
-            `with name ${args.options.name}`;
-        const removeContentType = () => {
-            (() => {
-                if (this.debug) {
-                    logger.logToStderr(`Retrieving information about the content type ${contentTypeIdentifierLabel}...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let contentTypeId = '';
+            const contentTypeIdentifierLabel = args.options.id ?
+                `with id ${args.options.id}` :
+                `with name ${args.options.name}`;
+            const removeContentType = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.debug) {
+                        logger.logToStderr(`Retrieving information about the content type ${contentTypeIdentifierLabel}...`);
+                    }
+                    let contentTypeIdResult;
+                    if (args.options.id) {
+                        contentTypeIdResult = { "value": [{ "StringId": args.options.id }] };
+                    }
+                    else {
+                        if (this.verbose) {
+                            logger.logToStderr(`Looking up the ID of content type ${contentTypeIdentifierLabel}...`);
+                        }
+                        const requestOptions = {
+                            url: `${args.options.webUrl}/_api/web/availableContentTypes?$filter=(Name eq '${encodeURIComponent(args.options.name)}')`,
+                            headers: {
+                                accept: 'application/json;odata=nometadata'
+                            },
+                            responseType: 'json'
+                        };
+                        contentTypeIdResult = yield request_1.default.get(requestOptions);
+                    }
+                    let res;
+                    if (contentTypeIdResult &&
+                        contentTypeIdResult.value &&
+                        contentTypeIdResult.value.length > 0) {
+                        contentTypeId = contentTypeIdResult.value[0].StringId;
+                        //execute delete operation
+                        const requestOptions = {
+                            url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(contentTypeId)}')`,
+                            headers: {
+                                'X-HTTP-Method': 'DELETE',
+                                'If-Match': '*',
+                                'accept': 'application/json;odata=nometadata'
+                            },
+                            responseType: 'json'
+                        };
+                        res = yield request_1.default.post(requestOptions);
+                    }
+                    else {
+                        res = { "odata.null": true };
+                    }
+                    if (res && res["odata.null"] === true) {
+                        throw `Content type not found`;
+                    }
                 }
-                if (args.options.id) {
-                    return Promise.resolve({ "value": [{ "StringId": args.options.id }] });
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
-                if (this.verbose) {
-                    logger.logToStderr(`Looking up the ID of content type ${contentTypeIdentifierLabel}...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/availableContentTypes?$filter=(Name eq '${encodeURIComponent(args.options.name)}')`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
-            })()
-                .then((contentTypeIdResult) => {
-                if (contentTypeIdResult &&
-                    contentTypeIdResult.value &&
-                    contentTypeIdResult.value.length > 0) {
-                    contentTypeId = contentTypeIdResult.value[0].StringId;
-                    //execute delete operation
-                    const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(contentTypeId)}')`,
-                        headers: {
-                            'X-HTTP-Method': 'DELETE',
-                            'If-Match': '*',
-                            'accept': 'application/json;odata=nometadata'
-                        },
-                        responseType: 'json'
-                    };
-                    return request_1.default.post(requestOptions);
-                }
-                else {
-                    return Promise.resolve({ "odata.null": true });
-                }
-            })
-                .then((res) => {
-                if (res && res["odata.null"] === true) {
-                    cb(new Command_1.CommandError(`Content type not found`));
-                    return;
-                }
-                cb();
-            }, (err) => {
-                this.handleRejectedODataJsonPromise(err, logger, cb);
             });
-        };
-        if (args.options.confirm) {
-            removeContentType();
-        }
-        else {
-            cli_1.Cli.prompt({ type: 'confirm', name: 'continue', default: false, message: `Are you sure you want to remove the content type ${args.options.id || args.options.name}?` }, (result) => {
-                if (!result.continue) {
-                    cb();
+            if (args.options.confirm) {
+                yield removeContentType();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({ type: 'confirm', name: 'continue', default: false, message: `Are you sure you want to remove the content type ${args.options.id || args.options.name}?` });
+                if (result.continue) {
+                    yield removeContentType();
                 }
-                else {
-                    removeContentType();
-                }
-            });
-        }
+            }
+        });
     }
 }
 _SpoContentTypeRemoveCommand_instances = new WeakSet(), _SpoContentTypeRemoveCommand_initTelemetry = function _SpoContentTypeRemoveCommand_initTelemetry() {
@@ -126,21 +123,11 @@ _SpoContentTypeRemoveCommand_instances = new WeakSet(), _SpoContentTypeRemoveCom
         option: '--confirm'
     });
 }, _SpoContentTypeRemoveCommand_initValidators = function _SpoContentTypeRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either the id or the name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either the id or the name but not both';
-        }
-        return true;
-    }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 }, _SpoContentTypeRemoveCommand_initTypes = function _SpoContentTypeRemoveCommand_initTypes() {
     this.types.string.push('id', 'i');
+}, _SpoContentTypeRemoveCommand_initOptionSets = function _SpoContentTypeRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoContentTypeRemoveCommand();
 //# sourceMappingURL=contenttype-remove.js.map

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

@@ -0,0 +1,168 @@
+"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 _SpoContentTypeSetCommand_instances, _SpoContentTypeSetCommand_initTelemetry, _SpoContentTypeSetCommand_initOptions, _SpoContentTypeSetCommand_initValidators, _SpoContentTypeSetCommand_initTypes, _SpoContentTypeSetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+class SpoContentTypeSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoContentTypeSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSetCommand_instances, "m", _SpoContentTypeSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSetCommand_instances, "m", _SpoContentTypeSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSetCommand_instances, "m", _SpoContentTypeSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSetCommand_instances, "m", _SpoContentTypeSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeSetCommand_instances, "m", _SpoContentTypeSetCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.CONTENTTYPE_SET;
+    }
+    get description() {
+        return 'Updates existing content type';
+    }
+    allowUnknownOptions() {
+        return true;
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/Web`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: this.getRequestPayload(args.options)
+            };
+            if (args.options.listId) {
+                requestOptions.url += `/Lists/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                requestOptions.url += `/Lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                requestOptions.url += `/GetList('${formatting_1.formatting.encodeQueryParameter(urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl))}')`;
+            }
+            requestOptions.url += '/ContentTypes';
+            try {
+                const contentTypeId = yield this.getContentTypeId(args.options);
+                requestOptions.url += `/GetById('${formatting_1.formatting.encodeQueryParameter(contentTypeId)}')`;
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
+    }
+    getContentTypeId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                return options.id;
+            }
+            const requestOptions = {
+                url: `${options.webUrl}/_api/Web`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            if (options.listId) {
+                requestOptions.url += `/Lists/GetById('${formatting_1.formatting.encodeQueryParameter(options.listId)}')`;
+            }
+            else if (options.listTitle) {
+                requestOptions.url += `/Lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')`;
+            }
+            else if (options.listUrl) {
+                requestOptions.url += `/GetList('${formatting_1.formatting.encodeQueryParameter(urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl))}')`;
+            }
+            requestOptions.url += `/ContentTypes?$filter=Name eq '${formatting_1.formatting.encodeQueryParameter(options.name)}'&$select=Id`;
+            const res = yield request_1.default.get(requestOptions);
+            if (res.value.length === 0) {
+                throw `The specified content type '${options.name}' does not exist`;
+            }
+            return res.value[0].Id.StringValue;
+        });
+    }
+    getRequestPayload(options) {
+        const excludeOptions = [
+            'webUrl',
+            'id',
+            'name',
+            'listTitle',
+            'listId',
+            'listUrl',
+            'query',
+            'debug',
+            'verbose',
+            'output'
+        ];
+        const payload = Object.keys(options)
+            .filter(key => excludeOptions.indexOf(key) === -1)
+            .reduce((object, key) => {
+            object[key] = options[key];
+            return object;
+        }, {});
+        return payload;
+    }
+}
+_SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_initTelemetry = function _SpoContentTypeSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listId: typeof args.options.listId !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
+        });
+    });
+}, _SpoContentTypeSetCommand_initOptions = function _SpoContentTypeSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    });
+}, _SpoContentTypeSetCommand_initValidators = function _SpoContentTypeSetCommand_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.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `'${args.options.listId}' is not a valid GUID.`;
+        }
+        if ((args.options.listId && (args.options.listTitle || args.options.listUrl)) || (args.options.listTitle && args.options.listUrl)) {
+            return `Specify either listTitle, listId or listUrl.`;
+        }
+        return true;
+    }));
+}, _SpoContentTypeSetCommand_initTypes = function _SpoContentTypeSetCommand_initTypes() {
+    this.types.string.push('id', 'i');
+}, _SpoContentTypeSetCommand_initOptionSets = function _SpoContentTypeSetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
+module.exports = new SpoContentTypeSetCommand();
+//# sourceMappingURL=contenttype-set.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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");
@@ -47,47 +47,50 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
         }
         return result;
     }
-    commandAction(logger, args, cb) {
-        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'
-        };
-        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
-                });
+    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
+                    });
+                }
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     mapRequestBody(options) {
         const requestBody = {
@@ -222,7 +225,7 @@ _SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand
     });
 }, _SpoCustomActionAddCommand_initValidators = function _SpoCustomActionAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -257,7 +260,7 @@ _SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand
         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) {
+        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) {