@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.119711d

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

@@ -34,36 +34,37 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
     get description() {
         return 'Uninstalls an app from a Microsoft Team team';
     }
-    commandAction(logger, args, cb) {
-        const uninstallApp = () => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.appId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uninstallApp = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.appId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                try {
+                    yield request_1.default.delete(requestOptions);
                 }
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
-        };
-        if (args.options.confirm) {
-            uninstallApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to uninstall the app with id ${args.options.appId} from the Microsoft Teams team ${args.options.teamId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    uninstallApp();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield uninstallApp();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to uninstall the app with id ${args.options.appId} from the Microsoft Teams team ${args.options.teamId}?`
+                });
+                if (result.continue) {
+                    yield uninstallApp();
+                }
+            }
+        });
     }
 }
 _TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_initTelemetry = function _TeamsAppUninstallCommand_initTelemetry() {

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

@@ -13,7 +13,7 @@ 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 _TeamsAppUpdateCommand_instances, _TeamsAppUpdateCommand_initTelemetry, _TeamsAppUpdateCommand_initOptions, _TeamsAppUpdateCommand_initValidators;
+var _TeamsAppUpdateCommand_instances, _TeamsAppUpdateCommand_initTelemetry, _TeamsAppUpdateCommand_initOptions, _TeamsAppUpdateCommand_initValidators, _TeamsAppUpdateCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -28,6 +28,7 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppUpdateCommand_instances, "m", _TeamsAppUpdateCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_UPDATE;
@@ -35,25 +36,28 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates Teams app in the organization\'s app catalog';
     }
-    commandAction(logger, args, cb) {
-        const { filePath } = args.options;
-        this
-            .getAppId(args)
-            .then((appId) => {
-            const fullPath = path.resolve(filePath);
-            if (this.verbose) {
-                logger.logToStderr(`Updating app with id '${appId}' and file '${fullPath}' in the app catalog...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { filePath } = args.options;
+            try {
+                const appId = yield this.getAppId(args);
+                const fullPath = path.resolve(filePath);
+                if (this.verbose) {
+                    logger.logToStderr(`Updating app with id '${appId}' and file '${fullPath}' in the app catalog...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
+                    headers: {
+                        "content-type": "application/zip"
+                    },
+                    data: fs.readFileSync(fullPath)
+                };
+                yield request_1.default.put(requestOptions);
             }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
-                headers: {
-                    "content-type": "application/zip"
-                },
-                data: fs.readFileSync(fullPath)
-            };
-            return request_1.default.put(requestOptions);
-        })
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppId(args) {
         if (args.options.id) {
@@ -97,12 +101,6 @@ _TeamsAppUpdateCommand_instances = new WeakSet(), _TeamsAppUpdateCommand_initTel
     });
 }, _TeamsAppUpdateCommand_initValidators = function _TeamsAppUpdateCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name, but not both';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -115,6 +113,8 @@ _TeamsAppUpdateCommand_instances = new WeakSet(), _TeamsAppUpdateCommand_initTel
         }
         return true;
     }));
+}, _TeamsAppUpdateCommand_initOptionSets = function _TeamsAppUpdateCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsAppUpdateCommand();
 //# sourceMappingURL=app-update.js.map

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

@@ -34,41 +34,42 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the Microsoft Teams client cache';
     }
-    commandAction(logger, args, cb) {
-        if (args.options.confirm) {
-            this.clearTeamsCache(logger, cb);
-        }
-        else {
-            logger.logToStderr('This command will execute the following steps.');
-            logger.logToStderr('- Stop the Microsoft Teams client.');
-            logger.logToStderr('- Clear the Microsoft Teams cached files.');
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear your Microsoft Teams cache?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.confirm) {
+                    yield this.clearTeamsCache(logger);
                 }
                 else {
-                    this.clearTeamsCache(logger, cb);
+                    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({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `Are you sure you want to clear your Microsoft Teams cache?`
+                    });
+                    if (result.continue) {
+                        yield this.clearTeamsCache(logger);
+                    }
                 }
-            });
-        }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    clearTeamsCache(logger, cb) {
+    clearTeamsCache(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.killRunningProcess(logger);
                 yield this.removeCacheFiles(logger);
             }
             catch (e) {
-                cb(e.message);
-                return;
+                throw e.message;
             }
             logger.logToStderr('Teams cache cleared!');
-            cb();
         });
     }
     killRunningProcess(logger) {

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

@@ -13,7 +13,7 @@ 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 _TeamsChannelAddCommand_instances, _TeamsChannelAddCommand_initTelemetry, _TeamsChannelAddCommand_initOptions, _TeamsChannelAddCommand_initValidators;
+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");
@@ -26,6 +26,7 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_ADD;
@@ -84,14 +85,17 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         }
         return request_1.default.post(requestOptions);
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => this.createChannel(args, teamId))
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const teamId = yield this.getTeamId(args);
+                const res = yield this.createChannel(args, teamId);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initTelemetry = function _TeamsChannelAddCommand_initTelemetry() {
@@ -121,12 +125,6 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
     });
 }, _TeamsChannelAddCommand_initValidators = function _TeamsChannelAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -141,6 +139,8 @@ _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initT
         }
         return true;
     }));
+}, _TeamsChannelAddCommand_initOptionSets = function _TeamsChannelAddCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName']);
 };
 module.exports = new TeamsChannelAddCommand();
 //# sourceMappingURL=channel-add.js.map

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

@@ -13,7 +13,7 @@ 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 _TeamsChannelGetCommand_instances, _TeamsChannelGetCommand_initTelemetry, _TeamsChannelGetCommand_initOptions, _TeamsChannelGetCommand_initValidators;
+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");
@@ -28,6 +28,7 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_GET;
@@ -72,34 +73,32 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
             return Promise.resolve(channelItem.id);
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            this.teamId = teamId;
-            return this.getChannelId(args);
-        })
-            .then((channelId) => {
-            let url = '';
-            if (args.options.primary) {
-                url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/primaryChannel`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.teamId = yield this.getTeamId(args);
+                const channelId = yield this.getChannelId(args);
+                let url = '';
+                if (args.options.primary) {
+                    url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/primaryChannel`;
+                }
+                else {
+                    url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`;
+                }
+                const requestOptions = {
+                    url: url,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
             }
-            else {
-                url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: url,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initTelemetry = function _TeamsChannelGetCommand_initTelemetry() {
@@ -126,35 +125,16 @@ _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 && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary';
-        }
-        if (!args.options.channelId && args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
-        }
-        if (args.options.channelId && !args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
-        }
-        if (args.options.channelId && args.options.channelName && !args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
-        }
-        if (!args.options.channelId && !args.options.channelName && !args.options.primary) {
-            return 'Specify channelId, channelName or primary, one is required';
-        }
         if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
         return true;
     }));
+}, _TeamsChannelGetCommand_initOptionSets = function _TeamsChannelGetCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName', 'primary']);
 };
 module.exports = new TeamsChannelGetCommand();
 //# sourceMappingURL=channel-get.js.map

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

@@ -13,7 +13,7 @@ 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 _TeamsChannelListCommand_instances, _TeamsChannelListCommand_initTelemetry, _TeamsChannelListCommand_initOptions, _TeamsChannelListCommand_initValidators;
+var _TeamsChannelListCommand_instances, _TeamsChannelListCommand_initTelemetry, _TeamsChannelListCommand_initOptions, _TeamsChannelListCommand_initValidators, _TeamsChannelListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const aadGroup_1 = require("../../../../utils/aadGroup");
@@ -26,6 +26,7 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_LIST;
@@ -49,20 +50,21 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            let endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
-            if (args.options.type) {
-                endpoint += `?$filter=membershipType eq '${args.options.type}'`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const teamId = yield this.getTeamId(args);
+                let endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
+                if (args.options.type) {
+                    endpoint += `?$filter=membershipType eq '${args.options.type}'`;
+                }
+                const items = yield utils_1.odata.getAllItems(endpoint);
+                logger.log(items);
             }
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((items) => {
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_initTelemetry = function _TeamsChannelListCommand_initTelemetry() {
@@ -83,12 +85,6 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
     });
 }, _TeamsChannelListCommand_initValidators = function _TeamsChannelListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
@@ -97,6 +93,8 @@ _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_ini
         }
         return true;
     }));
+}, _TeamsChannelListCommand_initOptionSets = function _TeamsChannelListCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName']);
 };
 module.exports = new TeamsChannelListCommand();
 //# sourceMappingURL=channel-list.js.map

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

@@ -39,30 +39,25 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.CONVERSATIONMEMBER_ADD];
     }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_ADD, commands_1.default.CHANNEL_MEMBER_ADD);
-        let teamId = '';
-        let channelId = '';
-        this
-            .getTeamId(args)
-            .then((_teamId) => {
-            teamId = _teamId;
-            return this.getChannelId(_teamId, args);
-        })
-            .then((_channelId) => {
-            channelId = _channelId;
-            return this.getUserId(args);
-        })
-            .then((userIds) => {
-            const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/channels/${encodeURIComponent(channelId)}/members`;
-            const roles = args.options.owner ? ["owner"] : [];
-            const tasks = [];
-            for (const userId of userIds) {
-                tasks.push(this.addUser(userId, endpoint, roles));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_ADD, commands_1.default.CHANNEL_MEMBER_ADD);
+            try {
+                const teamId = yield this.getTeamId(args);
+                const channelId = yield this.getChannelId(teamId, args);
+                const userIds = yield this.getUserId(args);
+                const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/channels/${encodeURIComponent(channelId)}/members`;
+                const roles = args.options.owner ? ["owner"] : [];
+                const tasks = [];
+                for (const userId of userIds) {
+                    tasks.push(this.addUser(userId, endpoint, roles));
+                }
+                yield Promise.all(tasks);
             }
-            return Promise.all(tasks);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     addUser(userId, endpoint, roles) {
         const requestOptions = {

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

@@ -13,7 +13,7 @@ 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 _TeamsChannelMemberListCommand_instances, _TeamsChannelMemberListCommand_initTelemetry, _TeamsChannelMemberListCommand_initOptions, _TeamsChannelMemberListCommand_initValidators;
+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");
@@ -28,6 +28,7 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_MEMBER_LIST;
@@ -41,31 +42,29 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'roles', 'displayName', 'userId', 'email'];
     }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_LIST, commands_1.default.CHANNEL_MEMBER_LIST);
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            this.teamId = teamId;
-            return this.getChannelId(args);
-        })
-            .then((channelId) => {
-            const endpoint = `${this.resource}/v1.0/teams/${this.teamId}/channels/${channelId}/members`;
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((memberships) => {
-            if (args.options.role) {
-                if (args.options.role === 'member') {
-                    // Members have no role value
-                    memberships = memberships.filter(i => i.roles.length === 0);
-                }
-                else {
-                    memberships = memberships.filter(i => i.roles.indexOf(args.options.role) !== -1);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_LIST, commands_1.default.CHANNEL_MEMBER_LIST);
+            try {
+                this.teamId = yield this.getTeamId(args);
+                const channelId = yield this.getChannelId(args);
+                const endpoint = `${this.resource}/v1.0/teams/${this.teamId}/channels/${channelId}/members`;
+                let memberships = yield utils_1.odata.getAllItems(endpoint);
+                if (args.options.role) {
+                    if (args.options.role === 'member') {
+                        // Members have no role value
+                        memberships = memberships.filter(i => i.roles.length === 0);
+                    }
+                    else {
+                        memberships = memberships.filter(i => i.roles.indexOf(args.options.role) !== -1);
+                    }
                 }
+                logger.log(memberships);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(memberships);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getTeamId(args) {
         if (args.options.teamId) {
@@ -127,21 +126,9 @@ _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 && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName) {
-            return 'Specify either channelId or channelName, but not both';
-        }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName, one is required';
-        }
         if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams Channel ID`;
         }
@@ -152,6 +139,8 @@ _TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberLis
         }
         return true;
     }));
+}, _TeamsChannelMemberListCommand_initOptionSets = function _TeamsChannelMemberListCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName']);
 };
 module.exports = new TeamsChannelMemberListCommand();
 //# sourceMappingURL=channel-member-list.js.map