@pnp/cli-microsoft365 6.0.0-beta.c5ce305 → 6.0.0-beta.c63e3b2

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

@@ -17,6 +17,7 @@ var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _T
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -43,10 +44,10 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
                 yield this.validateUser(args, logger);
                 let url = `${this.resource}/v1.0`;
                 if (args.options.teamId) {
-                    url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
+                    url += `/teams/${formatting_1.formatting.encodeQueryParameter(args.options.teamId)}/installedApps`;
                 }
                 else {
-                    url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+                    url += `/users/${formatting_1.formatting.encodeQueryParameter(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
                 }
                 const requestOptions = {
                     url: url,

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

@@ -20,6 +20,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsAppListCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -56,7 +57,7 @@ class TeamsAppListCommand extends GraphCommand_1.default {
                 this
                     .getTeamId(args)
                     .then((teamId) => {
-                    let endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/installedApps?$expand=teamsApp`;
+                    let endpoint = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/installedApps?$expand=teamsApp`;
                     if (!args.options.all) {
                         endpoint += `&$filter=teamsApp/distributionMethod eq 'organization'`;
                     }

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

@@ -35,23 +35,22 @@ class TeamsAppPublishCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const fullPath = path.resolve(args.options.filePath);
-            if (this.verbose) {
-                logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
-                headers: {
-                    "content-type": "application/zip",
-                    accept: 'application/json;odata.metadata=none'
-                },
-                data: fs.readFileSync(fullPath)
-            };
             try {
-                const res = yield request_1.default.post(requestOptions);
-                if (res && res.id) {
-                    logger.log(res.id);
+                const fullPath = path.resolve(args.options.filePath);
+                if (this.verbose) {
+                    logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
                 }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
+                    headers: {
+                        'content-type': 'application/zip',
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: fs.readFileSync(fullPath)
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -64,7 +65,7 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.id);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

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

@@ -15,11 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsCacheRemoveCommand_instances, _TeamsCacheRemoveCommand_initTelemetry, _TeamsCacheRemoveCommand_initOptions, _TeamsCacheRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const os_1 = require("os");
 const util = require("util");
 const Cli_1 = require("../../../../cli/Cli");
-const GraphCommand_1 = require("../../../base/GraphCommand");
+const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
-class TeamsCacheRemoveCommand extends GraphCommand_1.default {
+class TeamsCacheRemoveCommand extends AnonymousCommand_1.default {
     constructor() {
         super();
         _TeamsCacheRemoveCommand_instances.add(this);
@@ -63,19 +65,48 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
     clearTeamsCache(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.killRunningProcess(logger);
-                yield this.removeCacheFiles(logger);
+                const filePath = this.getTeamsCacheFolderPath(logger);
+                const folderExists = yield this.checkIfCacheFolderExists(filePath, logger);
+                if (folderExists) {
+                    yield this.killRunningProcess(logger);
+                    yield this.removeCacheFiles(filePath, logger);
+                    logger.logToStderr('Teams cache cleared!');
+                }
+                else {
+                    logger.logToStderr('Cache folder does not exist. Nothing to remove.');
+                }
             }
             catch (e) {
                 throw e.message;
             }
-            logger.logToStderr('Teams cache cleared!');
         });
     }
+    getTeamsCacheFolderPath(logger) {
+        const platform = process.platform;
+        if (this.verbose) {
+            logger.logToStderr(`Getting path of Teams cache folder for platform ${platform}...`);
+        }
+        let filePath = '';
+        switch (platform) {
+            case 'win32':
+                filePath = `${process.env.APPDATA}\\Microsoft\\Teams`;
+                break;
+            case 'darwin':
+                filePath = `${os_1.homedir}/Library/Application Support/Microsoft/Teams`;
+                break;
+        }
+        return filePath;
+    }
+    checkIfCacheFolderExists(filePath, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Checking if Teams cache folder exists at ${filePath}...`);
+        }
+        return fs.existsSync(filePath);
+    }
     killRunningProcess(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr('Stop Teams client');
+                logger.logToStderr('Stopping Teams client...');
             }
             const platform = process.platform;
             let cmd = '';
@@ -112,19 +143,19 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
             }
         });
     }
-    removeCacheFiles(logger) {
+    removeCacheFiles(filePath, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr('Clear Teams cached files');
+                logger.logToStderr('Removing Teams cache files...');
             }
             const platform = process.platform;
             let cmd = '';
             switch (platform) {
                 case 'win32':
-                    cmd = 'cd %userprofile% && rmdir /s /q AppData\\Roaming\\Microsoft\\Teams';
+                    cmd = `rmdir /s /q "${filePath}"`;
                     break;
                 case 'darwin':
-                    cmd = 'rm -r ~/Library/Application\\ Support/Microsoft/Teams';
+                    cmd = `rm -r "${filePath}"`;
                     break;
             }
             if (this.debug) {

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

@@ -73,8 +73,8 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
             },
             responseType: 'json'
         };
-        if (args.options.type === 'private') {
-            // Private channels must have at least 1 owner
+        if (args.options.type === 'private' || args.options.type === 'shared') {
+            // Private and Shared channels must have at least 1 owner
             requestOptions.data.members = [
                 {
                     '@odata.type': '#microsoft.graph.aadUserConversationMember',
@@ -119,7 +119,7 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
         option: '-d, --description [description]'
     }, {
         option: '--type [type]',
-        autocomplete: ['standard', 'private']
+        autocomplete: ['standard', 'private', 'shared']
     }, {
         option: '--owner [owner]'
     });
@@ -128,14 +128,14 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
         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) === -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) === -1) {
+            return `${args.options.type} is not a valid type value. Allowed values standard|private|shared.`;
         }
-        if (args.options.type === 'private' && !args.options.owner) {
-            return 'Specify owner when creating a private channel.';
+        if ((args.options.type === 'private' || args.options.type === 'shared') && !args.options.owner) {
+            return `Specify owner when creating a ${args.options.type} channel.`;
         }
-        if (args.options.type !== 'private' && args.options.owner) {
-            return 'Specify owner only when creating a private channel.';
+        if ((args.options.type !== 'private' && args.options.type !== 'shared') && args.options.owner) {
+            return `Specify owner only when creating a private or shared channel.`;
         }
         return true;
     }));

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

@@ -20,6 +20,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelGetCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -57,7 +58,7 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
             return Promise.resolve('');
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -80,10 +81,10 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
                 const channelId = yield this.getChannelId(args);
                 let url = '';
                 if (args.options.primary) {
-                    url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/primaryChannel`;
+                    url = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/primaryChannel`;
                 }
                 else {
-                    url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`;
+                    url = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels/${formatting_1.formatting.encodeQueryParameter(channelId)}`;
                 }
                 const requestOptions = {
                     url: url,
@@ -113,11 +114,11 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
     });
 }, _TeamsChannelGetCommand_initOptions = function _TeamsChannelGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --teamId [teamId]'
+        option: '--teamId [teamId]'
     }, {
         option: '--teamName [teamName]'
     }, {
-        option: '-c, --id [id]'
+        option: '-i, --id [id]'
     }, {
         option: '--name [name]'
     }, {

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

@@ -21,6 +21,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -42,7 +43,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
                 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 endpoint = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/channels/${formatting_1.formatting.encodeQueryParameter(channelId)}/members`;
                 const roles = args.options.owner ? ["owner"] : [];
                 const tasks = [];
                 for (const userId of userIds) {
@@ -89,7 +90,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.channelId);
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -121,7 +122,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     }
     getSingleUser(userDisplayName) {
         const userRequestOptions = {
-            url: `${this.resource}/v1.0/users?$filter=displayName eq '${encodeURIComponent(userDisplayName)}'`,
+            url: `${this.resource}/v1.0/users?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(userDisplayName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

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

@@ -21,6 +21,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -81,7 +82,7 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.channelId);
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

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

@@ -21,6 +21,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -107,7 +108,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.channelId);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

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

@@ -20,6 +20,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberSetCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -81,7 +82,7 @@ class TeamsChannelMemberSetCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.channelId);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

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

@@ -18,12 +18,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelRemoveCommand extends GraphCommand_1.default {
     constructor() {
         super();
         _TeamsChannelRemoveCommand_instances.add(this);
+        this.teamId = "";
         __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);
@@ -39,39 +42,16 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
         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);
-                    }
+                    this.teamId = yield this.getTeamId(args);
+                    const channelId = yield this.getChannelId(args);
+                    const requestOptionsDelete = {
+                        url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels/${formatting_1.formatting.encodeQueryParameter(channelId)}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptionsDelete);
                 }
                 catch (err) {
                     this.handleRejectedODataJsonPromise(err);
@@ -81,12 +61,12 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
                 yield removeChannel();
             }
             else {
-                const channelName = args.options.name ? args.options.name : args.options.id;
+                const channel = 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}?`
+                    message: `Are you sure you want to remove the channel ${channel} from team ${args.options.teamId || args.options.teamName}?`
                 });
                 if (result.continue) {
                     yield removeChannel();
@@ -94,22 +74,60 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
             }
         });
     }
+    getTeamId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.teamId) {
+                return args.options.teamId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.teamName);
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
+                throw 'The specified team does not exist';
+            }
+            else {
+                return group.id;
+            }
+        });
+    }
+    getChannelId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const channelRequestOptions = {
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(channelRequestOptions);
+            const channelItem = res.value[0];
+            if (!channelItem) {
+                throw `The specified channel does not exist in this Microsoft Teams team`;
+            }
+            return channelItem.id;
+        });
+    }
 }
 _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand_initTelemetry = function _TeamsChannelRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _TeamsChannelRemoveCommand_initOptions = function _TeamsChannelRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-c, --id [id]'
+        option: '--teamId [teamId]'
     }, {
-        option: '-n, --name [name]'
+        option: '--teamName [teamName]'
+    }, {
+        option: '-i, --id [id]'
     }, {
-        option: '-i, --teamId <teamId>'
+        option: '-n, --name [name]'
     }, {
         option: '--confirm'
     });
@@ -124,7 +142,7 @@ _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand
         return true;
     }));
 }, _TeamsChannelRemoveCommand_initOptionSets = function _TeamsChannelRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push(['id', 'name'], ['teamId', 'teamName']);
 };
 module.exports = new TeamsChannelRemoveCommand();
 //# sourceMappingURL=channel-remove.js.map