@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.bc15f2b

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

@@ -0,0 +1,170 @@
+"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 _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoUserGetCommand = require("../user/user-get");
+const SpoGroupGetCommand = require("../group/group-get");
+class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebRoleAssignmentRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.WEB_ROLEASSIGNMENT_REMOVE;
+    }
+    get description() {
+        return 'Removes a role assignment from web permissions';
+    }
+    commandAction(logger, args, cb) {
+        const removeRoleAssignment = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
+            }
+            if (args.options.upn) {
+                this.GetUserPrincipalId(args.options)
+                    .then((userPrincipalId) => {
+                    args.options.principalId = userPrincipalId;
+                    this.RemoveRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else if (args.options.groupName) {
+                this.GetGroupPrincipalId(args.options)
+                    .then((groupPrincipalId) => {
+                    args.options.principalId = groupPrincipalId;
+                    this.RemoveRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else {
+                this.RemoveRoleAssignment(logger, args.options, cb);
+            }
+        };
+        if (args.options.confirm) {
+            removeRoleAssignment();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeRoleAssignment();
+                }
+            });
+        }
+    }
+    RemoveRoleAssignment(logger, options, cb) {
+        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'
+        };
+        request_1.default
+            .post(requestOptions)
+            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    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) => {
+            const getGroupOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getGroupOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+    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) => {
+            const getUserOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getUserOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+}
+_SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignmentRemoveCommand_initTelemetry = function _SpoWebRoleAssignmentRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            principalId: typeof args.options.principalId !== 'undefined',
+            upn: typeof args.options.upn !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoWebRoleAssignmentRemoveCommand_initOptions = function _SpoWebRoleAssignmentRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoWebRoleAssignmentRemoveCommand_initValidators = function _SpoWebRoleAssignmentRemoveCommand_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.principalId && isNaN(args.options.principalId)) {
+            return `Specified principalId ${args.options.principalId} is not a number`;
+        }
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either principalId id or upn or groupName`;
+        }
+        if (principalOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least principalId id or upn or groupName`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoWebRoleAssignmentRemoveCommand();
+//# sourceMappingURL=web-roleassignment-remove.js.map

package/dist/m365/spo/commands.js

@@ -128,6 +128,7 @@ exports.default = {
     LISTITEM_RECORD_DECLARE: `${prefix} listitem record declare`,
     LISTITEM_RECORD_UNDECLARE: `${prefix} listitem record undeclare`,
     LISTITEM_REMOVE: `${prefix} listitem remove`,
+    LISTITEM_ROLEASSIGNMENT_REMOVE: `${prefix} listitem roleassignment remove`,
     LISTITEM_ROLEINHERITANCE_BREAK: `${prefix} listitem roleinheritance break`,
     LISTITEM_ROLEINHERITANCE_RESET: `${prefix} listitem roleinheritance reset`,
     LISTITEM_SET: `${prefix} listitem set`,
@@ -270,6 +271,8 @@ exports.default = {
     WEB_LIST: `${prefix} web list`,
     WEB_REINDEX: `${prefix} web reindex`,
     WEB_REMOVE: `${prefix} web remove`,
+    WEB_ROLEASSIGNMENT_REMOVE: `${prefix} web roleassignment remove`,
+    WEB_ROLEASSIGNMENT_ADD: `${prefix} web roleassignment add`,
     WEB_ROLEINHERITANCE_RESET: `${prefix} web roleinheritance reset`,
     WEB_SET: `${prefix} web set`
 };

package/dist/m365/teams/commands/app/app-install.js

@@ -13,7 +13,7 @@ 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 _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators;
+var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_INSTALL;
@@ -107,16 +108,6 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
         if (!utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (!args.options.teamId &&
-            !args.options.userId &&
-            !args.options.userName) {
-            return `Specify either teamId, userId or userName`;
-        }
-        if ((args.options.teamId && args.options.userId) ||
-            (args.options.teamId && args.options.userName) ||
-            (args.options.userId && args.options.userName)) {
-            return `Specify either teamId, userId or userName but not multiple`;
-        }
         if (args.options.teamId &&
             !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -127,6 +118,8 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
         }
         return true;
     }));
+}, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'userId', 'userName']);
 };
 module.exports = new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

package/dist/m365/teams/commands/app/app-update.js

@@ -13,7 +13,7 @@ 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 _TeamsAppUpdateCommand_instances, _TeamsAppUpdateCommand_initTelemetry, _TeamsAppUpdateCommand_initOptions, _TeamsAppUpdateCommand_initValidators;
+var _TeamsAppUpdateCommand_instances, _TeamsAppUpdateCommand_initTelemetry, _TeamsAppUpdateCommand_initOptions, _TeamsAppUpdateCommand_initValidators, _TeamsAppUpdateCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -28,6 +28,7 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_UPDATE;
@@ -97,12 +98,6 @@ _TeamsAppUpdateCommand_instances = new WeakSet(), _TeamsAppUpdateCommand_initTel
     });
 }, _TeamsAppUpdateCommand_initValidators = function _TeamsAppUpdateCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name, but not both';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -115,6 +110,8 @@ _TeamsAppUpdateCommand_instances = new WeakSet(), _TeamsAppUpdateCommand_initTel
         }
         return true;
     }));
+}, _TeamsAppUpdateCommand_initOptionSets = function _TeamsAppUpdateCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsAppUpdateCommand();
 //# sourceMappingURL=app-update.js.map

package/dist/m365/teams/commands/channel/channel-add.js

@@ -13,7 +13,7 @@ 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 _TeamsChannelAddCommand_instances, _TeamsChannelAddCommand_initTelemetry, _TeamsChannelAddCommand_initOptions, _TeamsChannelAddCommand_initValidators;
+var _TeamsChannelAddCommand_instances, _TeamsChannelAddCommand_initTelemetry, _TeamsChannelAddCommand_initOptions, _TeamsChannelAddCommand_initValidators, _TeamsChannelAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_ADD;
@@ -121,12 +122,6 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
     });
 }, _TeamsChannelAddCommand_initValidators = function _TeamsChannelAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -141,6 +136,8 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
         }
         return true;
     }));
+}, _TeamsChannelAddCommand_initOptionSets = function _TeamsChannelAddCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName']);
 };
 module.exports = new TeamsChannelAddCommand();
 //# sourceMappingURL=channel-add.js.map

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

@@ -13,7 +13,7 @@ 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 _TeamsChannelGetCommand_instances, _TeamsChannelGetCommand_initTelemetry, _TeamsChannelGetCommand_initOptions, _TeamsChannelGetCommand_initValidators;
+var _TeamsChannelGetCommand_instances, _TeamsChannelGetCommand_initTelemetry, _TeamsChannelGetCommand_initOptions, _TeamsChannelGetCommand_initValidators, _TeamsChannelGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -28,6 +28,7 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_GET;
@@ -126,35 +127,16 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
     });
 }, _TeamsChannelGetCommand_initValidators = function _TeamsChannelGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary';
-        }
-        if (!args.options.channelId && args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
-        }
-        if (args.options.channelId && !args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
-        }
-        if (args.options.channelId && args.options.channelName && !args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
-        }
-        if (!args.options.channelId && !args.options.channelName && !args.options.primary) {
-            return 'Specify channelId, channelName or primary, one is required';
-        }
         if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
         return true;
     }));
+}, _TeamsChannelGetCommand_initOptionSets = function _TeamsChannelGetCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName', 'primary']);
 };
 module.exports = new TeamsChannelGetCommand();
 //# sourceMappingURL=channel-get.js.map

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

@@ -13,7 +13,7 @@ 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 _TeamsChannelListCommand_instances, _TeamsChannelListCommand_initTelemetry, _TeamsChannelListCommand_initOptions, _TeamsChannelListCommand_initValidators;
+var _TeamsChannelListCommand_instances, _TeamsChannelListCommand_initTelemetry, _TeamsChannelListCommand_initOptions, _TeamsChannelListCommand_initValidators, _TeamsChannelListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const aadGroup_1 = require("../../../../utils/aadGroup");
@@ -26,6 +26,7 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_LIST;
@@ -83,12 +84,6 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
     });
 }, _TeamsChannelListCommand_initValidators = function _TeamsChannelListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -97,6 +92,8 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
         }
         return true;
     }));
+}, _TeamsChannelListCommand_initOptionSets = function _TeamsChannelListCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName']);
 };
 module.exports = new TeamsChannelListCommand();
 //# sourceMappingURL=channel-list.js.map

package/dist/m365/teams/commands/channel/channel-member-list.js

@@ -13,7 +13,7 @@ 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 _TeamsChannelMemberListCommand_instances, _TeamsChannelMemberListCommand_initTelemetry, _TeamsChannelMemberListCommand_initOptions, _TeamsChannelMemberListCommand_initValidators;
+var _TeamsChannelMemberListCommand_instances, _TeamsChannelMemberListCommand_initTelemetry, _TeamsChannelMemberListCommand_initOptions, _TeamsChannelMemberListCommand_initValidators, _TeamsChannelMemberListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -28,6 +28,7 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_MEMBER_LIST;
@@ -127,21 +128,9 @@ _TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberLis
     });
 }, _TeamsChannelMemberListCommand_initValidators = function _TeamsChannelMemberListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName) {
-            return 'Specify either channelId or channelName, but not both';
-        }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName, one is required';
-        }
         if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel ID`;
         }
@@ -152,6 +141,8 @@ _TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberLis
         }
         return true;
     }));
+}, _TeamsChannelMemberListCommand_initOptionSets = function _TeamsChannelMemberListCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName']);
 };
 module.exports = new TeamsChannelMemberListCommand();
 //# sourceMappingURL=channel-member-list.js.map

package/dist/m365/teams/commands/channel/channel-member-set.js

@@ -13,7 +13,7 @@ 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 _TeamsChannelMemberSetCommand_instances, _TeamsChannelMemberSetCommand_initTelemetry, _TeamsChannelMemberSetCommand_initOptions, _TeamsChannelMemberSetCommand_initValidators;
+var _TeamsChannelMemberSetCommand_instances, _TeamsChannelMemberSetCommand_initTelemetry, _TeamsChannelMemberSetCommand_initOptions, _TeamsChannelMemberSetCommand_initValidators, _TeamsChannelMemberSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -29,6 +29,7 @@ class TeamsChannelMemberSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_MEMBER_SET;
@@ -167,32 +168,12 @@ _TeamsChannelMemberSetCommand_instances = new WeakSet(), _TeamsChannelMemberSetC
     });
 }, _TeamsChannelMemberSetCommand_initValidators = function _TeamsChannelMemberSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName) {
-            return 'Specify either channelId or channelName, but not both';
-        }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName, one is required';
-        }
         if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel ID`;
         }
-        if ((args.options.userName && args.options.userId) ||
-            (args.options.userName && args.options.id) ||
-            (args.options.userId && args.options.id)) {
-            return 'Specify either userName, userId or id, but not multiple.';
-        }
-        if (!args.options.userName && !args.options.userId && !args.options.id) {
-            return 'Specify either userName, userId or id, one is required';
-        }
         if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
@@ -201,6 +182,8 @@ _TeamsChannelMemberSetCommand_instances = new WeakSet(), _TeamsChannelMemberSetC
         }
         return true;
     }));
+}, _TeamsChannelMemberSetCommand_initOptionSets = function _TeamsChannelMemberSetCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['userName', 'userId', 'id']);
 };
 module.exports = new TeamsChannelMemberSetCommand();
 //# sourceMappingURL=channel-member-set.js.map

package/dist/m365/teams/commands/channel/channel-remove.js

@@ -13,7 +13,7 @@ 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 _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators;
+var _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators, _TeamsChannelRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_REMOVE;
@@ -117,12 +118,6 @@ _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand
     });
 }, _TeamsChannelRemoveCommand_initValidators = function _TeamsChannelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.channelId && args.options.channelName) {
-            return 'Specify channelId or channelName but not both';
-        }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName';
-        }
         if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel Id`;
         }
@@ -131,6 +126,8 @@ _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand
         }
         return true;
     }));
+}, _TeamsChannelRemoveCommand_initOptionSets = function _TeamsChannelRemoveCommand_initOptionSets() {
+    this.optionSets.push(['channelId', 'channelName']);
 };
 module.exports = new TeamsChannelRemoveCommand();
 //# sourceMappingURL=channel-remove.js.map

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

@@ -13,7 +13,7 @@ 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 _TeamsChatGetCommand_instances, _TeamsChatGetCommand_initTelemetry, _TeamsChatGetCommand_initOptions, _TeamsChatGetCommand_initValidators;
+var _TeamsChatGetCommand_instances, _TeamsChatGetCommand_initTelemetry, _TeamsChatGetCommand_initOptions, _TeamsChatGetCommand_initValidators, _TeamsChatGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Auth_1 = require("../../../../Auth");
@@ -30,6 +30,7 @@ class TeamsChatGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHAT_GET;
@@ -120,22 +121,6 @@ _TeamsChatGetCommand_instances = new WeakSet(), _TeamsChatGetCommand_initTelemet
     });
 }, _TeamsChatGetCommand_initValidators = function _TeamsChatGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.participants && !args.options.name) {
-            return 'Specify id or participants or name, one is required.';
-        }
-        let nrOfMutuallyExclusiveOptionsInUse = 0;
-        if (args.options.id) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.participants) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.name) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (nrOfMutuallyExclusiveOptionsInUse > 1) {
-            return 'Specify either id or participants or name, but not multiple.';
-        }
         if (args.options.id && !validation_1.validation.isValidTeamsChatId(args.options.id)) {
             return `${args.options.id} is not a valid Teams ChatId.`;
         }
@@ -147,6 +132,8 @@ _TeamsChatGetCommand_instances = new WeakSet(), _TeamsChatGetCommand_initTelemet
         }
         return true;
     }));
+}, _TeamsChatGetCommand_initOptionSets = function _TeamsChatGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'participants', 'name']);
 };
 module.exports = new TeamsChatGetCommand();
 //# sourceMappingURL=chat-get.js.map

package/dist/m365/teams/commands/chat/chat-message-send.js

@@ -13,7 +13,7 @@ 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 _TeamsChatMessageSendCommand_instances, _TeamsChatMessageSendCommand_initTelemetry, _TeamsChatMessageSendCommand_initOptions, _TeamsChatMessageSendCommand_initValidators;
+var _TeamsChatMessageSendCommand_instances, _TeamsChatMessageSendCommand_initTelemetry, _TeamsChatMessageSendCommand_initOptions, _TeamsChatMessageSendCommand_initValidators, _TeamsChatMessageSendCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Auth_1 = require("../../../../Auth");
@@ -29,6 +29,7 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHAT_MESSAGE_SEND;
@@ -165,22 +166,6 @@ _TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCom
     });
 }, _TeamsChatMessageSendCommand_initValidators = function _TeamsChatMessageSendCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.chatId && !args.options.userEmails && !args.options.chatName) {
-            return 'Specify chatId or userEmails or chatName, one is required.';
-        }
-        let nrOfMutuallyExclusiveOptionsInUse = 0;
-        if (args.options.chatId) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.userEmails) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.chatName) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (nrOfMutuallyExclusiveOptionsInUse > 1) {
-            return 'Specify either chatId or userEmails or chatName, but not multiple.';
-        }
         if (args.options.chatId && !utils_1.validation.isValidTeamsChatId(args.options.chatId)) {
             return `${args.options.chatId} is not a valid Teams ChatId.`;
         }
@@ -192,6 +177,8 @@ _TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCom
         }
         return true;
     }));
+}, _TeamsChatMessageSendCommand_initOptionSets = function _TeamsChatMessageSendCommand_initOptionSets() {
+    this.optionSets.push(['chatId', 'userEmails', 'chatName']);
 };
 module.exports = new TeamsChatMessageSendCommand();
 //# sourceMappingURL=chat-message-send.js.map