@pnp/cli-microsoft365 6.9.0-beta.f6054b4 → 6.10.0-beta.81a81c0

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

@@ -0,0 +1,154 @@
+"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 _SpoApplicationCustomizerSetCommand_instances, _SpoApplicationCustomizerSetCommand_initOptions, _SpoApplicationCustomizerSetCommand_initTelemetry, _SpoApplicationCustomizerSetCommand_initValidators, _SpoApplicationCustomizerSetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const spo_1 = require("../../../../utils/spo");
+const formatting_1 = require("../../../../utils/formatting");
+const os = require("os");
+class SpoApplicationCustomizerSetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.APPLICATIONCUSTOMIZER_SET;
+    }
+    get description() {
+        return 'Updates an existing Application Customizer on a site';
+    }
+    constructor() {
+        super();
+        _SpoApplicationCustomizerSetCommand_instances.add(this);
+        this.allowedScopes = ['Site', 'Web', 'All'];
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerSetCommand_instances, "m", _SpoApplicationCustomizerSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerSetCommand_instances, "m", _SpoApplicationCustomizerSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerSetCommand_instances, "m", _SpoApplicationCustomizerSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerSetCommand_instances, "m", _SpoApplicationCustomizerSetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appCustomizer = yield this.getAppCustomizerToUpdate(logger, args.options);
+                yield this.updateAppCustomizer(logger, args.options, appCustomizer);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    updateAppCustomizer(logger, options, appCustomizer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { clientSideComponentProperties, webUrl, newTitle } = options;
+            if (this.verbose) {
+                logger.logToStderr(`Updating application customizer with ID '${appCustomizer.Id}' on the site '${webUrl}'...`);
+            }
+            const requestBody = {};
+            if (newTitle) {
+                requestBody.Title = newTitle;
+            }
+            if (clientSideComponentProperties !== undefined) {
+                requestBody.ClientSideComponentProperties = clientSideComponentProperties;
+            }
+            const requestOptions = {
+                url: `${webUrl}/_api/${appCustomizer.Scope.toString() === '2' ? 'Site' : 'Web'}/UserCustomActions('${appCustomizer.Id}')`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'X-HTTP-Method': 'MERGE'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    getAppCustomizerToUpdate(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, webUrl, title, clientSideComponentId, scope } = options;
+            const resolvedScope = scope || 'All';
+            if (this.verbose) {
+                logger.logToStderr(`Getting application customizer ${title || clientSideComponentId || id} to update...`);
+            }
+            let appCustomizers = [];
+            if (id) {
+                const appCustomizer = yield spo_1.spo.getCustomActionById(webUrl, id, resolvedScope);
+                if (appCustomizer && appCustomizer.Location === 'ClientSideExtension.ApplicationCustomizer') {
+                    appCustomizers.push(appCustomizer);
+                }
+            }
+            else if (title) {
+                appCustomizers = yield spo_1.spo.getCustomActions(webUrl, resolvedScope, `(Title eq '${formatting_1.formatting.encodeQueryParameter(title)}') and (startswith(Location,'ClientSideExtension.ApplicationCustomizer'))`);
+            }
+            else {
+                appCustomizers = yield spo_1.spo.getCustomActions(webUrl, resolvedScope, `(ClientSideComponentId eq guid'${clientSideComponentId}') and (startswith(Location,'ClientSideExtension.ApplicationCustomizer'))`);
+            }
+            if (appCustomizers.length === 0) {
+                throw `No application customizer with ${title && `title '${title}'` || clientSideComponentId && `ClientSideComponentId '${clientSideComponentId}'` || id && `id '${id}'`} found`;
+            }
+            if (appCustomizers.length > 1) {
+                throw `Multiple application customizer with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found. Please disambiguate using IDs: ${os.EOL}${appCustomizers.map(a => `- ${a.Id}`).join(os.EOL)}`;
+            }
+            return appCustomizers[0];
+        });
+    }
+}
+_SpoApplicationCustomizerSetCommand_instances = new WeakSet(), _SpoApplicationCustomizerSetCommand_initOptions = function _SpoApplicationCustomizerSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
+    }, {
+        option: '--newTitle [newTitle]'
+    }, {
+        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
+    }, {
+        option: '-s, --scope [scope]', autocomplete: this.allowedScopes
+    });
+}, _SpoApplicationCustomizerSetCommand_initTelemetry = function _SpoApplicationCustomizerSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            newTitle: typeof args.options.newTitle !== 'undefined',
+            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined'
+        });
+    });
+}, _SpoApplicationCustomizerSetCommand_initValidators = function _SpoApplicationCustomizerSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.scope && this.allowedScopes.indexOf(args.options.scope) === -1) {
+            return `'${args.options.scope}' is not a valid application customizer scope. Allowed values are: ${this.allowedScopes.join(',')}`;
+        }
+        if (!args.options.newTitle && !args.options.clientSideComponentProperties) {
+            return `Please specify an option to be updated`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoApplicationCustomizerSetCommand_initOptionSets = function _SpoApplicationCustomizerSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title', 'clientSideComponentId'] });
+};
+module.exports = new SpoApplicationCustomizerSetCommand();
+//# sourceMappingURL=applicationcustomizer-set.js.map

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

@@ -42,7 +42,7 @@ class SpoAppPageSetCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json',
                 data: {
-                    serverRelativeUrl: `${urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.name}`,
+                    serverRelativeUrl: `${urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, 'SitePages')}/${args.options.name}`,
                     webPartDataAsJson: args.options.webPartData
                 }
             };

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

@@ -39,7 +39,7 @@ class SpoCommandSetSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Updating ListView Command Set ${args.options.clientSideComponentId} to site '${args.options.webUrl}'...`);
+                logger.logToStderr(`Updating ListView Command Set ${args.options.id || args.options.title || args.options.clientSideComponentId} to site '${args.options.webUrl}'...`);
             }
             if (!args.options.scope) {
                 args.options.scope = 'All';
@@ -59,6 +59,9 @@ class SpoCommandSetSetCommand extends SpoCommand_1.default {
                 if (args.options.clientSideComponentProperties) {
                     requestBody.ClientSideComponentProperties = args.options.clientSideComponentProperties;
                 }
+                if (args.options.newClientSideComponentId) {
+                    requestBody.ClientSideComponentId = args.options.newClientSideComponentId;
+                }
                 const customAction = yield this.getCustomAction(args.options);
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/${customAction.Scope === 3 ? "Web" : "Site"}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customAction.Id)}')`,
@@ -127,6 +130,7 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
             title: typeof args.options.title !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            newClientSideComponentId: typeof args.options.newClientSideComponentId !== 'undefined',
             listType: typeof args.options.listType !== 'undefined',
             clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
             scope: typeof args.options.scope !== 'undefined',
@@ -142,6 +146,8 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         option: '-i, --id [id]'
     }, {
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    }, {
+        option: '--newClientSideComponentId  [newClientSideComponentId]'
     }, {
         option: '--newTitle [newTitle]'
     }, {
@@ -161,6 +167,9 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
+        if (args.options.newClientSideComponentId && !validation_1.validation.isValidGuid(args.options.newClientSideComponentId)) {
+            return `${args.options.newClientSideComponentId} is not a valid GUID`;
+        }
         if (args.options.listType && SpoCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
             return `${args.options.listType} is not a valid list type. Allowed values are ${SpoCommandSetSetCommand.listTypes.join(', ')}`;
         }
@@ -170,7 +179,7 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         if (args.options.location && SpoCommandSetSetCommand.locations.indexOf(args.options.location) < 0) {
             return `${args.options.location} is not a valid location. Allowed values are ${SpoCommandSetSetCommand.locations.join(', ')}`;
         }
-        if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location) {
+        if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location && !args.options.newClientSideComponentId) {
             return `Please specify option to be updated`;
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);

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

@@ -170,7 +170,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
         });
     }
     createFieldLink(logger, args, schemaXmlWithResourceTokens) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             let requiresUpdate = false;
             const match = /(<Field[^>]+>)(.*)/.exec(schemaXmlWithResourceTokens);
             let xField = match[1];
@@ -185,120 +185,91 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     xField = xField.replace(allowDeletion[0], 'AllowDeletion="TRUE"') + match[2];
                 }
             }
-            this
-                .updateField(xField, requiresUpdate, logger, args)
-                .then(() => {
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving site collection id...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/site?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
-            })
-                .then((res) => {
-                this.siteId = res.Id;
-                if (this.verbose) {
-                    logger.logToStderr(`Retrieving site id...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web?$select=Id`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
-            })
-                .then((res) => {
-                this.webId = res.Id;
-                return this.ensureRequestDigest(args.options.webUrl, logger);
-            })
-                .then(() => {
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.requestDigest
-                    },
-                    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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.id}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    resolve();
-                }
-            }, (error) => {
-                reject(error);
-            });
+            yield this.updateField(xField, requiresUpdate, logger, args);
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving site collection id...`);
+            }
+            const requestOptionsSiteId = {
+                url: `${args.options.webUrl}/_api/site?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const resSiteId = yield request_1.default.get(requestOptionsSiteId);
+            this.siteId = resSiteId.Id;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving site id...`);
+            }
+            const requestOptionsWebId = {
+                url: `${args.options.webUrl}/_api/web?$select=Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const resWebId = yield request_1.default.get(requestOptionsWebId);
+            this.webId = resWebId.Id;
+            yield this.ensureRequestDigest(args.options.webUrl, logger);
+            const requestOptions = {
+                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.requestDigest
+                },
+                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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.id}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            else {
+                return;
+            }
         });
     }
     updateField(schemaXml, requiresUpdate, logger, args) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (!requiresUpdate) {
                 if (this.verbose) {
                     logger.logToStderr(`Schema of field ${args.options.id} is already up-to-date`);
                 }
-                resolve();
                 return;
             }
-            this
-                .ensureRequestDigest(args.options.webUrl, logger)
-                .then(() => {
-                if (this.verbose) {
-                    logger.logToStderr(`Updating field schema...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata',
-                        'content-type': 'application/json;odata=nometadata',
-                        'X-HTTP-Method': 'MERGE',
-                        'x-requestdigest': this.requestDigest
-                    },
-                    data: {
-                        SchemaXml: schemaXml
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(() => {
-                resolve();
-            }, (error) => {
-                reject(error);
-            });
+            yield this.ensureRequestDigest(args.options.webUrl, logger);
+            if (this.verbose) {
+                logger.logToStderr(`Updating field schema...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'content-type': 'application/json;odata=nometadata',
+                    'X-HTTP-Method': 'MERGE',
+                    'x-requestdigest': this.requestDigest
+                },
+                data: {
+                    SchemaXml: schemaXml
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
         });
     }
     ensureRequestDigest(siteUrl, logger) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.requestDigest) {
                 if (this.debug) {
                     logger.logToStderr('Request digest already present');
                 }
-                resolve();
                 return;
             }
             if (this.debug) {
                 logger.logToStderr('Retrieving request digest...');
             }
-            spo_1.spo
-                .getRequestDigest(siteUrl)
-                .then((res) => {
-                this.requestDigest = res.FormDigestValue;
-                resolve();
-            }, (error) => {
-                reject(error);
-            });
+            const res = yield spo_1.spo.getRequestDigest(siteUrl);
+            this.requestDigest = res.FormDigestValue;
         });
     }
 }

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

@@ -81,19 +81,11 @@ class SpoCustomActionClearCommand extends SpoCommand_1.default {
      * Another clear request is send with `site` scope after.
      */
     clearAllScopes(options) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             options.scope = "Web";
-            this
-                .clearScopedCustomActions(options)
-                .then(() => {
-                options.scope = "Site";
-                return this.clearScopedCustomActions(options);
-            })
-                .then(() => {
-                return resolve();
-            }, (err) => {
-                reject(err);
-            });
+            yield this.clearScopedCustomActions(options);
+            options.scope = "Site";
+            yield this.clearScopedCustomActions(options);
         });
     }
 }

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

@@ -77,7 +77,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
     getCustomActionId(options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (options.id) {
-                return Promise.resolve(options.id);
+                return options.id;
             }
             const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`);
             if (customActions.length === 1) {
@@ -90,9 +90,8 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
         });
     }
     removeScopedCustomAction(options) {
-        return this
-            .getCustomActionId(options)
-            .then((customActionId) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const customActionId = yield this.getCustomActionId(options);
             const requestOptions = {
                 url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customActionId)}')')`,
                 headers: {
@@ -101,7 +100,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.post(requestOptions);
+            return yield request_1.default.post(requestOptions);
         });
     }
     /**
@@ -110,25 +109,15 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
      * another get request is send with `site` scope.
      */
     searchAllScopes(options) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             options.scope = "Web";
-            this
-                .removeScopedCustomAction(options)
-                .then((webResult) => {
-                if (webResult === undefined) {
-                    return resolve(webResult);
-                }
-                options.scope = "Site";
-                this
-                    .removeScopedCustomAction(options)
-                    .then((siteResult) => {
-                    return resolve(siteResult);
-                }, (err) => {
-                    reject(err);
-                });
-            }, (err) => {
-                reject(err);
-            });
+            const webResult = yield this.removeScopedCustomAction(options);
+            if (!webResult) {
+                return webResult;
+            }
+            options.scope = "Site";
+            const siteResult = yield this.removeScopedCustomAction(options);
+            return siteResult;
         });
     }
 }

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

@@ -73,17 +73,19 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
         });
     }
     updateCustomAction(options) {
-        const requestBody = this.mapRequestBody(options);
-        const requestOptions = {
-            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(options.id)}')`,
-            headers: {
-                accept: 'application/json;odata=nometadata',
-                'X-HTTP-Method': 'MERGE'
-            },
-            data: requestBody,
-            responseType: 'json'
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestBody = this.mapRequestBody(options);
+            const requestOptions = {
+                url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(options.id)}')`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'X-HTTP-Method': 'MERGE'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            return yield request_1.default.post(requestOptions);
+        });
     }
     /**
      * Merge request with `web` scope is send first.
@@ -91,25 +93,15 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
      * another merge request is send with `site` scope.
      */
     searchAllScopes(options) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             options.scope = "Web";
-            this
-                .updateCustomAction(options)
-                .then((webResult) => {
-                if (webResult === undefined || webResult["odata.null"] !== true) {
-                    return resolve(webResult);
-                }
-                options.scope = "Site";
-                this
-                    .updateCustomAction(options)
-                    .then((siteResult) => {
-                    return resolve(siteResult);
-                }, (err) => {
-                    reject(err);
-                });
-            }, (err) => {
-                reject(err);
-            });
+            const webResult = yield this.updateCustomAction(options);
+            if (webResult === undefined || webResult["odata.null"] !== true) {
+                return webResult;
+            }
+            options.scope = "Site";
+            const siteResult = yield this.updateCustomAction(options);
+            return siteResult;
         });
     }
     mapRequestBody(options) {