@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7a78ebe

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

@@ -13,10 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _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");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -28,6 +29,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;
@@ -35,37 +37,31 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     get description() {
         return 'Lists members of the specified Microsoft Teams team channel';
     }
-    alias() {
-        return [commands_1.default.CONVERSATIONMEMBER_LIST];
-    }
     defaultProperties() {
         return ['id', 'roles', 'displayName', 'userId', 'email'];
     }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_LIST, commands_1.default.CHANNEL_MEMBER_LIST);
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            this.teamId = teamId;
-            return this.getChannelId(args);
-        })
-            .then((channelId) => {
-            const endpoint = `${this.resource}/v1.0/teams/${this.teamId}/channels/${channelId}/members`;
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((memberships) => {
-            if (args.options.role) {
-                if (args.options.role === 'member') {
-                    // Members have no role value
-                    memberships = memberships.filter(i => i.roles.length === 0);
-                }
-                else {
-                    memberships = memberships.filter(i => i.roles.indexOf(args.options.role) !== -1);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.teamId = yield this.getTeamId(args);
+                const channelId = yield this.getChannelId(args);
+                const endpoint = `${this.resource}/v1.0/teams/${this.teamId}/channels/${channelId}/members`;
+                let memberships = yield odata_1.odata.getAllItems(endpoint);
+                if (args.options.role) {
+                    if (args.options.role === 'member') {
+                        // Members have no role value
+                        memberships = memberships.filter(i => i.roles.length === 0);
+                    }
+                    else {
+                        memberships = memberships.filter(i => i.roles.indexOf(args.options.role) !== -1);
+                    }
                 }
+                logger.log(memberships);
             }
-            logger.log(memberships);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTeamId(args) {
         if (args.options.teamId) {
@@ -127,22 +123,10 @@ _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)) {
+        if (args.options.teamId && !validation_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)) {
+        if (args.options.channelId && !validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel ID`;
         }
         if (args.options.role) {
@@ -152,6 +136,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-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelMemberRemoveCommand_instances, _TeamsChannelMemberRemoveCommand_initTelemetry, _TeamsChannelMemberRemoveCommand_initOptions, _TeamsChannelMemberRemoveCommand_initValidators, _TeamsChannelMemberRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -36,39 +36,36 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
         return commands_1.default.CHANNEL_MEMBER_REMOVE;
     }
     get description() {
-        return 'Updates the role of the specified member in the specified Microsoft Teams private team channel';
+        return 'Remove the specified member from the specified Microsoft Teams private or shared team channel';
     }
-    alias() {
-        return [commands_1.default.CONVERSATIONMEMBER_REMOVE];
-    }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_REMOVE, commands_1.default.CHANNEL_MEMBER_REMOVE);
-        const removeMember = () => {
-            this
-                .removeMemberFromChannel(args)
-                .then(cb, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeMember();
-        }
-        else {
-            const userName = args.options.userName || args.options.userId || args.options.id;
-            const teamName = args.options.teamName || args.options.teamId;
-            const channelName = args.options.channelName || args.options.channelId;
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the member ${userName} from the channel ${channelName} in team ${teamName}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeMember = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.removeMemberFromChannel(args);
                 }
-                else {
-                    removeMember();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeMember();
+            }
+            else {
+                const userName = args.options.userName || args.options.userId || args.options.id;
+                const teamName = args.options.teamName || args.options.teamId;
+                const channelName = args.options.channelName || args.options.channelId;
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the member ${userName} from the channel ${channelName} in team ${teamName}?`
+                });
+                if (result.continue) {
+                    yield removeMember();
+                }
+            }
+        });
     }
     removeMemberFromChannel(args) {
         return this
@@ -192,13 +189,13 @@ _TeamsChannelMemberRemoveCommand_instances = new WeakSet(), _TeamsChannelMemberR
     });
 }, _TeamsChannelMemberRemoveCommand_initValidators = function _TeamsChannelMemberRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (args.options.channelId && !validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel ID`;
         }
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;

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

@@ -13,10 +13,10 @@ 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");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -29,43 +29,39 @@ 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;
     }
     get description() {
-        return 'Updates the role of the specified member in the specified Microsoft Teams private team channel';
+        return 'Updates the role of the specified member in the specified Microsoft Teams private or shared team channel';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            this.teamId = teamId;
-            return this.getChannelId(args);
-        })
-            .then((channelId) => {
-            this.channelId = channelId;
-            return this.getMemberId(args);
-        })
-            .then((memberId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${this.teamId}/channels/${this.channelId}/members/${memberId}`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none',
-                    'Prefer': 'return=representation'
-                },
-                responseType: 'json',
-                data: {
-                    '@odata.type': '#microsoft.graph.aadUserConversationMember',
-                    roles: [args.options.role]
-                }
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then((member) => {
-            logger.log(member);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.teamId = yield this.getTeamId(args);
+                this.channelId = yield this.getChannelId(args);
+                const memberId = yield this.getMemberId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/teams/${this.teamId}/channels/${this.channelId}/members/${memberId}`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none',
+                        'Prefer': 'return=representation'
+                    },
+                    responseType: 'json',
+                    data: {
+                        '@odata.type': '#microsoft.graph.aadUserConversationMember',
+                        roles: [args.options.role]
+                    }
+                };
+                const member = yield request_1.default.patch(requestOptions);
+                logger.log(member);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTeamId(args) {
         if (args.options.teamId) {
@@ -167,33 +163,13 @@ _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)) {
+        if (args.options.teamId && !validation_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)) {
+        if (args.options.channelId && !validation_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)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         if (['owner', 'member'].indexOf(args.options.role) === -1) {
@@ -201,6 +177,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,11 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _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 Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelRemoveCommand extends GraphCommand_1.default {
@@ -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;
@@ -34,82 +35,79 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the specified channel in the Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const removeChannel = () => {
-            if (args.options.channelName) {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                request_1.default
-                    .get(requestOptions)
-                    .then((res) => {
-                    const channelItem = res.value[0];
-                    if (!channelItem) {
-                        return Promise.reject(`The specified channel does not exist in the Microsoft Teams team`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeChannel = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (args.options.name) {
+                        const getRequestOptions = {
+                            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
+                            headers: {
+                                accept: 'application/json;odata.metadata=none'
+                            },
+                            responseType: 'json'
+                        };
+                        const res = yield request_1.default.get(getRequestOptions);
+                        const channelItem = res.value[0];
+                        if (!channelItem) {
+                            return Promise.reject(`The specified channel does not exist in the Microsoft Teams team`);
+                        }
+                        const channelId = res.value[0].id;
+                        const deleteRequestOptions = {
+                            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(channelId)}`,
+                            headers: {
+                                accept: 'application/json;odata.metadata=none'
+                            },
+                            responseType: 'json'
+                        };
+                        yield request_1.default.delete(deleteRequestOptions);
+                    }
+                    else {
+                        const requestOptions = {
+                            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(args.options.id)}`,
+                            headers: {
+                                accept: 'application/json;odata.metadata=none'
+                            },
+                            responseType: 'json'
+                        };
+                        yield request_1.default.delete(requestOptions);
                     }
-                    const channelId = res.value[0].id;
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(channelId)}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    return request_1.default.delete(requestOptions);
-                })
-                    .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-            if (args.options.channelId) {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(args.options.channelId)}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                request_1.default
-                    .delete(requestOptions)
-                    .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-        };
-        if (args.options.confirm) {
-            removeChannel();
-        }
-        else {
-            const channelName = args.options.channelName ? args.options.channelName : args.options.channelId;
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the channel ${channelName} from team ${args.options.teamId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
                 }
-                else {
-                    removeChannel();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeChannel();
+            }
+            else {
+                const channelName = args.options.name ? args.options.name : args.options.id;
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the channel ${channelName} from team ${args.options.teamId}?`
+                });
+                if (result.continue) {
+                    yield removeChannel();
+                }
+            }
+        });
     }
 }
 _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand_initTelemetry = function _TeamsChannelRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            channelId: typeof args.options.channelId !== 'undefined',
-            channelName: typeof args.options.channelName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _TeamsChannelRemoveCommand_initOptions = function _TeamsChannelRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-c, --channelId [channelId]'
+        option: '-c, --id [id]'
     }, {
-        option: '-n, --channelName [channelName]'
+        option: '-n, --name [name]'
     }, {
         option: '-i, --teamId <teamId>'
     }, {
@@ -117,20 +115,16 @@ _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`;
+        if (args.options.id && !validation_1.validation.isValidTeamsChannelId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams channel id`;
         }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsChannelRemoveCommand_initOptionSets = function _TeamsChannelRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsChannelRemoveCommand();
 //# sourceMappingURL=channel-remove.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelSetCommand_instances, _TeamsChannelSetCommand_initTelemetry, _TeamsChannelSetCommand_initOptions, _TeamsChannelSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelSetCommand extends GraphCommand_1.default {
@@ -33,39 +33,42 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates properties of the specified channel in the given Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            const channelItem = res.value[0];
-            if (!channelItem) {
-                return Promise.reject(`The specified channel does not exist in the Microsoft Teams team`);
-            }
-            const channelId = res.value[0].id;
-            const data = this.mapRequestBody(args.options);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${channelId}`,
+                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
                 headers: {
-                    'accept': 'application/json;odata.metadata=none'
+                    accept: 'application/json;odata.metadata=none'
                 },
-                responseType: 'json',
-                data: data
+                responseType: 'json'
             };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                const channelItem = res.value[0];
+                if (!channelItem) {
+                    throw `The specified channel does not exist in the Microsoft Teams team`;
+                }
+                const channelId = res.value[0].id;
+                const data = this.mapRequestBody(args.options);
+                const requestOptionsPatch = {
+                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${channelId}`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: data
+                };
+                yield request_1.default.patch(requestOptionsPatch);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     mapRequestBody(options) {
         const requestBody = {};
-        if (options.newChannelName) {
-            requestBody.displayName = options.newChannelName;
+        if (options.newName) {
+            requestBody.displayName = options.newName;
         }
         if (options.description) {
             requestBody.description = options.description;
@@ -76,7 +79,7 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
 _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initTelemetry = function _TeamsChannelSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            newChannelName: typeof args.options.newChannelName !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
             description: typeof args.options.description !== 'undefined'
         });
     });
@@ -84,18 +87,18 @@ _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initT
     this.options.unshift({
         option: '-i, --teamId <teamId>'
     }, {
-        option: '--channelName <channelName>'
+        option: '--name <name>'
     }, {
-        option: '--newChannelName [newChannelName]'
+        option: '--newName [newName]'
     }, {
         option: '--description [description]'
     });
 }, _TeamsChannelSetCommand_initValidators = function _TeamsChannelSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelName.toLowerCase() === "general") {
+        if (args.options.name.toLowerCase() === "general") {
             return 'General channel cannot be updated';
         }
         return true;