@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7a78ebe

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-restore.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupRecycleBinItemRestoreCommand_instances, _AadO365GroupRecycleBinItemRestoreCommand_initTelemetry, _AadO365GroupRecycleBinItemRestoreCommand_initOptions, _AadO365GroupRecycleBinItemRestoreCommand_initValidators, _AadO365GroupRecycleBinItemRestoreCommand_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 AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
@@ -34,27 +35,27 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
     get description() {
         return 'Restores a deleted Microsoft 365 Group';
     }
-    alias() {
-        return [commands_1.default.O365GROUP_RESTORE];
-    }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Restoring Microsoft 365 Group: ${args.options.id || args.options.displayName || args.options.mailNickname}...`);
-        }
-        this
-            .getGroupId(args.options)
-            .then((groupId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/directory/deleteditems/${groupId}/restore`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Restoring Microsoft 365 Group: ${args.options.id || args.options.displayName || args.options.mailNickname}...`);
+            }
+            try {
+                const groupId = yield this.getGroupId(args.options);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/directory/deleteditems/${groupId}/restore`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getGroupId(options) {
         const { id, displayName, mailNickname } = options;
@@ -63,10 +64,10 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
         }
         let filterValue = '';
         if (displayName) {
-            filterValue = `displayName eq '${utils_1.formatting.encodeQueryParameter(displayName)}'`;
+            filterValue = `displayName eq '${formatting_1.formatting.encodeQueryParameter(displayName)}'`;
         }
         if (mailNickname) {
-            filterValue = `mailNickname eq '${utils_1.formatting.encodeQueryParameter(mailNickname)}'`;
+            filterValue = `mailNickname eq '${formatting_1.formatting.encodeQueryParameter(mailNickname)}'`;
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
@@ -107,7 +108,7 @@ _AadO365GroupRecycleBinItemRestoreCommand_instances = new WeakSet(), _AadO365Gro
     });
 }, _AadO365GroupRecycleBinItemRestoreCommand_initValidators = function _AadO365GroupRecycleBinItemRestoreCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRemoveCommand_instances, _AadO365GroupRemoveCommand_initTelemetry, _AadO365GroupRemoveCommand_initOptions, _AadO365GroupRemoveCommand_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 AadO365GroupRemoveCommand extends GraphCommand_1.default {
@@ -34,51 +34,49 @@ class AadO365GroupRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes an Microsoft 365 Group';
     }
-    commandAction(logger, args, cb) {
-        const removeGroup = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${args.options.id}`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                }
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(() => {
-                if (!args.options.skipRecycleBin) {
-                    return Promise.resolve();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeGroup = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
                 }
-                const requestOptions2 = {
-                    url: `${this.resource}/v1.0/directory/deletedItems/${args.options.id}`,
-                    headers: {
-                        'accept': 'application/json;odata.metadata=none'
+                try {
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                        headers: {
+                            'accept': 'application/json;odata.metadata=none'
+                        }
+                    };
+                    yield request_1.default.delete(requestOptions);
+                    if (args.options.skipRecycleBin) {
+                        const requestOptions2 = {
+                            url: `${this.resource}/v1.0/directory/deletedItems/${args.options.id}`,
+                            headers: {
+                                'accept': 'application/json;odata.metadata=none'
+                            }
+                        };
+                        yield request_1.default.delete(requestOptions2);
                     }
-                };
-                return request_1.default.delete(requestOptions2);
-            })
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeGroup();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group ${args.options.id}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
                 }
-                else {
-                    removeGroup();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeGroup();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the group ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield removeGroup();
+                }
+            }
+        });
     }
 }
 _AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand_initTelemetry = function _AadO365GroupRemoveCommand_initTelemetry() {
@@ -98,7 +96,7 @@ _AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand
     });
 }, _AadO365GroupRemoveCommand_initValidators = function _AadO365GroupRemoveCommand_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/aad/commands/o365group/o365group-renew.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupRenewCommand_instances, _AadO365GroupRenewCommand_initOptions, _AadO365GroupRenewCommand_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 AadO365GroupRenewCommand extends GraphCommand_1.default {
@@ -32,19 +32,24 @@ class AadO365GroupRenewCommand extends GraphCommand_1.default {
     get description() {
         return `Renews Microsoft 365 group's expiration`;
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups/${args.options.id}/renew/`,
-            headers: {
-                'accept': 'application/json;odata.metadata=none'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
+            }
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${args.options.id}/renew/`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    }
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _AadO365GroupRenewCommand_instances = new WeakSet(), _AadO365GroupRenewCommand_initOptions = function _AadO365GroupRenewCommand_initOptions() {
@@ -53,7 +58,7 @@ _AadO365GroupRenewCommand_instances = new WeakSet(), _AadO365GroupRenewCommand_i
     });
 }, _AadO365GroupRenewCommand_initValidators = function _AadO365GroupRenewCommand_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/aad/commands/o365group/o365group-set.js

@@ -18,7 +18,7 @@ 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 AadO365GroupSetCommand extends GraphCommand_1.default {
@@ -35,129 +35,111 @@ class AadO365GroupSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates Microsoft 365 Group properties';
     }
-    commandAction(logger, args, cb) {
-        (() => {
-            if (!args.options.displayName &&
-                !args.options.description &&
-                typeof args.options.isPrivate === 'undefined') {
-                return Promise.resolve();
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
-            }
-            const update = {};
-            if (args.options.displayName) {
-                update.displayName = args.options.displayName;
-            }
-            if (args.options.description) {
-                update.description = args.options.description;
-            }
-            if (typeof args.options.isPrivate !== 'undefined') {
-                update.visibility = args.options.isPrivate === 'true' ? 'Private' : 'Public';
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${args.options.id}`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: update
-            };
-            return request_1.default.patch(requestOptions);
-        })()
-            .then(() => {
-            if (!args.options.logoPath) {
-                if (this.debug) {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.displayName || args.options.description || typeof args.options.isPrivate !== 'undefined') {
+                    if (this.verbose) {
+                        logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
+                    }
+                    const update = {};
+                    if (args.options.displayName) {
+                        update.displayName = args.options.displayName;
+                    }
+                    if (args.options.description) {
+                        update.description = args.options.description;
+                    }
+                    if (typeof args.options.isPrivate !== 'undefined') {
+                        update.visibility = args.options.isPrivate === 'true' ? 'Private' : 'Public';
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                        headers: {
+                            'accept': 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json',
+                        data: update
+                    };
+                    yield request_1.default.patch(requestOptions);
+                }
+                if (args.options.logoPath) {
+                    const fullPath = path.resolve(args.options.logoPath);
+                    if (this.verbose) {
+                        logger.logToStderr(`Setting group logo ${fullPath}...`);
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${args.options.id}/photo/$value`,
+                        headers: {
+                            'content-type': this.getImageContentType(fullPath)
+                        },
+                        data: fs.readFileSync(fullPath)
+                    };
+                    yield new Promise((resolve, reject) => {
+                        this.setGroupLogo(requestOptions, AadO365GroupSetCommand.numRepeat, resolve, reject, logger);
+                    });
+                }
+                else if (this.debug) {
                     logger.logToStderr('logoPath not set. Skipping');
                 }
-                return Promise.resolve();
-            }
-            const fullPath = path.resolve(args.options.logoPath);
-            if (this.verbose) {
-                logger.logToStderr(`Setting group logo ${fullPath}...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${args.options.id}/photo/$value`,
-                headers: {
-                    'content-type': this.getImageContentType(fullPath)
-                },
-                data: fs.readFileSync(fullPath)
-            };
-            return new Promise((resolve, reject) => {
-                this.setGroupLogo(requestOptions, AadO365GroupSetCommand.numRepeat, resolve, reject, logger);
-            });
-        })
-            .then(() => {
-            if (!args.options.owners) {
-                if (this.debug) {
+                if (args.options.owners) {
+                    const owners = args.options.owners.split(',').map(o => o.trim());
+                    if (this.verbose) {
+                        logger.logToStderr('Retrieving user information to set group owners...');
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    const res = yield request_1.default.get(requestOptions);
+                    yield Promise.all(res.value.map(u => request_1.default.post({
+                        url: `${this.resource}/v1.0/groups/${args.options.id}/owners/$ref`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json',
+                        data: {
+                            "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                        }
+                    })));
+                }
+                else if (this.debug) {
                     logger.logToStderr('Owners not set. Skipping');
                 }
-                return Promise.resolve(undefined);
-            }
-            const owners = args.options.owners.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group owners...');
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
-            }
-            return Promise.all(res.value.map(u => request_1.default.post({
-                url: `${this.resource}/v1.0/groups/${args.options.id}/owners/$ref`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                if (args.options.members) {
+                    const members = args.options.members.split(',').map(o => o.trim());
+                    if (this.verbose) {
+                        logger.logToStderr('Retrieving user information to set group members...');
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/users?$filter=${members.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    const res = yield request_1.default.get(requestOptions);
+                    yield Promise.all(res.value.map(u => request_1.default.post({
+                        url: `${this.resource}/v1.0/groups/${args.options.id}/members/$ref`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json',
+                        data: {
+                            "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                        }
+                    })));
                 }
-            })));
-        })
-            .then(() => {
-            if (!args.options.members) {
-                if (this.debug) {
+                else if (this.debug) {
                     logger.logToStderr('Members not set. Skipping');
                 }
-                return Promise.resolve(undefined);
-            }
-            const members = args.options.members.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group members...');
             }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${members.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            return Promise.all(res.value.map(u => request_1.default.post({
-                url: `${this.resource}/v1.0/groups/${args.options.id}/members/$ref`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
-                }
-            })));
-        })
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
     setGroupLogo(requestOptions, retryLeft, resolve, reject, logger) {
         request_1.default
@@ -229,7 +211,7 @@ _AadO365GroupSetCommand_instances = new WeakSet(), _AadO365GroupSetCommand_initT
             !args.options.logoPath) {
             return 'Specify at least one property to update';
         }
-        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.owners) {

package/dist/m365/aad/commands/o365group/o365group-teamify.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 _AadO365GroupTeamifyCommand_instances, _AadO365GroupTeamifyCommand_initTelemetry, _AadO365GroupTeamifyCommand_initOptions, _AadO365GroupTeamifyCommand_initValidators;
+var _AadO365GroupTeamifyCommand_instances, _AadO365GroupTeamifyCommand_initTelemetry, _AadO365GroupTeamifyCommand_initOptions, _AadO365GroupTeamifyCommand_initValidators, _AadO365GroupTeamifyCommand_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 AadO365GroupTeamifyCommand extends GraphCommand_1.default {
@@ -26,6 +26,7 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.O365GROUP_TEAMIFY;
@@ -34,8 +35,8 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         return 'Creates a new Microsoft Teams team under existing Microsoft 365 group';
     }
     getGroupId(args) {
-        if (args.options.groupId) {
-            return Promise.resolve(args.options.groupId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${encodeURIComponent(args.options.mailNickname)}'`,
@@ -57,63 +58,62 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
             return Promise.resolve(groupItem.id);
         });
     }
-    commandAction(logger, args, cb) {
-        const data = {
-            "memberSettings": {
-                "allowCreatePrivateChannels": true,
-                "allowCreateUpdateChannels": true
-            },
-            "messagingSettings": {
-                "allowUserEditMessages": true,
-                "allowUserDeleteMessages": true
-            },
-            "funSettings": {
-                "allowGiphy": true,
-                "giphyContentRating": "strict"
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const data = {
+                    "memberSettings": {
+                        "allowCreatePrivateChannels": true,
+                        "allowCreateUpdateChannels": true
+                    },
+                    "messagingSettings": {
+                        "allowUserEditMessages": true,
+                        "allowUserDeleteMessages": true
+                    },
+                    "funSettings": {
+                        "allowGiphy": true,
+                        "giphyContentRating": "strict"
+                    }
+                };
+                const groupId = yield this.getGroupId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${encodeURIComponent(groupId)}/team`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    data: data,
+                    responseType: 'json'
+                };
+                yield request_1.default.put(requestOptions);
             }
-        };
-        this
-            .getGroupId(args)
-            .then((groupId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${encodeURIComponent(groupId)}/team`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                data: data,
-                responseType: 'json'
-            };
-            return request_1.default.put(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyCommand_initTelemetry = function _AadO365GroupTeamifyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined'
         });
     });
 }, _AadO365GroupTeamifyCommand_initOptions = function _AadO365GroupTeamifyCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --groupId [groupId]'
+        option: '-i, --id [id]'
     }, {
         option: '--mailNickname [mailNickname]'
     });
 }, _AadO365GroupTeamifyCommand_initValidators = function _AadO365GroupTeamifyCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && args.options.mailNickname) {
-            return 'Specify either groupId or mailNickname, but not both.';
-        }
-        if (!args.options.groupId && !args.options.mailNickname) {
-            return 'Specify groupId or mailNickname, one is required';
-        }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadO365GroupTeamifyCommand_initOptionSets = function _AadO365GroupTeamifyCommand_initOptionSets() {
+    this.optionSets.push(['id', 'mailNickname']);
 };
 module.exports = new AadO365GroupTeamifyCommand();
 //# sourceMappingURL=o365group-teamify.js.map