@pnp/cli-microsoft365 6.10.0-beta.f43fa4d → 6.11.0-beta.259c884

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

@@ -39,29 +39,8 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRoleAssignment = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
-                }
-                try {
-                    if (args.options.upn) {
-                        args.options.principalId = yield this.getUserPrincipalId(args.options);
-                        yield this.removeRoleAssignment(logger, args.options);
-                    }
-                    else if (args.options.groupName) {
-                        args.options.principalId = yield this.getGroupPrincipalId(args.options);
-                        yield this.removeRoleAssignment(logger, args.options);
-                    }
-                    else {
-                        yield this.removeRoleAssignment(logger, args.options);
-                    }
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeRoleAssignment();
+                yield this.removeRoleAssignment(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -71,57 +50,75 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
                 });
                 if (result.continue) {
-                    yield removeRoleAssignment();
+                    yield this.removeRoleAssignment(logger, args.options);
                 }
             }
         });
     }
     removeRoleAssignment(logger, options) {
-        const requestOptions = {
-            url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role assignment from web ${options.webUrl}...`);
+            }
+            try {
+                if (options.upn) {
+                    options.principalId = yield this.getUserPrincipalId(options);
+                    yield this.removeRoleAssignmentWithOptions(logger, options);
+                }
+                else if (options.groupName) {
+                    options.principalId = yield this.getGroupPrincipalId(options);
+                    yield this.removeRoleAssignmentWithOptions(logger, options);
+                }
+                else {
+                    yield this.removeRoleAssignmentWithOptions(logger, options);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    removeRoleAssignmentWithOptions(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
     }
     getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
-            .then((output) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const groupGetCommandOptions = {
+                webUrl: options.webUrl,
+                name: options.groupName,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) });
             const getGroupOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
+            return getGroupOutput.Id;
         });
     }
     getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
-            .then((output) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userGetCommandOptions = {
+                webUrl: options.webUrl,
+                email: options.upn,
+                id: undefined,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) });
             const getUserOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
+            return getUserOutput.Id;
         });
     }
 }

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

@@ -39,24 +39,8 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Break role inheritance of subsite with URL ${args.options.webUrl}...`);
             }
-            const breakroleInheritance = () => __awaiter(this, void 0, void 0, function* () {
-                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 {
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield breakroleInheritance();
+                yield this.breakroleInheritance(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -66,11 +50,29 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}`
                 });
                 if (result.continue) {
-                    yield breakroleInheritance();
+                    yield this.breakroleInheritance(args.options);
                 }
             }
         });
     }
+    breakroleInheritance(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${options.webUrl}/_api/web/breakroleinheritance(${!options.clearExistingPermissions})`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.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

@@ -39,25 +39,8 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Restore role inheritance of subsite at ${args.options.webUrl}...`);
             }
-            const resetWebRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
-                        method: 'POST',
-                        headers: {
-                            'accept': 'application/json;odata=nometadata',
-                            'content-type': 'application/json'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield resetWebRoleInheritance();
+                yield this.resetWebRoleInheritance(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -67,11 +50,30 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}`
                 });
                 if (result.continue) {
-                    yield resetWebRoleInheritance();
+                    yield this.resetWebRoleInheritance(args.options);
                 }
             }
         });
     }
+    resetWebRoleInheritance(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${options.webUrl}/_api/web/resetroleinheritance`,
+                    method: 'POST',
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initTelemetry = function _SpoWebRoleInheritanceResetCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/teams/commands/meeting/meeting-get.js

@@ -16,13 +16,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMeetingGetCommand_instances, _TeamsMeetingGetCommand_initTelemetry, _TeamsMeetingGetCommand_initOptions, _TeamsMeetingGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const validation_1 = require("../../../../utils/validation");
 const accessToken_1 = require("../../../../utils/accessToken");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const aadUser_1 = require("../../../../utils/aadUser");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsMeetingGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_GET;
@@ -37,20 +37,6 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initValidators).call(this);
     }
-    getUserId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const commandOptions = {
-                email: options.email,
-                userName: options.userName,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.id;
-        });
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
@@ -71,18 +57,13 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
                 let requestUrl = `${this.resource}/v1.0/`;
                 if (isAppOnlyAccessToken) {
                     requestUrl += 'users/';
-                    if (args.options.userId) {
-                        requestUrl += args.options.userId;
-                    }
-                    else {
-                        const userId = yield this.getUserId(args.options);
-                        requestUrl += userId;
-                    }
+                    const userId = yield this.getUserId(args.options);
+                    requestUrl += userId;
                 }
                 else {
                     requestUrl += `me`;
                 }
-                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${encodeURIComponent(args.options.joinUrl)}'`;
+                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${formatting_1.formatting.encodeQueryParameter(args.options.joinUrl)}'`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -103,6 +84,17 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
             }
         });
     }
+    getUserId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.userId) {
+                return options.userId;
+            }
+            if (options.userName) {
+                return aadUser_1.aadUser.getUserIdByUpn(options.userName);
+            }
+            return aadUser_1.aadUser.getUserIdByEmail(options.email);
+        });
+    }
 }
 _TeamsMeetingGetCommand_instances = new WeakSet(), _TeamsMeetingGetCommand_initTelemetry = function _TeamsMeetingGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/teams/commands/meeting/meeting-list.js

@@ -21,8 +21,8 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const accessToken_1 = require("../../../../utils/accessToken");
+const aadUser_1 = require("../../../../utils/aadUser");
 class TeamsMeetingListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_LIST;
@@ -60,7 +60,7 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
                         requestUrl += args.options.userName;
                     }
                     else if (args.options.email) {
-                        const userId = yield this.getUserId(args.options.email);
+                        const userId = yield aadUser_1.aadUser.getUserIdByEmail(args.options.email);
                         requestUrl += userId;
                     }
                 }
@@ -98,19 +98,6 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
             }
         });
     }
-    getUserId(email) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const options = {
-                email: email,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.id;
-        });
-    }
 }
 _TeamsMeetingListCommand_instances = new WeakSet(), _TeamsMeetingListCommand_initTelemetry = function _TeamsMeetingListCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -36,34 +36,9 @@ class YammerMessageLikeSetCommand extends YammerCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const executeLikeAction = () => __awaiter(this, void 0, void 0, function* () {
-                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) {
-                        yield request_1.default.post(requestOptions);
-                    }
-                    else {
-                        yield request_1.default.delete(requestOptions);
-                    }
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.enable === false) {
                 if (args.options.confirm) {
-                    yield executeLikeAction();
+                    yield this.executeLikeAction(args.options);
                 }
                 else {
                     const messagePrompt = `Are you sure you want to unlike message ${args.options.messageId}?`;
@@ -74,12 +49,38 @@ class YammerMessageLikeSetCommand extends YammerCommand_1.default {
                         message: messagePrompt
                     });
                     if (result.continue) {
-                        yield executeLikeAction();
+                        yield this.executeLikeAction(args.options);
                     }
                 }
             }
             else {
-                yield executeLikeAction();
+                yield this.executeLikeAction(args.options);
+            }
+        });
+    }
+    executeLikeAction(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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) {
+                    yield request_1.default.post(requestOptions);
+                }
+                else {
+                    yield request_1.default.delete(requestOptions);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }

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

@@ -37,7 +37,7 @@ class YammerMessageListCommand extends YammerCommand_1.default {
         __classPrivateFieldGet(this, _YammerMessageListCommand_instances, "m", _YammerMessageListCommand_initValidators).call(this);
     }
     getAllItems(logger, args, messageId) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             let endpoint = `${this.resource}/v1`;
             if (args.options.threadId) {
                 endpoint += `/messages/in_thread/${args.options.threadId}.json`;
@@ -95,31 +95,14 @@ class YammerMessageListCommand extends YammerCommand_1.default {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .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);
-            });
+            const res = yield request_1.default.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)) {
+                yield this.getAllItems(logger, args, this.items[this.items.length - 1].id);
+            }
         });
     }
     commandAction(logger, args) {

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

@@ -35,24 +35,8 @@ class YammerMessageRemoveCommand extends YammerCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeMessage = () => __awaiter(this, void 0, void 0, function* () {
-                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'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeMessage();
+                yield this.removeMessage(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,11 +46,29 @@ class YammerMessageRemoveCommand extends YammerCommand_1.default {
                     message: `Are you sure you want to remove the Yammer message ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeMessage();
+                    yield this.removeMessage(args.options);
                 }
             }
         });
     }
+    removeMessage(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _YammerMessageRemoveCommand_instances = new WeakSet(), _YammerMessageRemoveCommand_initTelemetry = function _YammerMessageRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {