@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.119711d

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

@@ -1,4 +1,13 @@
 "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");
@@ -25,18 +34,21 @@ class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName', 'mailNickname'];
     }
-    commandAction(logger, args, cb) {
-        const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-        const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.displayName).replace(/'/g, `''`)}')` : '';
-        const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
-        const topCount = '&$top=100';
-        const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((recycleBinItems) => {
-            logger.log(recycleBinItems);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
+                const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.displayName).replace(/'/g, `''`)}')` : '';
+                const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
+                const topCount = '&$top=100';
+                const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
+                const recycleBinItems = yield utils_1.odata.getAllItems(endpoint);
+                logger.log(recycleBinItems);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadO365GroupRecycleBinItemListCommand_instances = new WeakSet(), _AadO365GroupRecycleBinItemListCommand_initTelemetry = function _AadO365GroupRecycleBinItemListCommand_initTelemetry() {

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

@@ -35,42 +35,39 @@ class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Permanently deletes a Microsoft 365 Group from the recycle bin in the current tenant';
     }
-    commandAction(logger, args, cb) {
-        const removeGroup = () => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const groupId = yield this.getGroupId(args.options);
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/directory/deletedItems/${groupId}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                yield request_1.default.delete(requestOptions);
-                cb();
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err, 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 || args.options.displayName || args.options.mailNickname}'?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeGroup = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const groupId = yield this.getGroupId(args.options);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/directory/deletedItems/${groupId}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                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 || args.options.displayName || args.options.mailNickname}'?`
+                });
+                if (result.continue) {
+                    yield removeGroup();
+                }
+            }
+        });
     }
     getGroupId(options) {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -37,24 +37,27 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
     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;

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

@@ -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() {

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

@@ -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() {

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

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

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

@@ -13,7 +13,7 @@ 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");
@@ -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;
@@ -57,35 +58,38 @@ 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() {
@@ -103,17 +107,13 @@ _AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyComma
     });
 }, _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`;
         }
         return true;
     }));
+}, _AadO365GroupTeamifyCommand_initOptionSets = function _AadO365GroupTeamifyCommand_initOptionSets() {
+    this.optionSets.push(['groupId', 'mailNickname']);
 };
 module.exports = new AadO365GroupTeamifyCommand();
 //# sourceMappingURL=o365group-teamify.js.map