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

package/dist/m365/teams/commands/report/report-directroutingcalls.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsReportDirectroutingcallsCommand_instances, _TeamsReportDirectroutingcallsCommand_initTelemetry, _TeamsReportDirectroutingcallsCommand_initOptions, _TeamsReportDirectroutingcallsCommand_initValidators;
 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 TeamsReportDirectroutingcallsCommand extends GraphCommand_1.default {
@@ -36,21 +36,24 @@ class TeamsReportDirectroutingcallsCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'calleeNumber', 'callerNumber', 'startDateTime'];
     }
-    commandAction(logger, args, cb) {
-        const toDateTimeParameter = encodeURIComponent(args.options.toDateTime ? args.options.toDateTime : new Date().toISOString());
-        const requestOptions = {
-            url: `${this.resource}/v1.0/communications/callRecords/getDirectRoutingCalls(fromDateTime=${encodeURIComponent(args.options.fromDateTime)},toDateTime=${toDateTimeParameter})`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const toDateTimeParameter = encodeURIComponent(args.options.toDateTime ? args.options.toDateTime : new Date().toISOString());
+            const requestOptions = {
+                url: `${this.resource}/v1.0/communications/callRecords/getDirectRoutingCalls(fromDateTime=${encodeURIComponent(args.options.fromDateTime)},toDateTime=${toDateTimeParameter})`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsReportDirectroutingcallsCommand_instances = new WeakSet(), _TeamsReportDirectroutingcallsCommand_initTelemetry = function _TeamsReportDirectroutingcallsCommand_initTelemetry() {
@@ -67,11 +70,11 @@ _TeamsReportDirectroutingcallsCommand_instances = new WeakSet(), _TeamsReportDir
     });
 }, _TeamsReportDirectroutingcallsCommand_initValidators = function _TeamsReportDirectroutingcallsCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidISODateDashOnly(args.options.fromDateTime)) {
+        if (!validation_1.validation.isValidISODateDashOnly(args.options.fromDateTime)) {
             return 'The fromDateTime is not a valid ISO date string (YYYY-MM-DD)';
         }
         if (args.options.toDateTime &&
-            !utils_1.validation.isValidISODateDashOnly(args.options.toDateTime)) {
+            !validation_1.validation.isValidISODateDashOnly(args.options.toDateTime)) {
             return 'The toDateTime is not a valid ISO date string (YYYY-MM-DD)';
         }
         if (Math.ceil((new Date(args.options.toDateTime || new Date().toISOString()).getTime() - new Date(args.options.fromDateTime).getTime()) / (1000 * 3600 * 24)) > 90) {

package/dist/m365/teams/commands/report/report-pstncalls.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsReportPstncallsCommand_instances, _TeamsReportPstncallsCommand_initTelemetry, _TeamsReportPstncallsCommand_initOptions, _TeamsReportPstncallsCommand_initValidators;
 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 TeamsReportPstncallsCommand extends GraphCommand_1.default {
@@ -36,21 +36,24 @@ class TeamsReportPstncallsCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'calleeNumber', 'callerNumber', 'startDateTime'];
     }
-    commandAction(logger, args, cb) {
-        const toDateTimeParameter = encodeURIComponent(args.options.toDateTime ? args.options.toDateTime : new Date().toISOString());
-        const requestOptions = {
-            url: `${this.resource}/v1.0/communications/callRecords/getPstnCalls(fromDateTime=${encodeURIComponent(args.options.fromDateTime)},toDateTime=${toDateTimeParameter})`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const toDateTimeParameter = encodeURIComponent(args.options.toDateTime ? args.options.toDateTime : new Date().toISOString());
+            const requestOptions = {
+                url: `${this.resource}/v1.0/communications/callRecords/getPstnCalls(fromDateTime=${encodeURIComponent(args.options.fromDateTime)},toDateTime=${toDateTimeParameter})`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsReportPstncallsCommand_instances = new WeakSet(), _TeamsReportPstncallsCommand_initTelemetry = function _TeamsReportPstncallsCommand_initTelemetry() {
@@ -67,11 +70,11 @@ _TeamsReportPstncallsCommand_instances = new WeakSet(), _TeamsReportPstncallsCom
     });
 }, _TeamsReportPstncallsCommand_initValidators = function _TeamsReportPstncallsCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidISODateDashOnly(args.options.fromDateTime)) {
+        if (!validation_1.validation.isValidISODateDashOnly(args.options.fromDateTime)) {
             return 'The fromDateTime is not a valid ISO date string (YYYY-MM-DD)';
         }
         if (args.options.toDateTime &&
-            !utils_1.validation.isValidISODateDashOnly(args.options.toDateTime)) {
+            !validation_1.validation.isValidISODateDashOnly(args.options.toDateTime)) {
             return 'The toDateTime is not a valid ISO date string (YYYY-MM-DD)';
         }
         if (Math.ceil((new Date(args.options.toDateTime || new Date().toISOString()).getTime() - new Date(args.options.fromDateTime).getTime()) / (1000 * 3600 * 24)) > 90) {

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTabAddCommand_instances, _TeamsTabAddCommand_initTelemetry, _TeamsTabAddCommand_initOptions, _TeamsTabAddCommand_initValidators;
 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 TeamsTabAddCommand extends GraphCommand_1.default {
@@ -36,23 +36,26 @@ class TeamsTabAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Add a tab to the specified channel';
     }
-    commandAction(logger, args, cb) {
-        const data = this.mapRequestBody(args.options);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${args.options.channelId}/tabs`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json;odata=nometadata'
-            },
-            data: data,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = this.mapRequestBody(args.options);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${args.options.channelId}/tabs`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata=nometadata'
+                },
+                data: data,
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     mapRequestBody(options) {
         const requestBody = {};
@@ -118,10 +121,10 @@ _TeamsTabAddCommand_instances = new WeakSet(), _TeamsTabAddCommand_initTelemetry
     });
 }, _TeamsTabAddCommand_initValidators = function _TeamsTabAddCommand_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`;
         }
-        if (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
         return true;

package/dist/m365/teams/commands/tab/tab-get.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 _TeamsTabGetCommand_instances, _TeamsTabGetCommand_initTelemetry, _TeamsTabGetCommand_initOptions, _TeamsTabGetCommand_initValidators;
+var _TeamsTabGetCommand_instances, _TeamsTabGetCommand_initTelemetry, _TeamsTabGetCommand_initOptions, _TeamsTabGetCommand_initValidators, _TeamsTabGetCommand_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");
@@ -29,6 +29,7 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsTabGetCommand_instances, "m", _TeamsTabGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTabGetCommand_instances, "m", _TeamsTabGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsTabGetCommand_instances, "m", _TeamsTabGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTabGetCommand_instances, "m", _TeamsTabGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TAB_GET;
@@ -91,32 +92,27 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
             return Promise.resolve(tabItem.id);
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            this.teamId = teamId;
-            return this.getChannelId(args);
-        })
-            .then((channelId) => {
-            this.channelId = channelId;
-            return this.getTabId(args);
-        })
-            .then((tabId) => {
-            const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(this.channelId)}/tabs/${encodeURIComponent(tabId)}`;
-            const requestOptions = {
-                url: endpoint,
-                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));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.teamId = yield this.getTeamId(args);
+                this.channelId = yield this.getChannelId(args);
+                const tabId = yield this.getTabId(args);
+                const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(this.channelId)}/tabs/${encodeURIComponent(tabId)}`;
+                const requestOptions = {
+                    url: endpoint,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsTabGetCommand_instances = new WeakSet(), _TeamsTabGetCommand_initTelemetry = function _TeamsTabGetCommand_initTelemetry() {
@@ -146,35 +142,19 @@ _TeamsTabGetCommand_instances = new WeakSet(), _TeamsTabGetCommand_initTelemetry
     });
 }, _TeamsTabGetCommand_initValidators = function _TeamsTabGetCommand_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.channelId && args.options.channelName) {
-            return 'Specify either channelId or channelName, but not both.';
-        }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName, one is required';
-        }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams ChannelId`;
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either id or name, but not both.';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify id or name, one is required';
+        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.id && !utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.tabId} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsTabGetCommand_initOptionSets = function _TeamsTabGetCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['id', 'name']);
 };
 module.exports = new TeamsTabGetCommand();
 //# sourceMappingURL=tab-get.js.map

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTabListCommand_instances, _TeamsTabListCommand_initOptions, _TeamsTabListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTabListCommand extends GraphCommand_1.default {
@@ -34,17 +35,20 @@ class TeamsTabListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName', 'teamsAppTabId'];
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${encodeURIComponent(args.options.channelId)}/tabs?$expand=teamsApp`;
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((items) => {
-            items.forEach(i => {
-                i.teamsAppTabId = i.teamsApp.id;
-            });
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${encodeURIComponent(args.options.channelId)}/tabs?$expand=teamsApp`;
+            try {
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                items.forEach(i => {
+                    i.teamsAppTabId = i.teamsApp.id;
+                });
+                logger.log(items);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsTabListCommand_instances = new WeakSet(), _TeamsTabListCommand_initOptions = function _TeamsTabListCommand_initOptions() {
@@ -55,10 +59,10 @@ _TeamsTabListCommand_instances = new WeakSet(), _TeamsTabListCommand_initOptions
     });
 }, _TeamsTabListCommand_initValidators = function _TeamsTabListCommand_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`;
         }
-        if (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
         return true;

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTabRemoveCommand_instances, _TeamsTabRemoveCommand_initTelemetry, _TeamsTabRemoveCommand_initOptions, _TeamsTabRemoveCommand_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 TeamsTabRemoveCommand extends GraphCommand_1.default {
@@ -34,35 +34,38 @@ class TeamsTabRemoveCommand extends GraphCommand_1.default {
     get description() {
         return "Removes a tab from the specified channel";
     }
-    commandAction(logger, args, cb) {
-        const removeTab = () => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${args.options.channelId}/tabs/${encodeURIComponent(args.options.id)}`,
-                headers: {
-                    accept: "application/json;odata.metadata=none"
-                },
-                responseType: 'json'
-            };
-            request_1.default.delete(requestOptions).then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeTab();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: "confirm",
-                name: "continue",
-                default: false,
-                message: `Are you sure you want to remove the tab with id ${args.options.id} from channel ${args.options.channelId} in team ${args.options.teamId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeTab = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${args.options.channelId}/tabs/${encodeURIComponent(args.options.id)}`,
+                    headers: {
+                        accept: "application/json;odata.metadata=none"
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeTab();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeTab();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the tab with id ${args.options.id} from channel ${args.options.channelId} in team ${args.options.teamId}?`
+                });
+                if (result.continue) {
+                    yield removeTab();
+                }
+            }
+        });
     }
 }
 _TeamsTabRemoveCommand_instances = new WeakSet(), _TeamsTabRemoveCommand_initTelemetry = function _TeamsTabRemoveCommand_initTelemetry() {
@@ -83,13 +86,13 @@ _TeamsTabRemoveCommand_instances = new WeakSet(), _TeamsTabRemoveCommand_initTel
     });
 }, _TeamsTabRemoveCommand_initValidators = function _TeamsTabRemoveCommand_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`;
         }
-        if (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
-        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/team/team-add.js

@@ -42,55 +42,54 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Adds a new Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        this.dots = '';
-        let requestBody;
-        if (args.options.template) {
-            if (this.verbose) {
-                logger.logToStderr(`Using template...`);
-            }
-            requestBody = JSON.parse(args.options.template);
-            if (args.options.name) {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.dots = '';
+            let requestBody;
+            if (args.options.template) {
                 if (this.verbose) {
-                    logger.logToStderr(`Using '${args.options.name}' as name...`);
+                    logger.logToStderr(`Using template...`);
                 }
-                requestBody.displayName = args.options.name;
-            }
-            if (args.options.description) {
-                if (this.verbose) {
-                    logger.logToStderr(`Using '${args.options.description}' as description...`);
+                requestBody = JSON.parse(args.options.template);
+                if (args.options.name) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Using '${args.options.name}' as name...`);
+                    }
+                    requestBody.displayName = args.options.name;
+                }
+                if (args.options.description) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Using '${args.options.description}' as description...`);
+                    }
+                    requestBody.description = args.options.description;
                 }
-                requestBody.description = args.options.description;
             }
-        }
-        else {
-            requestBody = {
-                'template@odata.bind': `https://graph.microsoft.com/v1.0/teamsTemplates('standard')`,
-                displayName: args.options.name,
-                description: args.options.description
-            };
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams`,
-            headers: {
-                'accept': 'application/json;odata.metadata=none'
-            },
-            data: requestBody,
-            responseType: 'stream'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0${res.headers.location}`,
+            else {
+                requestBody = {
+                    'template@odata.bind': `https://graph.microsoft.com/v1.0/teamsTemplates('standard')`,
+                    displayName: args.options.name,
+                    description: args.options.description
+                };
+            }
+            const requestOptionsPost = {
+                url: `${this.resource}/v1.0/teams`,
                 headers: {
-                    accept: 'application/json;odata.metadata=minimal'
+                    'accept': 'application/json;odata.metadata=none'
                 },
-                responseType: 'json'
+                data: requestBody,
+                responseType: 'stream'
             };
-            return new Promise((resolve, reject) => {
-                request_1.default.get(requestOptions)
-                    .then((teamsAsyncOperation) => {
+            try {
+                const res = yield request_1.default.post(requestOptionsPost);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0${res.headers.location}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=minimal'
+                    },
+                    responseType: 'json'
+                };
+                const teamsAsyncOperation = yield new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                    const teamsAsyncOperation = yield request_1.default.get(requestOptions);
                     if (!args.options.wait) {
                         resolve(teamsAsyncOperation);
                     }
@@ -99,20 +98,19 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
                             this.waitUntilFinished(requestOptions, resolve, reject, logger, this.dots);
                         }, this.pollingInterval);
                     }
-                });
-            });
-        })
-            .then((teamsAsyncOperation) => {
-            if (teamsAsyncOperation.status !== TeamsAsyncOperationStatus.Succeeded) {
-                return Promise.resolve(teamsAsyncOperation);
+                }));
+                let output;
+                if (teamsAsyncOperation.status !== TeamsAsyncOperationStatus.Succeeded) {
+                    output = teamsAsyncOperation;
+                }
+                else {
+                    output = yield aadGroup_1.aadGroup.getGroupById(teamsAsyncOperation.targetResourceId);
+                }
+                logger.log(output);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            return aadGroup_1.aadGroup.getGroupById(teamsAsyncOperation.targetResourceId);
-        })
-            .then((output) => {
-            logger.log(output);
-            cb();
-        }, (err) => {
-            this.handleRejectedODataJsonPromise(err, logger, cb);
         });
     }
     waitUntilFinished(requestOptions, resolve, reject, logger, dots) {