@pnp/cli-microsoft365 6.0.0-beta.5637b93 → 6.0.0-beta.66b6874

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

@@ -13,11 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators;
+var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -28,6 +28,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_INSTALL;
@@ -35,32 +36,35 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
     get description() {
         return 'Installs a Microsoft Teams team app from the catalog in the specified team or for the specified user';
     }
-    commandAction(logger, args, cb) {
-        this
-            .validateUser(args, logger)
-            .then(_ => {
-            var _a;
-            let url = `${this.resource}/v1.0`;
-            if (args.options.teamId) {
-                url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
+    commandAction(logger, args) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.validateUser(args, logger);
+                let url = `${this.resource}/v1.0`;
+                if (args.options.teamId) {
+                    url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
+                }
+                else {
+                    url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+                }
+                const requestOptions = {
+                    url: url,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
+                    }
+                };
+                yield request_1.default.post(requestOptions);
             }
-            else {
-                url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: url,
-                headers: {
-                    'content-type': 'application/json;odata=nometadata',
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: {
-                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+        });
     }
     // we need this method, because passing an invalid user ID to the API
     // won't cause an error
@@ -77,7 +81,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
             debug: args.options.debug,
             verbose: args.options.verbose
         };
-        return cli_1.Cli
+        return Cli_1.Cli
             .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
             .then((res) => {
             if (this.verbose) {
@@ -104,29 +108,21 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
     this.options.unshift({ option: '--id <id>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
 }, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        if (!args.options.teamId &&
-            !args.options.userId &&
-            !args.options.userName) {
-            return `Specify either teamId, userId or userName`;
-        }
-        if ((args.options.teamId && args.options.userId) ||
-            (args.options.teamId && args.options.userName) ||
-            (args.options.userId && args.options.userName)) {
-            return `Specify either teamId, userId or userName but not multiple`;
-        }
         if (args.options.teamId &&
-            !utils_1.validation.isValidGuid(args.options.teamId)) {
+            !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         if (args.options.userId &&
-            !utils_1.validation.isValidGuid(args.options.userId)) {
+            !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'userId', 'userName']);
 };
 module.exports = new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsAppListCommand_instances, _TeamsAppListCommand_initTelemetry, _TeamsAppListCommand_initOptions, _TeamsAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -74,20 +75,23 @@ class TeamsAppListCommand extends GraphCommand_1.default {
             }
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getEndpointUrl(args)
-            .then(endpoint => utils_1.odata.getAllItems(endpoint))
-            .then((items) => {
-            if (args.options.teamId || args.options.teamName) {
-                items.forEach(t => {
-                    t.displayName = t.teamsApp.displayName;
-                    t.distributionMethod = t.teamsApp.distributionMethod;
-                });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const endpoint = yield this.getEndpointUrl(args);
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                if (args.options.teamId || args.options.teamName) {
+                    items.forEach(t => {
+                        t.displayName = t.teamsApp.displayName;
+                        t.distributionMethod = t.teamsApp.distributionMethod;
+                    });
+                }
+                logger.log(items);
             }
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemetry = function _TeamsAppListCommand_initTelemetry() {
@@ -111,7 +115,7 @@ _TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemet
         if (args.options.teamId && args.options.teamName) {
             return 'Specify either teamId or teamName, but not both.';
         }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;

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

@@ -33,27 +33,30 @@ class TeamsAppPublishCommand extends GraphCommand_1.default {
     get description() {
         return 'Publishes Teams app to the organization\'s app catalog';
     }
-    commandAction(logger, args, cb) {
-        const fullPath = path.resolve(args.options.filePath);
-        if (this.verbose) {
-            logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
-            headers: {
-                "content-type": "application/zip",
-                accept: 'application/json;odata.metadata=none'
-            },
-            data: fs.readFileSync(fullPath)
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            if (res && res.id) {
-                logger.log(res.id);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fullPath = path.resolve(args.options.filePath);
+            if (this.verbose) {
+                logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
+                headers: {
+                    "content-type": "application/zip",
+                    accept: 'application/json;odata.metadata=none'
+                },
+                data: fs.readFileSync(fullPath)
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                if (res && res.id) {
+                    logger.log(res.id);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+        });
     }
 }
 _TeamsAppPublishCommand_instances = new WeakSet(), _TeamsAppPublishCommand_initOptions = function _TeamsAppPublishCommand_initOptions() {

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppRemoveCommand extends GraphCommand_1.default {
@@ -34,37 +34,38 @@ class TeamsAppRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes a Teams app from the organization\'s app catalog';
     }
-    commandAction(logger, args, cb) {
-        const { id: appId } = args.options;
-        const removeApp = () => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id: appId } = args.options;
+            const removeApp = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps/${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) {
-            removeApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Teams app ${appId} from the app catalog?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeApp();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the Teams app ${appId} from the app catalog?`
+                });
+                if (result.continue) {
+                    yield removeApp();
+                }
+            }
+        });
     }
 }
 _TeamsAppRemoveCommand_instances = new WeakSet(), _TeamsAppRemoveCommand_initTelemetry = function _TeamsAppRemoveCommand_initTelemetry() {
@@ -81,7 +82,7 @@ _TeamsAppRemoveCommand_instances = new WeakSet(), _TeamsAppRemoveCommand_initTel
     });
 }, _TeamsAppRemoveCommand_initValidators = function _TeamsAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsAppUninstallCommand_instances, _TeamsAppUninstallCommand_initTelemetry, _TeamsAppUninstallCommand_initOptions, _TeamsAppUninstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppUninstallCommand extends GraphCommand_1.default {
@@ -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.id}`,
-                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.id}`,
+                    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.id} 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.id} from the Microsoft Teams team ${args.options.teamId}?`
+                });
+                if (result.continue) {
+                    yield uninstallApp();
+                }
+            }
+        });
     }
 }
 _TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_initTelemetry = function _TeamsAppUninstallCommand_initTelemetry() {
@@ -82,7 +83,7 @@ _TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_i
     });
 }, _TeamsAppUninstallCommand_initValidators = function _TeamsAppUninstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;

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

@@ -13,12 +13,12 @@ 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");
 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 TeamsAppUpdateCommand extends GraphCommand_1.default {
@@ -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,13 +101,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 && !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)) {
+        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);
@@ -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

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

@@ -13,10 +13,10 @@ 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");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelAddCommand extends GraphCommand_1.default {
@@ -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,13 +125,7 @@ _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)) {
+        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) {
@@ -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