@pnp/cli-microsoft365 7.0.0-beta.b7c2a8d → 7.0.0-beta.c0afb7b

package/dist/m365/spo/commands/web/web-roleassignment-add.js

@@ -49,7 +49,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    addRoleAssignment(logger, options) {
+    async addRoleAssignment(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
             method: 'POST',
@@ -59,14 +59,11 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        return request
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
+        await request.post(requestOptions);
     }
-    getRoleDefinitionId(options) {
+    async getRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {
-            return Promise.resolve(options.roleDefinitionId);
+            return options.roleDefinitionId;
         }
         const roleDefinitionListCommandOptions = {
             webUrl: options.webUrl,
@@ -74,16 +71,12 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } })
-            .then((output) => {
-            const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-            const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-            return Promise.resolve(roleDefinitionId);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } });
+        const getRoleDefinitionListOutput = JSON.parse(output.stdout);
+        const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
+        return roleDefinitionId;
     }
-    getGroupPrincipalId(options) {
+    async getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -91,15 +84,11 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getGroupOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
+        const getGroupOutput = JSON.parse(output.stdout);
+        return getGroupOutput.Id;
     }
-    getUserPrincipalId(options) {
+    async getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -108,13 +97,9 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getUserOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
+        const getUserOutput = JSON.parse(output.stdout);
+        return getUserOutput.Id;
     }
 }
 _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignmentAddCommand_initTelemetry = function _SpoWebRoleAssignmentAddCommand_initTelemetry() {

package/dist/m365/spo/commands/web/web-roleassignment-remove.js

@@ -27,29 +27,8 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const removeRoleAssignment = async () => {
-            if (this.verbose) {
-                await logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
-            }
-            try {
-                if (args.options.upn) {
-                    args.options.principalId = await this.getUserPrincipalId(args.options);
-                    await this.removeRoleAssignment(logger, args.options);
-                }
-                else if (args.options.groupName) {
-                    args.options.principalId = await this.getGroupPrincipalId(args.options);
-                    await this.removeRoleAssignment(logger, args.options);
-                }
-                else {
-                    await this.removeRoleAssignment(logger, args.options);
-                }
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeRoleAssignment();
+            await this.removeRoleAssignment(logger, args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -59,11 +38,32 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
             });
             if (result.continue) {
-                await removeRoleAssignment();
+                await this.removeRoleAssignment(logger, args.options);
             }
         }
     }
-    removeRoleAssignment(logger, options) {
+    async removeRoleAssignment(logger, options) {
+        if (this.verbose) {
+            await logger.logToStderr(`Removing role assignment from web ${options.webUrl}...`);
+        }
+        try {
+            if (options.upn) {
+                options.principalId = await this.getUserPrincipalId(options);
+                await this.removeRoleAssignmentWithOptions(logger, options);
+            }
+            else if (options.groupName) {
+                options.principalId = await this.getGroupPrincipalId(options);
+                await this.removeRoleAssignmentWithOptions(logger, options);
+            }
+            else {
+                await this.removeRoleAssignmentWithOptions(logger, options);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async removeRoleAssignmentWithOptions(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -73,12 +73,9 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        return request
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
+        await request.post(requestOptions);
     }
-    getGroupPrincipalId(options) {
+    async getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -86,15 +83,11 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getGroupOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
+        const getGroupOutput = JSON.parse(output.stdout);
+        return getGroupOutput.Id;
     }
-    getUserPrincipalId(options) {
+    async getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -103,13 +96,9 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getUserOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
+        const getUserOutput = JSON.parse(output.stdout);
+        return getUserOutput.Id;
     }
 }
 _SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignmentRemoveCommand_initTelemetry = function _SpoWebRoleAssignmentRemoveCommand_initTelemetry() {

package/dist/m365/spo/commands/web/web-roleinheritance-break.js

@@ -27,24 +27,8 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Break role inheritance of subsite with URL ${args.options.webUrl}...`);
         }
-        const breakroleInheritance = async () => {
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/breakroleinheritance(${!args.options.clearExistingPermissions})`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            try {
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await breakroleInheritance();
+            await this.breakroleInheritance(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -54,10 +38,26 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
                 message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}`
             });
             if (result.continue) {
-                await breakroleInheritance();
+                await this.breakroleInheritance(args.options);
             }
         }
     }
+    async breakroleInheritance(options) {
+        const requestOptions = {
+            url: `${options.webUrl}/_api/web/breakroleinheritance(${!options.clearExistingPermissions})`,
+            headers: {
+                'accept': 'application/json;odata=nometadata',
+                'content-type': 'application/json'
+            },
+            responseType: 'json'
+        };
+        try {
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoWebRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoWebRoleInheritanceBreakCommand_initTelemetry = function _SpoWebRoleInheritanceBreakCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/web/web-roleinheritance-reset.js

@@ -27,25 +27,8 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Restore role inheritance of subsite at ${args.options.webUrl}...`);
         }
-        const resetWebRoleInheritance = async () => {
-            try {
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
-                    method: 'POST',
-                    headers: {
-                        'accept': 'application/json;odata=nometadata',
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await resetWebRoleInheritance();
+            await this.resetWebRoleInheritance(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -55,10 +38,27 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
                 message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}`
             });
             if (result.continue) {
-                await resetWebRoleInheritance();
+                await this.resetWebRoleInheritance(args.options);
             }
         }
     }
+    async resetWebRoleInheritance(options) {
+        try {
+            const requestOptions = {
+                url: `${options.webUrl}/_api/web/resetroleinheritance`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initTelemetry = function _SpoWebRoleInheritanceResetCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/yammer/commands/message/message-like-set.js

@@ -24,34 +24,9 @@ class YammerMessageLikeSetCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerMessageLikeSetCommand_instances, "m", _YammerMessageLikeSetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const executeLikeAction = async () => {
-            const endpoint = `${this.resource}/v1/messages/liked_by/current.json`;
-            const requestOptions = {
-                url: endpoint,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    message_id: args.options.messageId
-                }
-            };
-            try {
-                if (args.options.enable !== false) {
-                    await request.post(requestOptions);
-                }
-                else {
-                    await request.delete(requestOptions);
-                }
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.enable === false) {
             if (args.options.force) {
-                await executeLikeAction();
+                await this.executeLikeAction(args.options);
             }
             else {
                 const messagePrompt = `Are you sure you want to unlike message ${args.options.messageId}?`;
@@ -62,12 +37,36 @@ class YammerMessageLikeSetCommand extends YammerCommand {
                     message: messagePrompt
                 });
                 if (result.continue) {
-                    await executeLikeAction();
+                    await this.executeLikeAction(args.options);
                 }
             }
         }
         else {
-            await executeLikeAction();
+            await this.executeLikeAction(args.options);
+        }
+    }
+    async executeLikeAction(options) {
+        const requestOptions = {
+            url: `${this.resource}/v1/messages/liked_by/current.json`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                message_id: options.messageId
+            }
+        };
+        try {
+            if (options.enable !== false) {
+                await request.post(requestOptions);
+            }
+            else {
+                await request.delete(requestOptions);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

package/dist/m365/yammer/commands/message/message-list.js

@@ -25,91 +25,72 @@ class YammerMessageListCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerMessageListCommand_instances, "m", _YammerMessageListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _YammerMessageListCommand_instances, "m", _YammerMessageListCommand_initValidators).call(this);
     }
-    getAllItems(logger, args, messageId) {
-        return new Promise((resolve, reject) => {
-            let endpoint = `${this.resource}/v1`;
-            if (args.options.threadId) {
-                endpoint += `/messages/in_thread/${args.options.threadId}.json`;
-            }
-            else if (args.options.groupId) {
-                endpoint += `/messages/in_group/${args.options.groupId}.json`;
-            }
-            else {
-                if (!args.options.feedType) {
-                    args.options.feedType = "All";
-                }
-                switch (args.options.feedType) {
-                    case 'Top':
-                        endpoint += `/messages/algo.json`;
-                        break;
-                    case 'My':
-                        endpoint += `/messages/my_feed.json`;
-                        break;
-                    case 'Following':
-                        endpoint += `/messages/following.json`;
-                        break;
-                    case 'Sent':
-                        endpoint += `/messages/sent.json`;
-                        break;
-                    case 'Private':
-                        endpoint += `/messages/private.json`;
-                        break;
-                    case 'Received':
-                        endpoint += `/messages/received.json`;
-                        break;
-                    default:
-                        endpoint += `/messages.json`;
-                }
+    async getAllItems(logger, args, messageId) {
+        let endpoint = `${this.resource}/v1`;
+        if (args.options.threadId) {
+            endpoint += `/messages/in_thread/${args.options.threadId}.json`;
+        }
+        else if (args.options.groupId) {
+            endpoint += `/messages/in_group/${args.options.groupId}.json`;
+        }
+        else {
+            if (!args.options.feedType) {
+                args.options.feedType = "All";
             }
-            if (messageId !== -1) {
-                endpoint += `?older_than=${messageId}`;
+            switch (args.options.feedType) {
+                case 'Top':
+                    endpoint += `/messages/algo.json`;
+                    break;
+                case 'My':
+                    endpoint += `/messages/my_feed.json`;
+                    break;
+                case 'Following':
+                    endpoint += `/messages/following.json`;
+                    break;
+                case 'Sent':
+                    endpoint += `/messages/sent.json`;
+                    break;
+                case 'Private':
+                    endpoint += `/messages/private.json`;
+                    break;
+                case 'Received':
+                    endpoint += `/messages/received.json`;
+                    break;
+                default:
+                    endpoint += `/messages.json`;
             }
-            else if (args.options.olderThanId) {
-                endpoint += `?older_than=${args.options.olderThanId}`;
+        }
+        if (messageId !== -1) {
+            endpoint += `?older_than=${messageId}`;
+        }
+        else if (args.options.olderThanId) {
+            endpoint += `?older_than=${args.options.olderThanId}`;
+        }
+        if (args.options.threaded) {
+            if (endpoint.indexOf("?") > -1) {
+                endpoint += "&";
             }
-            if (args.options.threaded) {
-                if (endpoint.indexOf("?") > -1) {
-                    endpoint += "&";
-                }
-                else {
-                    endpoint += "?";
-                }
-                endpoint += `threaded=true`;
+            else {
+                endpoint += "?";
             }
-            const requestOptions = {
-                url: endpoint,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request
-                .get(requestOptions)
-                .then((res) => {
-                this.items = this.items.concat(res.messages);
-                if (args.options.limit && this.items.length > args.options.limit) {
-                    this.items = this.items.slice(0, args.options.limit);
-                    resolve();
-                }
-                else {
-                    if (res.meta.older_available === true) {
-                        this
-                            .getAllItems(logger, args, this.items[this.items.length - 1].id)
-                            .then(() => {
-                            resolve();
-                        }, (err) => {
-                            reject(err);
-                        });
-                    }
-                    else {
-                        resolve();
-                    }
-                }
-            }, (err) => {
-                reject(err);
-            });
-        });
+            endpoint += `threaded=true`;
+        }
+        const requestOptions = {
+            url: endpoint,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        this.items = this.items.concat(res.messages);
+        if (args.options.limit && this.items.length > args.options.limit) {
+            this.items = this.items.slice(0, args.options.limit);
+        }
+        else if ((res.meta.older_available === true)) {
+            await this.getAllItems(logger, args, this.items[this.items.length - 1].id);
+        }
     }
     async commandAction(logger, args) {
         this.items = []; // this will reset the items array in interactive mode

package/dist/m365/yammer/commands/message/message-remove.js

@@ -23,24 +23,8 @@ class YammerMessageRemoveCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerMessageRemoveCommand_instances, "m", _YammerMessageRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const removeMessage = async () => {
-            try {
-                const requestOptions = {
-                    url: `${this.resource}/v1/messages/${args.options.id}.json`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none',
-                        'content-type': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                await request.delete(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeMessage();
+            await this.removeMessage(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -50,10 +34,26 @@ class YammerMessageRemoveCommand extends YammerCommand {
                 message: `Are you sure you want to remove the Yammer message ${args.options.id}?`
             });
             if (result.continue) {
-                await removeMessage();
+                await this.removeMessage(args.options);
             }
         }
     }
+    async removeMessage(options) {
+        try {
+            const requestOptions = {
+                url: `${this.resource}/v1/messages/${options.id}.json`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            await request.delete(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _YammerMessageRemoveCommand_instances = new WeakSet(), _YammerMessageRemoveCommand_initTelemetry = function _YammerMessageRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {