@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5bdba89

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsCacheRemoveCommand_instances, _TeamsCacheRemoveCommand_initTelemetry, _TeamsCacheRemoveCommand_initOptions, _TeamsCacheRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const util = require("util");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsCacheRemoveCommand extends GraphCommand_1.default {
@@ -44,7 +44,7 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
                     logger.logToStderr('This command will execute the following steps.');
                     logger.logToStderr('- Stop the Microsoft Teams client.');
                     logger.logToStderr('- Clear the Microsoft Teams cached files.');
-                    const result = yield cli_1.Cli.prompt({
+                    const result = yield Cli_1.Cli.prompt({
                         type: 'confirm',
                         name: 'continue',
                         default: false,

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelAddCommand_instances, _TeamsChannelAddCommand_initTelemetry, _TeamsChannelAddCommand_initOptions, _TeamsChannelAddCommand_initValidators, _TeamsChannelAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelAddCommand extends GraphCommand_1.default {
@@ -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,23 +119,23 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
         option: '-d, --description [description]'
     }, {
         option: '--type [type]',
-        autocomplete: ['standard', 'private']
+        autocomplete: ['standard', 'private', 'shared']
     }, {
         option: '--owner [owner]'
     });
 }, _TeamsChannelAddCommand_initValidators = function _TeamsChannelAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.type && ['standard', 'private'].indexOf(args.options.type) === -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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelGetCommand_instances, _TeamsChannelGetCommand_initTelemetry, _TeamsChannelGetCommand_initOptions, _TeamsChannelGetCommand_initValidators, _TeamsChannelGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -113,11 +113,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]'
     }, {
@@ -125,10 +125,10 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
     });
 }, _TeamsChannelGetCommand_initValidators = function _TeamsChannelGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.id && !utils_1.validation.isValidTeamsChannelId(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidTeamsChannelId(args.options.id)) {
             return `${args.options.id} is not a valid Teams channel id`;
         }
         return true;

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelListCommand_instances, _TeamsChannelListCommand_initTelemetry, _TeamsChannelListCommand_initOptions, _TeamsChannelListCommand_initValidators, _TeamsChannelListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -58,7 +59,7 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
                 if (args.options.type) {
                     endpoint += `?$filter=membershipType eq '${args.options.type}'`;
                 }
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {
@@ -81,15 +82,15 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
         option: '--teamName [teamName]'
     }, {
         option: '--type [type]',
-        autocomplete: ['standard', 'private']
+        autocomplete: ['standard', 'private', 'shared']
     });
 }, _TeamsChannelListCommand_initValidators = function _TeamsChannelListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.type && ['standard', 'private'].indexOf(args.options.type.toLowerCase()) === -1) {
-            return `${args.options.type} is not a valid type value. Allowed values standard|private`;
+        if (args.options.type && ['standard', 'private', 'shared'].indexOf(args.options.type.toLowerCase()) === -1) {
+            return `${args.options.type} is not a valid type value. Allowed values standard|private|shared`;
         }
         return true;
     }));

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

@@ -17,7 +17,7 @@ var _TeamsChannelMemberAddCommand_instances, _TeamsChannelMemberAddCommand_initT
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -171,10 +171,10 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
     });
 }, _TeamsChannelMemberAddCommand_initValidators = function _TeamsChannelMemberAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (args.options.channelId && !validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelMemberListCommand_instances, _TeamsChannelMemberListCommand_initTelemetry, _TeamsChannelMemberListCommand_initOptions, _TeamsChannelMemberListCommand_initValidators, _TeamsChannelMemberListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -45,7 +46,7 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
                 this.teamId = yield this.getTeamId(args);
                 const channelId = yield this.getChannelId(args);
                 const endpoint = `${this.resource}/v1.0/teams/${this.teamId}/channels/${channelId}/members`;
-                let memberships = yield utils_1.odata.getAllItems(endpoint);
+                let memberships = yield odata_1.odata.getAllItems(endpoint);
                 if (args.options.role) {
                     if (args.options.role === 'member') {
                         // Members have no role value
@@ -122,10 +123,10 @@ _TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberLis
     });
 }, _TeamsChannelMemberListCommand_initValidators = function _TeamsChannelMemberListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (args.options.channelId && !validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel ID`;
         }
         if (args.options.role) {

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelMemberRemoveCommand_instances, _TeamsChannelMemberRemoveCommand_initTelemetry, _TeamsChannelMemberRemoveCommand_initOptions, _TeamsChannelMemberRemoveCommand_initValidators, _TeamsChannelMemberRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -55,7 +55,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
                 const userName = args.options.userName || args.options.userId || args.options.id;
                 const teamName = args.options.teamName || args.options.teamId;
                 const channelName = args.options.channelName || args.options.channelId;
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -189,13 +189,13 @@ _TeamsChannelMemberRemoveCommand_instances = new WeakSet(), _TeamsChannelMemberR
     });
 }, _TeamsChannelMemberRemoveCommand_initValidators = function _TeamsChannelMemberRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (args.options.channelId && !validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel ID`;
         }
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelMemberSetCommand_instances, _TeamsChannelMemberSetCommand_initTelemetry, _TeamsChannelMemberSetCommand_initOptions, _TeamsChannelMemberSetCommand_initValidators, _TeamsChannelMemberSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -163,13 +163,13 @@ _TeamsChannelMemberSetCommand_instances = new WeakSet(), _TeamsChannelMemberSetC
     });
 }, _TeamsChannelMemberSetCommand_initValidators = function _TeamsChannelMemberSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (args.options.channelId && !validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel ID`;
         }
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         if (['owner', 'member'].indexOf(args.options.role) === -1) {

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

@@ -15,15 +15,17 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators, _TeamsChannelRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 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 +41,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/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptionsDelete);
                 }
                 catch (err) {
                     this.handleRejectedODataJsonPromise(err);
@@ -81,12 +60,12 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
                 yield removeChannel();
             }
             else {
-                const channelName = args.options.name ? args.options.name : args.options.id;
-                const result = yield cli_1.Cli.prompt({
+                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,37 +73,75 @@ 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/${encodeURIComponent(this.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(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'
     });
 }, _TeamsChannelRemoveCommand_initValidators = function _TeamsChannelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && !utils_1.validation.isValidTeamsChannelId(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidTeamsChannelId(args.options.id)) {
             return `${args.options.id} is not a valid Teams channel id`;
         }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;
     }));
 }, _TeamsChannelRemoveCommand_initOptionSets = function _TeamsChannelRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push(['id', 'name'], ['teamId', 'teamName']);
 };
 module.exports = new TeamsChannelRemoveCommand();
 //# sourceMappingURL=channel-remove.js.map

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

@@ -13,10 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _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 utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelSetCommand extends GraphCommand_1.default {
@@ -26,6 +27,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 +37,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.name)}'`,
-                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/${encodeURIComponent(teamId)}/channels/${encodeURIComponent(channelId)}`,
                     headers: {
                         'accept': 'application/json;odata.metadata=none'
                     },
@@ -75,19 +66,61 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
         }
         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/${encodeURIComponent(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(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, {
+            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: '--name <name>'
+        option: '--teamName [teamName]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
     }, {
         option: '--newName [newName]'
     }, {
@@ -95,14 +128,19 @@ _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initT
     });
 }, _TeamsChannelSetCommand_initValidators = function _TeamsChannelSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.name.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(['id', 'name'], ['teamId', 'teamName']);
 };
 module.exports = new TeamsChannelSetCommand();
 //# sourceMappingURL=channel-set.js.map

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChatListCommand_instances, _TeamsChatListCommand_initTelemetry, _TeamsChatListCommand_initOptions, _TeamsChatListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChatListCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class TeamsChatListCommand extends GraphCommand_1.default {
             const filter = args.options.type !== undefined ? `?$filter=chatType eq '${args.options.type}'` : '';
             const endpoint = `${this.resource}/v1.0/chats${filter}`;
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChatMemberListCommand_instances, _TeamsChatMemberListCommand_initOptions, _TeamsChatMemberListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChatMemberListCommand extends GraphCommand_1.default {
@@ -38,7 +39,7 @@ class TeamsChatMemberListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const endpoint = `${this.resource}/v1.0/chats/${args.options.chatId}/members`;
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {
@@ -53,7 +54,7 @@ _TeamsChatMemberListCommand_instances = new WeakSet(), _TeamsChatMemberListComma
     });
 }, _TeamsChatMemberListCommand_initValidators = function _TeamsChatMemberListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidTeamsChatId(args.options.chatId)) {
+        if (!validation_1.validation.isValidTeamsChatId(args.options.chatId)) {
             return `${args.options.chatId} is not a valid Teams ChatId`;
         }
         return true;