@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.005c47a

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelListCommand_instances, _TeamsChannelListCommand_initTelemetry, _TeamsChannelListCommand_initOptions, _TeamsChannelListCommand_initValidators, _TeamsChannelListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-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");
@@ -50,20 +51,21 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            let endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
-            if (args.options.type) {
-                endpoint += `?$filter=membershipType eq '${args.options.type}'`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const teamId = yield this.getTeamId(args);
+                let endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
+                if (args.options.type) {
+                    endpoint += `?$filter=membershipType eq '${args.options.type}'`;
+                }
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                logger.log(items);
             }
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((items) => {
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_initTelemetry = function _TeamsChannelListCommand_initTelemetry() {
@@ -80,15 +82,15 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
         option: '--teamName [teamName]'
     }, {
         option: '--type [type]',
-        autocomplete: ['standard', 'private']
+        autocomplete: ['standard', 'private', 'shared']
     });
 }, _TeamsChannelListCommand_initValidators = function _TeamsChannelListCommand_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.type && ['standard', 'private'].indexOf(args.options.type.toLowerCase()) === -1) {
-            return `${args.options.type} is not a valid type value. Allowed values standard|private`;
+        if (args.options.type && ['standard', 'private', 'shared'].indexOf(args.options.type.toLowerCase()) === -1) {
+            return `${args.options.type} is not a valid type value. Allowed values standard|private|shared`;
         }
         return true;
     }));

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

@@ -17,7 +17,7 @@ var _TeamsChannelMemberAddCommand_instances, _TeamsChannelMemberAddCommand_initT
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 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");
@@ -34,35 +34,30 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
         return commands_1.default.CHANNEL_MEMBER_ADD;
     }
     get description() {
-        return 'Adds a conversation member in a private channel.';
+        return 'Adds a specified member in the specified Microsoft Teams private or shared team channel';
     }
     alias() {
         return [commands_1.default.CONVERSATIONMEMBER_ADD];
     }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_ADD, commands_1.default.CHANNEL_MEMBER_ADD);
-        let teamId = '';
-        let channelId = '';
-        this
-            .getTeamId(args)
-            .then((_teamId) => {
-            teamId = _teamId;
-            return this.getChannelId(_teamId, args);
-        })
-            .then((_channelId) => {
-            channelId = _channelId;
-            return this.getUserId(args);
-        })
-            .then((userIds) => {
-            const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/channels/${encodeURIComponent(channelId)}/members`;
-            const roles = args.options.owner ? ["owner"] : [];
-            const tasks = [];
-            for (const userId of userIds) {
-                tasks.push(this.addUser(userId, endpoint, roles));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_ADD, commands_1.default.CHANNEL_MEMBER_ADD);
+            try {
+                const teamId = yield this.getTeamId(args);
+                const channelId = yield this.getChannelId(teamId, args);
+                const userIds = yield this.getUserId(args);
+                const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/channels/${encodeURIComponent(channelId)}/members`;
+                const roles = args.options.owner ? ["owner"] : [];
+                const tasks = [];
+                for (const userId of userIds) {
+                    tasks.push(this.addUser(userId, endpoint, roles));
+                }
+                yield Promise.all(tasks);
             }
-            return Promise.all(tasks);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     addUser(userId, endpoint, roles) {
         const requestOptions = {
@@ -180,10 +175,10 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
     });
 }, _TeamsChannelMemberAddCommand_initValidators = function _TeamsChannelMemberAddCommand_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 ChannelId`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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");
@@ -42,31 +43,29 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     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* () {
+            this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_LIST, commands_1.default.CHANNEL_MEMBER_LIST);
+            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);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(memberships);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getTeamId(args) {
         if (args.options.teamId) {
@@ -128,10 +127,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 && !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.role) {

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,40 @@ 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* () {
+            this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_REMOVE, commands_1.default.CHANNEL_MEMBER_REMOVE);
+            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 +193,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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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");
@@ -35,38 +35,33 @@ class TeamsChannelMemberSetCommand extends GraphCommand_1.default {
         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) {
@@ -168,13 +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 && !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`;
         }
         if (['owner', 'member'].indexOf(args.options.role) === -1) {

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 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 {
@@ -35,67 +35,64 @@ 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.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'
+                        };
+                        const res = yield request_1.default.get(requestOptions);
+                        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 requestOptionsDelete = {
+                            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(requestOptionsDelete);
+                    }
+                    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'
+                        };
+                        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.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 channel ${channelName} from team ${args.options.teamId}?`
+                });
+                if (result.continue) {
+                    yield removeChannel();
+                }
+            }
+        });
     }
 }
 _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand_initTelemetry = function _TeamsChannelRemoveCommand_initTelemetry() {
@@ -118,10 +115,10 @@ _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 && !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.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;

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,34 +33,37 @@ 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.channelName)}'`,
                 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 = {};
@@ -92,7 +95,7 @@ _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initT
     });
 }, _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") {