@pnp/cli-microsoft365 6.0.0-beta.38c66cf → 6.0.0-beta.3da776c

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

@@ -8,15 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _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 {
     constructor() {
-        super(...arguments);
+        super();
+        _TeamsCacheRemoveCommand_instances.add(this);
         this.exec = util.promisify(require('child_process').exec);
+        __classPrivateFieldGet(this, _TeamsCacheRemoveCommand_instances, "m", _TeamsCacheRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsCacheRemoveCommand_instances, "m", _TeamsCacheRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsCacheRemoveCommand_instances, "m", _TeamsCacheRemoveCommand_initValidators).call(this);
     }
     get name() {
         return commands_1.default.CACHE_REMOVE;
@@ -24,46 +34,42 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the Microsoft Teams client cache';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
-    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) {
@@ -132,16 +138,19 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
             }
         });
     }
-    options() {
-        const options = [
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate() {
+}
+_TeamsCacheRemoveCommand_instances = new WeakSet(), _TeamsCacheRemoveCommand_initTelemetry = function _TeamsCacheRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _TeamsCacheRemoveCommand_initOptions = function _TeamsCacheRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--confirm'
+    });
+}, _TeamsCacheRemoveCommand_initValidators = function _TeamsCacheRemoveCommand_initValidators() {
+    this.validators.push(() => __awaiter(this, void 0, void 0, function* () {
         if (process.env.CLIMICROSOFT365_ENV === 'docker') {
             return 'Because you\'re running CLI for Microsoft 365 in a Docker container, we can\'t clear the cache on your host. Instead run this command on your host using "npx ..."';
         }
@@ -149,7 +158,7 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
             return `${process.platform} platform is unsupported for this command`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsCacheRemoveCommand();
 //# sourceMappingURL=cache-remove.js.map

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

@@ -1,25 +1,39 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _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 {
+    constructor() {
+        super();
+        _TeamsChannelAddCommand_instances.add(this);
+        __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;
     }
     get description() {
         return 'Adds a channel to the specified Microsoft Teams team';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.description = typeof args.options.description !== 'undefined';
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
-        telemetryProps.type = args.options.type || 'standard';
-        telemetryProps.owner = typeof args.options.owner !== 'undefined';
-        return telemetryProps;
-    }
     getTeamId(args) {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
@@ -71,48 +85,47 @@ 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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId [teamId]'
-            },
-            {
-                option: '--teamName [teamName]'
-            },
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '--type [type]',
-                autocomplete: ['standard', 'private']
-            },
-            {
-                option: '--owner [owner]'
+    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);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
-        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)) {
+}
+_TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initTelemetry = function _TeamsChannelAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            description: typeof args.options.description !== 'undefined',
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
+            type: args.options.type || 'standard',
+            owner: typeof args.options.owner !== 'undefined'
+        });
+    });
+}, _TeamsChannelAddCommand_initOptions = function _TeamsChannelAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
+    }, {
+        option: '-n, --name <name>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--type [type]',
+        autocomplete: ['standard', 'private']
+    }, {
+        option: '--owner [owner]'
+    });
+}, _TeamsChannelAddCommand_initValidators = function _TeamsChannelAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        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) {
@@ -125,7 +138,9 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
             return 'Specify owner only when creating a private channel.';
         }
         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

@@ -1,14 +1,34 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _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");
 class TeamsChannelGetCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _TeamsChannelGetCommand_instances.add(this);
         this.teamId = "";
+        __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;
@@ -16,15 +36,6 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets information about the specific Microsoft Teams team channel';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
-        telemetryProps.channelId = typeof args.options.channelId !== 'undefined';
-        telemetryProps.channelName = typeof args.options.channelName !== 'undefined';
-        telemetryProps.primary = (!(!args.options.primary)).toString();
-        return telemetryProps;
-    }
     getTeamId(args) {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
@@ -39,14 +50,14 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         });
     }
     getChannelId(args) {
-        if (args.options.channelId) {
-            return Promise.resolve(args.options.channelId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         if (args.options.primary) {
             return Promise.resolve('');
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -62,86 +73,68 @@ 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`;
-            }
-            else {
-                url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`;
+    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);
             }
-            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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId [teamId]'
-            },
-            {
-                option: '--teamName [teamName]'
-            },
-            {
-                option: '-c, --channelId [channelId]'
-            },
-            {
-                option: '--channelName [channelName]'
-            },
-            {
-                option: '--primary'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        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)) {
+}
+_TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initTelemetry = function _TeamsChannelGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            primary: (!(!args.options.primary)).toString()
+        });
+    });
+}, _TeamsChannelGetCommand_initOptions = function _TeamsChannelGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
+    }, {
+        option: '-c, --id [id]'
+    }, {
+        option: '--name [name]'
+    }, {
+        option: '--primary'
+    });
+}, _TeamsChannelGetCommand_initValidators = function _TeamsChannelGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.teamId && !validation_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`;
+        if (args.options.id && !validation_1.validation.isValidTeamsChannelId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams channel id`;
         }
         return true;
-    }
-}
+    }));
+}, _TeamsChannelGetCommand_initOptionSets = function _TeamsChannelGetCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['id', 'name', 'primary']);
+};
 module.exports = new TeamsChannelGetCommand();
 //# sourceMappingURL=channel-get.js.map

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

@@ -1,10 +1,34 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _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");
 class TeamsChannelListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsChannelListCommand_instances.add(this);
+        __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;
     }
@@ -14,12 +38,6 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName'];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
-        return telemetryProps;
-    }
     getTeamId(args) {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
@@ -33,52 +51,51 @@ 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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId [teamId]'
-            },
-            {
-                option: '--teamName [teamName]'
-            },
-            {
-                option: '--type [type]',
-                autocomplete: ['standard', 'private']
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        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)) {
+}
+_TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_initTelemetry = function _TeamsChannelListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined'
+        });
+    });
+}, _TeamsChannelListCommand_initOptions = function _TeamsChannelListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
+    }, {
+        option: '--type [type]',
+        autocomplete: ['standard', 'private', 'shared']
+    });
+}, _TeamsChannelListCommand_initValidators = function _TeamsChannelListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        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;
-    }
-}
+    }));
+}, _TeamsChannelListCommand_initOptionSets = function _TeamsChannelListCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName']);
+};
 module.exports = new TeamsChannelListCommand();
 //# sourceMappingURL=channel-list.js.map