@pnp/cli-microsoft365 6.0.0-beta.e031afa → 6.0.0-beta.e42aed1

package/dist/m365/teams/commands/team/team-clone.js

@@ -1,80 +1,118 @@
 "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 _TeamsTeamCloneCommand_instances, _TeamsTeamCloneCommand_initTelemetry, _TeamsTeamCloneCommand_initOptions, _TeamsTeamCloneCommand_initValidators, _TeamsTeamCloneCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamCloneCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsTeamCloneCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.TEAM_CLONE;
     }
     get description() {
         return 'Creates a clone of a Microsoft Teams team';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.description = typeof args.options.description !== 'undefined';
-        telemetryProps.classification = typeof args.options.classification !== 'undefined';
-        telemetryProps.visibility = typeof args.options.visibility !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const data = {
-            displayName: args.options.displayName,
-            mailNickname: this.generateMailNickname(args.options.displayName),
-            partsToClone: args.options.partsToClone
-        };
-        if (args.options.description) {
-            data.description = args.options.description;
-        }
-        if (args.options.classification) {
-            data.classification = args.options.classification;
-        }
-        if (args.options.visibility) {
-            data.visibility = args.options.visibility;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/clone`,
-            headers: {
-                "content-type": "application/json",
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: data
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId <teamId>'
-            },
-            {
-                option: '-n, --displayName <displayName>'
-            },
-            {
-                option: '-p, --partsToClone <partsToClone>',
-                autocomplete: ['apps', 'channels', 'members', 'settings', 'tabs']
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '-c, --classification [classification]'
-            },
-            {
-                option: '-v, --visibility [visibility]',
-                autocomplete: ['Private', 'Public']
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                displayName: args.options.name,
+                mailNickname: this.generateMailNickname(args.options.name),
+                partsToClone: args.options.partsToClone
+            };
+            if (args.options.description) {
+                data.description = args.options.description;
+            }
+            if (args.options.classification) {
+                data.classification = args.options.classification;
+            }
+            if (args.options.visibility) {
+                data.visibility = args.options.visibility;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(args.options.id)}/clone`,
+                headers: {
+                    "content-type": "application/json",
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: data
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
+    }
+    /**
+     * There is a know issue that the mailNickname is currently ignored and cannot be set by the user
+     * However the mailNickname is still required by the payload so to deliver better user experience
+     * the CLI generates mailNickname for the user
+     * so the user does not have to specify something that will be ignored.
+     * For more see: https://docs.microsoft.com/en-us/graph/api/team-clone?view=graph-rest-1.0#request-data
+     * This method has to be removed once the graph team fixes the issue and then the actual value
+     * of the mailNickname would have to be specified by the CLI user.
+     * @param displayName teams display name
+     */
+    generateMailNickname(displayName) {
+        // currently the Microsoft Graph generates mailNickname in a similar fashion
+        return `${displayName.replace(/[^a-zA-Z0-9]/g, "")}${Math.floor(Math.random() * 9999)}`;
     }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
+}
+_TeamsTeamCloneCommand_instances = new WeakSet(), _TeamsTeamCloneCommand_initTelemetry = function _TeamsTeamCloneCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            description: typeof args.options.description !== 'undefined',
+            classification: typeof args.options.classification !== 'undefined',
+            visibility: typeof args.options.visibility !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _TeamsTeamCloneCommand_initOptions = function _TeamsTeamCloneCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-p, --partsToClone <partsToClone>',
+        autocomplete: ['apps', 'channels', 'members', 'settings', 'tabs']
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '-c, --classification [classification]'
+    }, {
+        option: '-v, --visibility [visibility]',
+        autocomplete: ['Private', 'Public']
+    });
+}, _TeamsTeamCloneCommand_initValidators = function _TeamsTeamCloneCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         const partsToClone = args.options.partsToClone.replace(/\s/g, '').split(',');
         for (const partToClone of partsToClone) {
@@ -95,21 +133,9 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
             }
         }
         return true;
-    }
-    /**
-     * There is a know issue that the mailNickname is currently ignored and cannot be set by the user
-     * However the mailNickname is still required by the payload so to deliver better user experience
-     * the CLI generates mailNickname for the user
-     * so the user does not have to specify something that will be ignored.
-     * For more see: https://docs.microsoft.com/en-us/graph/api/team-clone?view=graph-rest-1.0#request-data
-     * This method has to be removed once the graph team fixes the issue and then the actual value
-     * of the mailNickname would have to be specified by the CLI user.
-     * @param displayName teams display name
-     */
-    generateMailNickname(displayName) {
-        // currently the Microsoft Graph generates mailNickname in a similar fashion
-        return `${displayName.replace(/[^a-zA-Z0-9]/g, "")}${Math.floor(Math.random() * 9999)}`;
-    }
-}
+    }));
+}, _TeamsTeamCloneCommand_initOptionSets = function _TeamsTeamCloneCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new TeamsTeamCloneCommand();
 //# sourceMappingURL=team-clone.js.map

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

@@ -1,23 +1,41 @@
 "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 _TeamsTeamGetCommand_instances, _TeamsTeamGetCommand_initTelemetry, _TeamsTeamGetCommand_initOptions, _TeamsTeamGetCommand_initValidators, _TeamsTeamGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsTeamGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsTeamGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsTeamGetCommand_instances, "m", _TeamsTeamGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamGetCommand_instances, "m", _TeamsTeamGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamGetCommand_instances, "m", _TeamsTeamGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamGetCommand_instances, "m", _TeamsTeamGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.TEAM_GET;
     }
     get description() {
         return 'Retrieve information about the specified Microsoft Team';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        return telemetryProps;
-    }
     getTeamId(args) {
         if (args.options.id) {
             return Promise.resolve(args.options.id);
@@ -31,48 +49,48 @@ class TeamsTeamGetCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}`,
-                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, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const teamId = yield this.getTeamId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
-        if (args.options.id && args.options.name) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify teamId or teamName, one is required';
-        }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+}
+_TeamsTeamGetCommand_instances = new WeakSet(), _TeamsTeamGetCommand_initTelemetry = function _TeamsTeamGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _TeamsTeamGetCommand_initOptions = function _TeamsTeamGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    });
+}, _TeamsTeamGetCommand_initValidators = function _TeamsTeamGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _TeamsTeamGetCommand_initOptionSets = function _TeamsTeamGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new TeamsTeamGetCommand();
 //# sourceMappingURL=team-get.js.map

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

@@ -1,42 +1,59 @@
 "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 _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsTeamListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.TEAM_LIST;
     }
     get description() {
         return 'Lists Microsoft Teams in the current tenant';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.joined = args.options.joined;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        let endpoint = `${this.resource}/v1.0/groups?$select=id,displayName,description,resourceProvisioningOptions`;
-        if (args.options.joined) {
-            endpoint = `${this.resource}/v1.0/me/joinedTeams`;
-        }
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((items) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let endpoint = `${this.resource}/v1.0/groups?$select=id,displayName,description,resourceProvisioningOptions`;
             if (args.options.joined) {
-                return Promise.resolve(items);
+                endpoint = `${this.resource}/v1.0/me/joinedTeams`;
+            }
+            try {
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                if (args.options.joined) {
+                    logger.log(items);
+                }
+                else {
+                    const teamItems = yield Promise.all(items.filter((e) => {
+                        return e.resourceProvisioningOptions.indexOf('Team') > -1;
+                    }).map(g => this.getTeamFromGroup(g)));
+                    logger.log(teamItems);
+                }
             }
-            else {
-                return Promise.all(items.filter((e) => {
-                    return e.resourceProvisioningOptions.indexOf('Team') > -1;
-                }).map(g => this.getTeamFromGroup(g)));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        })
-            .then((items) => {
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getTeamFromGroup(group) {
         return new Promise((resolve, reject) => {
@@ -72,15 +89,17 @@ class TeamsTeamListCommand extends GraphCommand_1.default {
             });
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-j, --joined'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_TeamsTeamListCommand_instances = new WeakSet(), _TeamsTeamListCommand_initTelemetry = function _TeamsTeamListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            joined: args.options.joined
+        });
+    });
+}, _TeamsTeamListCommand_initOptions = function _TeamsTeamListCommand_initOptions() {
+    this.options.unshift({
+        option: '-j, --joined'
+    });
+};
 module.exports = new TeamsTeamListCommand();
 //# sourceMappingURL=team-list.js.map

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

@@ -1,23 +1,42 @@
 "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 _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators, _TeamsTeamRemoveCommand_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 aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsTeamRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsTeamRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.TEAM_REMOVE;
     }
     get description() {
         return 'Removes the specified Microsoft Teams team';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     getTeamId(args) {
         if (args.options.id) {
             return Promise.resolve(args.options.id);
@@ -31,78 +50,64 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
-        const removeTeam = () => {
-            this
-                .getTeamId(args)
-                .then((teamId) => {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${encodeURIComponent(teamId)}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.delete(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeTeam();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the team ${args.options.teamId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeTeam = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const teamId = yield this.getTeamId(args);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${formatting_1.formatting.encodeQueryParameter(teamId)}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeTeam();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--teamId [teamId]'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield removeTeam();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the team ${args.options.id ? args.options.id : args.options.name}?`
+                });
+                if (result.continue) {
+                    yield removeTeam();
+                }
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!args.options.id && !args.options.name && !args.options.teamId) {
-            return 'Specify either id or name';
-        }
-        if (args.options.name && (args.options.id || args.options.teamId)) {
-            return 'Specify either id or name but not both';
-        }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+}
+_TeamsTeamRemoveCommand_instances = new WeakSet(), _TeamsTeamRemoveCommand_initTelemetry = function _TeamsTeamRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _TeamsTeamRemoveCommand_initOptions = function _TeamsTeamRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--confirm'
+    });
+}, _TeamsTeamRemoveCommand_initValidators = function _TeamsTeamRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _TeamsTeamRemoveCommand_initOptionSets = function _TeamsTeamRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new TeamsTeamRemoveCommand();
 //# sourceMappingURL=team-remove.js.map