@pnp/cli-microsoft365 6.0.0-beta.3a40034 → 6.0.0-beta.3bf0c3c

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

@@ -0,0 +1,100 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoWebRoleInheritanceBreakCommand_instances, _SpoWebRoleInheritanceBreakCommand_initTelemetry, _SpoWebRoleInheritanceBreakCommand_initOptions, _SpoWebRoleInheritanceBreakCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+class SpoWebRoleInheritanceBreakCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebRoleInheritanceBreakCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.WEB_ROLEINHERITANCE_BREAK;
+    }
+    get description() {
+        return 'Break role inheritance of subsite';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Break role inheritance of subsite with URL ${args.options.webUrl}...`);
+            }
+            const breakroleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/breakroleinheritance(${!args.options.clearExistingPermissions})`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield breakroleInheritance();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}`
+                });
+                if (result.continue) {
+                    yield breakroleInheritance();
+                }
+            }
+        });
+    }
+}
+_SpoWebRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoWebRoleInheritanceBreakCommand_initTelemetry = function _SpoWebRoleInheritanceBreakCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            clearExistingPermissions: !!args.options.clearExistingPermissions,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoWebRoleInheritanceBreakCommand_initOptions = function _SpoWebRoleInheritanceBreakCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-c, --clearExistingPermissions'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoWebRoleInheritanceBreakCommand_initValidators = function _SpoWebRoleInheritanceBreakCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoWebRoleInheritanceBreakCommand();
+//# sourceMappingURL=web-roleinheritance-break.js.map

package/dist/m365/spo/commands.js

@@ -62,6 +62,11 @@ exports.default = {
     FILE_ROLEINHERITANCE_BREAK: `${prefix} file roleinheritance break`,
     FILE_ROLEINHERITANCE_RESET: `${prefix} file roleinheritance reset`,
     FILE_SHARINGINFO_GET: `${prefix} file sharinginfo get`,
+    FILE_VERSION_CLEAR: `${prefix} file version clear`,
+    FILE_VERSION_GET: `${prefix} file version get`,
+    FILE_VERSION_LIST: `${prefix} file version list`,
+    FILE_VERSION_REMOVE: `${prefix} file version remove`,
+    FILE_VERSION_RESTORE: `${prefix} file version restore`,
     FOLDER_ADD: `${prefix} folder add`,
     FOLDER_COPY: `${prefix} folder copy`,
     FOLDER_GET: `${prefix} folder get`,
@@ -70,6 +75,7 @@ exports.default = {
     FOLDER_REMOVE: `${prefix} folder remove`,
     FOLDER_RENAME: `${prefix} folder rename`,
     FOLDER_ROLEASSIGNMENT_REMOVE: `${prefix} folder roleassignment remove`,
+    FOLDER_ROLEASSIGNMENT_ADD: `${prefix} folder roleassignment add`,
     FOLDER_ROLEINHERITANCE_BREAK: `${prefix} folder roleinheritance break`,
     FOLDER_ROLEINHERITANCE_RESET: `${prefix} folder roleinheritance reset`,
     GET: `${prefix} get`,
@@ -95,7 +101,6 @@ exports.default = {
     HUBSITE_RIGHTS_GRANT: `${prefix} hubsite rights grant`,
     HUBSITE_RIGHTS_REVOKE: `${prefix} hubsite rights revoke`,
     HUBSITE_SET: `${prefix} hubsite set`,
-    HUBSITE_THEME_SYNC: `${prefix} hubsite theme sync`,
     HUBSITE_UNREGISTER: `${prefix} hubsite unregister`,
     KNOWLEDGEHUB_GET: `${prefix} knowledgehub get`,
     KNOWLEDGEHUB_REMOVE: `${prefix} knowledgehub remove`,
@@ -137,6 +142,7 @@ exports.default = {
     LISTITEM_RECORD_DECLARE: `${prefix} listitem record declare`,
     LISTITEM_RECORD_UNDECLARE: `${prefix} listitem record undeclare`,
     LISTITEM_REMOVE: `${prefix} listitem remove`,
+    LISTITEM_ROLEASSIGNMENT_ADD: `${prefix} listitem roleassignment add`,
     LISTITEM_ROLEASSIGNMENT_REMOVE: `${prefix} listitem roleassignment remove`,
     LISTITEM_ROLEINHERITANCE_BREAK: `${prefix} listitem roleinheritance break`,
     LISTITEM_ROLEINHERITANCE_RESET: `${prefix} listitem roleinheritance reset`,
@@ -207,6 +213,9 @@ exports.default = {
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,
     SITE_GROUPIFY: `${prefix} site groupify`,
+    SITE_HUBSITE_CONNECT: `${prefix} site hubsite connect`,
+    SITE_HUBSITE_DISCONNECT: `${prefix} site hubsite disconnect`,
+    SITE_HUBSITE_THEME_SYNC: `${prefix} site hubsite theme sync`,
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
@@ -280,6 +289,7 @@ exports.default = {
     WEB_REMOVE: `${prefix} web remove`,
     WEB_ROLEASSIGNMENT_REMOVE: `${prefix} web roleassignment remove`,
     WEB_ROLEASSIGNMENT_ADD: `${prefix} web roleassignment add`,
+    WEB_ROLEINHERITANCE_BREAK: `${prefix} web roleinheritance break`,
     WEB_ROLEINHERITANCE_RESET: `${prefix} web roleinheritance reset`,
     WEB_SET: `${prefix} web set`
 };

package/dist/m365/teams/commands/Meeting.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=Meeting.js.map

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/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