@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

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();
@@ -50,14 +51,14 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         });
     }
     getChannelId(args) {
-        if (args.options.channelId) {
-            return Promise.resolve(args.options.channelId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         if (args.options.primary) {
             return Promise.resolve('');
         }
         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.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,
@@ -106,20 +107,20 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
         Object.assign(this.telemetryProperties, {
             teamId: typeof args.options.teamId !== 'undefined',
             teamName: typeof args.options.teamName !== 'undefined',
-            channelId: typeof args.options.channelId !== 'undefined',
-            channelName: typeof args.options.channelName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             primary: (!(!args.options.primary)).toString()
         });
     });
 }, _TeamsChannelGetCommand_initOptions = function _TeamsChannelGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --teamId [teamId]'
+        option: '--teamId [teamId]'
     }, {
         option: '--teamName [teamName]'
     }, {
-        option: '-c, --channelId [channelId]'
+        option: '-i, --id [id]'
     }, {
-        option: '--channelName [channelName]'
+        option: '--name [name]'
     }, {
         option: '--primary'
     });
@@ -128,13 +129,13 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
         if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && !validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams ChannelId`;
+        if (args.options.id && !validation_1.validation.isValidTeamsChannelId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams channel id`;
         }
         return true;
     }));
 }, _TeamsChannelGetCommand_initOptionSets = function _TeamsChannelGetCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName', 'primary']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['id', 'name', 'primary'] });
 };
 module.exports = new TeamsChannelGetCommand();
 //# sourceMappingURL=channel-get.js.map

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

@@ -95,7 +95,7 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
         return true;
     }));
 }, _TeamsChannelListCommand_initOptionSets = function _TeamsChannelListCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] });
 };
 module.exports = new TeamsChannelListCommand();
 //# sourceMappingURL=channel-list.js.map

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();
@@ -36,17 +37,13 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     get description() {
         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) {
         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 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) {
@@ -93,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'
             },
@@ -125,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'
             },
@@ -184,7 +181,7 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
         return true;
     }));
 }, _TeamsChannelMemberAddCommand_initOptionSets = function _TeamsChannelMemberAddCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['userId', 'userDisplayName']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userId', 'userDisplayName'] });
 };
 module.exports = new TeamsChannelMemberAddCommand();
 //# sourceMappingURL=channel-member-add.js.map

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();
@@ -37,15 +38,11 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     get description() {
         return 'Lists members of the specified Microsoft Teams team channel';
     }
-    alias() {
-        return [commands_1.default.CONVERSATIONMEMBER_LIST];
-    }
     defaultProperties() {
         return ['id', 'roles', 'displayName', 'userId', 'email'];
     }
     commandAction(logger, args) {
         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);
@@ -85,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'
             },
@@ -141,7 +138,7 @@ _TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberLis
         return true;
     }));
 }, _TeamsChannelMemberListCommand_initOptionSets = function _TeamsChannelMemberListCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] });
 };
 module.exports = new TeamsChannelMemberListCommand();
 //# sourceMappingURL=channel-member-list.js.map

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();
@@ -38,12 +39,8 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
     get description() {
         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) {
         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);
@@ -111,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'
             },
@@ -205,7 +202,7 @@ _TeamsChannelMemberRemoveCommand_instances = new WeakSet(), _TeamsChannelMemberR
         return true;
     }));
 }, _TeamsChannelMemberRemoveCommand_initOptionSets = function _TeamsChannelMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['userId', 'userName', 'id']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userId', 'userName', 'id'] });
 };
 module.exports = new TeamsChannelMemberRemoveCommand();
 //# sourceMappingURL=channel-member-remove.js.map

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'
             },
@@ -178,7 +179,7 @@ _TeamsChannelMemberSetCommand_instances = new WeakSet(), _TeamsChannelMemberSetC
         return true;
     }));
 }, _TeamsChannelMemberSetCommand_initOptionSets = function _TeamsChannelMemberSetCommand_initOptionSets() {
-    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['userName', 'userId', 'id']);
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userName', 'userId', 'id'] });
 };
 module.exports = new TeamsChannelMemberSetCommand();
 //# sourceMappingURL=channel-member-set.js.map

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.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);
-                    }
+                    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.channelName ? args.options.channelName : args.options.channelId;
+                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,29 +74,67 @@ 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, {
-            channelId: typeof args.options.channelId !== 'undefined',
-            channelName: typeof args.options.channelName !== 'undefined',
+            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, --channelId [channelId]'
+        option: '--teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
     }, {
-        option: '-n, --channelName [channelName]'
+        option: '-i, --id [id]'
     }, {
-        option: '-i, --teamId <teamId>'
+        option: '-n, --name [name]'
     }, {
         option: '--confirm'
     });
 }, _TeamsChannelRemoveCommand_initValidators = function _TeamsChannelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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.id && !validation_1.validation.isValidTeamsChannelId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams channel id`;
         }
         if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -124,7 +142,7 @@ _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand
         return true;
     }));
 }, _TeamsChannelRemoveCommand_initOptionSets = function _TeamsChannelRemoveCommand_initOptionSets() {
-    this.optionSets.push(['channelId', 'channelName']);
+    this.optionSets.push({ options: ['id', 'name'] }, { options: ['teamId', 'teamName'] });
 };
 module.exports = new TeamsChannelRemoveCommand();
 //# sourceMappingURL=channel-remove.js.map

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

@@ -13,12 +13,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsChannelSetCommand_instances, _TeamsChannelSetCommand_initTelemetry, _TeamsChannelSetCommand_initOptions, _TeamsChannelSetCommand_initValidators;
+var _TeamsChannelSetCommand_instances, _TeamsChannelSetCommand_initTelemetry, _TeamsChannelSetCommand_initOptions, _TeamsChannelSetCommand_initValidators, _TeamsChannelSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 TeamsChannelSetCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -26,6 +28,7 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelSetCommand_instances, "m", _TeamsChannelSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelSetCommand_instances, "m", _TeamsChannelSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelSetCommand_instances, "m", _TeamsChannelSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelSetCommand_instances, "m", _TeamsChannelSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_SET;
@@ -35,23 +38,12 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            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'
-            };
             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 teamId = yield this.getTeamId(args);
+                const channelId = yield this.getChannelId(teamId, args);
                 const data = this.mapRequestBody(args.options);
                 const requestOptionsPatch = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${channelId}`,
+                    url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/channels/${formatting_1.formatting.encodeQueryParameter(channelId)}`,
                     headers: {
                         'accept': 'application/json;odata.metadata=none'
                     },
@@ -67,42 +59,89 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
     }
     mapRequestBody(options) {
         const requestBody = {};
-        if (options.newChannelName) {
-            requestBody.displayName = options.newChannelName;
+        if (options.newName) {
+            requestBody.displayName = options.newName;
         }
         if (options.description) {
             requestBody.description = options.description;
         }
         return requestBody;
     }
+    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(teamId, 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(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;
+        });
+    }
 }
 _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initTelemetry = function _TeamsChannelSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            newChannelName: typeof args.options.newChannelName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
             description: typeof args.options.description !== 'undefined'
         });
     });
 }, _TeamsChannelSetCommand_initOptions = function _TeamsChannelSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --teamId <teamId>'
+        option: '--teamId [teamId]'
     }, {
-        option: '--channelName <channelName>'
+        option: '--teamName [teamName]'
     }, {
-        option: '--newChannelName [newChannelName]'
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--newName [newName]'
     }, {
         option: '--description [description]'
     });
 }, _TeamsChannelSetCommand_initValidators = function _TeamsChannelSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!validation_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.channelName.toLowerCase() === "general") {
+        if (args.options.id && !validation_1.validation.isValidTeamsChannelId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams channel id`;
+        }
+        if (args.options.name && args.options.name.toLowerCase() === "general") {
             return 'General channel cannot be updated';
         }
         return true;
     }));
+}, _TeamsChannelSetCommand_initOptionSets = function _TeamsChannelSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'name'] }, { options: ['teamId', 'teamName'] });
 };
 module.exports = new TeamsChannelSetCommand();
 //# sourceMappingURL=channel-set.js.map

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

@@ -19,6 +19,7 @@ const os = require("os");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -63,7 +64,7 @@ class TeamsChatGetCommand extends GraphCommand_1.default {
     getChatDetailsById(id) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${this.resource}/v1.0/chats/${encodeURIComponent(id)}`,
+                url: `${this.resource}/v1.0/chats/${formatting_1.formatting.encodeQueryParameter(id)}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -136,7 +137,7 @@ _TeamsChatGetCommand_instances = new WeakSet(), _TeamsChatGetCommand_initTelemet
         return true;
     }));
 }, _TeamsChatGetCommand_initOptionSets = function _TeamsChatGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'participants', 'name']);
+    this.optionSets.push({ options: ['id', 'participants', 'name'] });
 };
 module.exports = new TeamsChatGetCommand();
 //# sourceMappingURL=chat-get.js.map

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

@@ -182,7 +182,7 @@ _TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCom
         return true;
     }));
 }, _TeamsChatMessageSendCommand_initOptionSets = function _TeamsChatMessageSendCommand_initOptionSets() {
-    this.optionSets.push(['chatId', 'userEmails', 'chatName']);
+    this.optionSets.push({ options: ['chatId', 'userEmails', 'chatName'] });
 };
 module.exports = new TeamsChatMessageSendCommand();
 //# sourceMappingURL=chat-message-send.js.map

package/dist/m365/teams/commands/chat/chatUtil.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chatUtil = void 0;
+const formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
 exports.chatUtil = {
     /**
@@ -42,7 +43,7 @@ exports.chatUtil = {
      */
     findExistingGroupChatsByName(name) {
         return __awaiter(this, void 0, void 0, function* () {
-            const endpoint = `https://graph.microsoft.com/v1.0/chats?$filter=topic eq '${encodeURIComponent(name).replace("'", "''")}'&$expand=members&$select=id,topic,createdDateTime,chatType`;
+            const endpoint = `https://graph.microsoft.com/v1.0/chats?$filter=topic eq '${formatting_1.formatting.encodeQueryParameter(name).replace("'", "''")}'&$expand=members&$select=id,topic,createdDateTime,chatType`;
             return odata_1.odata.getAllItems(endpoint);
         });
     }

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsFunSettingsListCommand_instances, _TeamsFunSettingsListCommand_initOptions, _TeamsFunSettingsListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -35,7 +36,7 @@ class TeamsFunSettingsListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}?$select=funSettings`,
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(args.options.teamId)}?$select=funSettings`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },