@pnp/cli-microsoft365 6.0.0-beta.db5e64c → 6.0.0-beta.dc71aa3

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

@@ -18,7 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppUpdateCommand extends GraphCommand_1.default {
@@ -36,32 +37,35 @@ 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) {
             return Promise.resolve(args.options.id);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -98,7 +102,7 @@ _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 && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         const fullPath = path.resolve(args.options.filePath);

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 {
@@ -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

@@ -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',
@@ -85,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() {
@@ -116,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,10 +16,11 @@ 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");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelGetCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -57,7 +58,7 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
             return Promise.resolve('');
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -73,34 +74,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/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/primaryChannel`;
+                }
+                else {
+                    url = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels/${formatting_1.formatting.encodeQueryParameter(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() {
@@ -115,11 +114,11 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
     });
 }, _TeamsChannelGetCommand_initOptions = function _TeamsChannelGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --teamId [teamId]'
+        option: '--teamId [teamId]'
     }, {
         option: '--teamName [teamName]'
     }, {
-        option: '-c, --id [id]'
+        option: '-i, --id [id]'
     }, {
         option: '--name [name]'
     }, {
@@ -127,10 +126,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");
@@ -50,20 +51,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 odata_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() {
@@ -80,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,10 +17,11 @@ 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");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -34,35 +35,26 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
         return commands_1.default.CHANNEL_MEMBER_ADD;
     }
     get description() {
-        return 'Adds a conversation member in a private channel.';
+        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, 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* () {
+            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/${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) {
+                    tasks.push(this.addUser(userId, endpoint, roles));
+                }
+                yield Promise.all(tasks);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            return Promise.all(tasks);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     addUser(userId, endpoint, roles) {
         const requestOptions = {
@@ -98,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'
             },
@@ -130,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'
             },
@@ -180,10 +172,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,10 +16,12 @@ 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");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -36,37 +38,31 @@ 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, 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* () {
+            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 odata_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);
             }
-            logger.log(memberships);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTeamId(args) {
         if (args.options.teamId) {
@@ -86,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'
             },
@@ -128,10 +124,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) {