@pnp/cli-microsoft365 6.0.0-beta.f94d570 → 6.0.0-beta.fcd2cc9

package/dist/m365/spo/commands/group/group-remove.js

@@ -1,116 +1,127 @@
 "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 _SpoGroupRemoveCommand_instances, _SpoGroupRemoveCommand_initTelemetry, _SpoGroupRemoveCommand_initOptions, _SpoGroupRemoveCommand_initValidators, _SpoGroupRemoveCommand_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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoGroupRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupRemoveCommand_instances, "m", _SpoGroupRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.GROUP_REMOVE;
     }
     get description() {
         return 'Removes group from specific web';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = (!(!args.options.id)).toString();
-        telemetryProps.name = (!(!args.options.name)).toString();
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const removeGroup = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing group in web at ${args.options.webUrl}...`);
-            }
-            let groupId;
-            (() => {
-                if (args.options.name) {
+    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 group in web at ${args.options.webUrl}...`);
+                }
+                try {
+                    let groupId;
+                    if (args.options.name) {
+                        const requestOptions = {
+                            url: `${args.options.webUrl}/_api/web/sitegroups/GetByName('${args.options.name}')?$select=Id`,
+                            headers: {
+                                accept: 'application/json'
+                            },
+                            responseType: 'json'
+                        };
+                        const group = yield request_1.default.get(requestOptions);
+                        groupId = group.Id;
+                    }
+                    else {
+                        groupId = args.options.id;
+                    }
+                    const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/RemoveById(${groupId})`;
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/sitegroups/GetByName('${args.options.name}')?$select=Id`,
+                        url: requestUrl,
+                        method: 'POST',
                         headers: {
-                            accept: 'application/json'
+                            'content-length': 0,
+                            'accept': 'application/json'
                         },
                         responseType: 'json'
                     };
-                    return request_1.default.get(requestOptions);
+                    yield request_1.default.post(requestOptions);
+                    // REST post call doesn't return anything
                 }
-                groupId = args.options.id;
-                return Promise.resolve(undefined);
-            })().then((res) => {
-                if (res && res.Id) {
-                    groupId = res.Id;
-                }
-                const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/RemoveById(${groupId})`;
-                const requestOptions = {
-                    url: requestUrl,
-                    method: 'POST',
-                    headers: {
-                        'content-length': 0,
-                        'accept': 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            }).then(() => {
-                // REST post call doesn't return anything
-                cb();
-            }, (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.name} from web ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeGroup();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--id [id]'
-            },
-            {
-                option: '--name [name]'
-            },
-            {
-                option: '--confirm'
+            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.name} from web ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeGroup();
+                }
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTelemetry = function _SpoGroupRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: (!(!args.options.id)).toString(),
+            name: (!(!args.options.name)).toString(),
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoGroupRemoveCommand_initOptions = function _SpoGroupRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--id [id]'
+    }, {
+        option: '--name [name]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoGroupRemoveCommand_initValidators = function _SpoGroupRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id && args.options.name) {
-            return 'Specify id or name, but not both';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify id or name';
-        }
         if (args.options.id && typeof args.options.id !== 'number') {
             return `${args.options.id} is not a number`;
         }
         return true;
-    }
-}
+    }));
+}, _SpoGroupRemoveCommand_initOptionSets = function _SpoGroupRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new SpoGroupRemoveCommand();
 //# sourceMappingURL=group-remove.js.map

package/dist/m365/spo/commands/group/group-set.js

@@ -1,55 +1,68 @@
 "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 _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupSetCommand_initOptions, _SpoGroupSetCommand_initValidators, _SpoGroupSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
-const cli_1 = require("../../../../cli");
-const utils_1 = require("../../../../utils");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoGroupSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupSetCommand_instances, "m", _SpoGroupSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupSetCommand_instances, "m", _SpoGroupSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupSetCommand_instances, "m", _SpoGroupSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupSetCommand_instances, "m", _SpoGroupSetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.GROUP_SET;
     }
     get description() {
         return 'Updates a group in the specified site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.newName = typeof args.options.newName !== 'undefined';
-        telemetryProps.description = typeof args.options.description !== 'undefined';
-        telemetryProps.allowMembersEditMembership = typeof args.options.allowMembersEditMembership !== 'undefined';
-        telemetryProps.onlyAllowMembersViewMembership = typeof args.options.onlyAllowMembersViewMembership !== 'undefined';
-        telemetryProps.allowRequestToJoinLeave = typeof args.options.allowRequestToJoinLeave !== 'undefined';
-        telemetryProps.autoAcceptRequestToJoinLeave = typeof args.options.autoAcceptRequestToJoinLeave !== 'undefined';
-        telemetryProps.requestToJoinLeaveEmailSetting = typeof args.options.requestToJoinLeaveEmailSetting !== 'undefined';
-        telemetryProps.ownerEmail = typeof args.options.ownerEmail !== 'undefined';
-        telemetryProps.ownerUserName = typeof args.options.ownerUserName !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/sitegroups/${args.options.id ? `GetById(${args.options.id})` : `GetByName('${args.options.name}')`}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
-            },
-            responseType: 'json',
-            data: {
-                Title: args.options.newName,
-                Description: args.options.description,
-                AllowMembersEditMembership: args.options.allowMembersEditMembership,
-                OnlyAllowMembersViewMembership: args.options.onlyAllowMembersViewMembership,
-                AllowRequestToJoinLeave: args.options.allowRequestToJoinLeave,
-                AutoAcceptRequestToJoinLeave: args.options.autoAcceptRequestToJoinLeave,
-                RequestToJoinLeaveEmailSetting: args.options.requestToJoinLeaveEmailSetting
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/sitegroups/${args.options.id ? `GetById(${args.options.id})` : `GetByName('${args.options.name}')`}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    Title: args.options.newName,
+                    Description: args.options.description,
+                    AllowMembersEditMembership: args.options.allowMembersEditMembership,
+                    OnlyAllowMembersViewMembership: args.options.onlyAllowMembersViewMembership,
+                    AllowRequestToJoinLeave: args.options.allowRequestToJoinLeave,
+                    AutoAcceptRequestToJoinLeave: args.options.autoAcceptRequestToJoinLeave,
+                    RequestToJoinLeaveEmailSetting: args.options.requestToJoinLeaveEmailSetting
+                }
+            };
+            try {
+                yield request_1.default.patch(requestOptions);
+                yield this.setGroupOwner(args.options);
             }
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then(() => this.setGroupOwner(args.options))
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     setGroupOwner(options) {
         if (!options.ownerEmail && !options.ownerUserName) {
@@ -77,7 +90,7 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
             debug: options.debug,
             verbose: options.verbose
         };
-        return cli_1.Cli
+        return Cli_1.Cli
             .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, cmdOptions), { _: [] }) })
             .then((output) => {
             const getUserOutput = JSON.parse(output.stdout);
@@ -93,55 +106,52 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
         })
             .then((response) => response.Id);
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--newName [newName]'
-            },
-            {
-                option: '--description [description]'
-            },
-            {
-                option: '--allowMembersEditMembership [allowMembersEditMembership]'
-            },
-            {
-                option: '--onlyAllowMembersViewMembership [onlyAllowMembersViewMembership]'
-            },
-            {
-                option: '--allowRequestToJoinLeave [allowRequestToJoinLeave]'
-            },
-            {
-                option: '--autoAcceptRequestToJoinLeave [autoAcceptRequestToJoinLeave]'
-            },
-            {
-                option: '--requestToJoinLeaveEmailSetting [requestToJoinLeaveEmailSetting]'
-            },
-            {
-                option: '--ownerEmail [ownerEmail]'
-            },
-            {
-                option: '--ownerUserName [ownerUserName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    optionSets() {
-        return [
-            ['id', 'name']
-        ];
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry = function _SpoGroupSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            allowMembersEditMembership: typeof args.options.allowMembersEditMembership !== 'undefined',
+            onlyAllowMembersViewMembership: typeof args.options.onlyAllowMembersViewMembership !== 'undefined',
+            allowRequestToJoinLeave: typeof args.options.allowRequestToJoinLeave !== 'undefined',
+            autoAcceptRequestToJoinLeave: typeof args.options.autoAcceptRequestToJoinLeave !== 'undefined',
+            requestToJoinLeaveEmailSetting: typeof args.options.requestToJoinLeaveEmailSetting !== 'undefined',
+            ownerEmail: typeof args.options.ownerEmail !== 'undefined',
+            ownerUserName: typeof args.options.ownerUserName !== 'undefined'
+        });
+    });
+}, _SpoGroupSetCommand_initOptions = function _SpoGroupSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--newName [newName]'
+    }, {
+        option: '--description [description]'
+    }, {
+        option: '--allowMembersEditMembership [allowMembersEditMembership]'
+    }, {
+        option: '--onlyAllowMembersViewMembership [onlyAllowMembersViewMembership]'
+    }, {
+        option: '--allowRequestToJoinLeave [allowRequestToJoinLeave]'
+    }, {
+        option: '--autoAcceptRequestToJoinLeave [autoAcceptRequestToJoinLeave]'
+    }, {
+        option: '--requestToJoinLeaveEmailSetting [requestToJoinLeaveEmailSetting]'
+    }, {
+        option: '--ownerEmail [ownerEmail]'
+    }, {
+        option: '--ownerUserName [ownerUserName]'
+    });
+}, _SpoGroupSetCommand_initValidators = function _SpoGroupSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -156,12 +166,14 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
             args.options.allowRequestToJoinLeave, args.options.autoAcceptRequestToJoinLeave
         ];
         for (const option of booleanOptions) {
-            if (typeof option !== 'undefined' && !utils_1.validation.isValidBoolean(option)) {
+            if (typeof option !== 'undefined' && !validation_1.validation.isValidBoolean(option)) {
                 return `Value '${option}' is not a valid boolean`;
             }
         }
         return true;
-    }
-}
+    }));
+}, _SpoGroupSetCommand_initOptionSets = function _SpoGroupSetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new SpoGroupSetCommand();
 //# sourceMappingURL=group-set.js.map

package/dist/m365/spo/commands/group/group-user-add.js

@@ -1,13 +1,35 @@
 "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 _SpoGroupUserAddCommand_instances, _SpoGroupUserAddCommand_initTelemetry, _SpoGroupUserAddCommand_initOptions, _SpoGroupUserAddCommand_initValidators, _SpoGroupUserAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
-const Command_1 = require("../../../../Command");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupUserAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoGroupUserAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.GROUP_USER_ADD;
     }
@@ -17,41 +39,38 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['DisplayName', 'Email'];
     }
-    commandAction(logger, args, cb) {
-        let groupId = 0;
-        this
-            .getGroupId(args)
-            .then((_groupId) => {
-            groupId = _groupId;
-            return this.getValidUsers(args, logger);
-        })
-            .then((resolvedUsernameList) => {
-            if (this.verbose) {
-                logger.logToStderr(`Start adding Active user/s to SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const groupId = yield this.getGroupId(args);
+                const resolvedUsernameList = yield this.getValidUsers(args, logger);
+                if (this.verbose) {
+                    logger.logToStderr(`Start adding Active user/s to SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+                }
+                const data = {
+                    url: args.options.webUrl,
+                    peoplePickerInput: this.getFormattedUserList(resolvedUsernameList),
+                    roleValue: `group:${groupId}`
+                };
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/SP.Web.ShareObject`,
+                    headers: {
+                        'Accept': 'application/json;odata=nometadata',
+                        'Content-type': 'application/json;odata=verbose'
+                    },
+                    data: data,
+                    responseType: 'json'
+                };
+                const sharingResult = yield request_1.default.post(requestOptions);
+                if (sharingResult.ErrorMessage !== null) {
+                    throw sharingResult.ErrorMessage;
+                }
+                logger.log(sharingResult.UsersAddedToGroup);
             }
-            const data = {
-                url: args.options.webUrl,
-                peoplePickerInput: this.getFormattedUserList(resolvedUsernameList),
-                roleValue: `group:${groupId}`
-            };
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP.Web.ShareObject`,
-                headers: {
-                    'Accept': 'application/json;odata=nometadata',
-                    'Content-type': 'application/json;odata=verbose'
-                },
-                data: data,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((sharingResult) => {
-            if (sharingResult.ErrorMessage !== null) {
-                return cb(new Command_1.CommandError(sharingResult.ErrorMessage));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(sharingResult.UsersAddedToGroup);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getGroupId(args) {
         const getGroupMethod = args.options.groupName ?
@@ -94,7 +113,7 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
             else {
                 options.email = singleUserName.trim();
             }
-            return cli_1.Cli
+            return Cli_1.Cli
                 .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
                 .then((getUserGetOutput) => {
                 if (this.debug) {
@@ -121,49 +140,41 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
         }));
         return generatedPeoplePicker;
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--groupId [groupId]'
-            },
-            {
-                option: '--groupName [groupName]'
-            },
-            {
-                option: '--userName [userName]'
-            },
-            {
-                option: '--email [email]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_SpoGroupUserAddCommand_instances = new WeakSet(), _SpoGroupUserAddCommand_initTelemetry = function _SpoGroupUserAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            email: typeof args.options.email !== 'undefined'
+        });
+    });
+}, _SpoGroupUserAddCommand_initOptions = function _SpoGroupUserAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--email [email]'
+    });
+}, _SpoGroupUserAddCommand_initValidators = function _SpoGroupUserAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.groupId && !args.options.groupName) {
-            return 'Specify either groupId or groupName';
-        }
-        if (args.options.groupId && args.options.groupName) {
-            return 'Specify either groupId or groupName but not both';
-        }
-        if (!args.options.userName && !args.options.email) {
-            return 'Specify either userName or email';
-        }
-        if (args.options.userName && args.options.email) {
-            return 'Specify either userName or email but not both';
-        }
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified groupId ${args.options.groupId} is not a number`;
         }
         return true;
-    }
-}
+    }));
+}, _SpoGroupUserAddCommand_initOptionSets = function _SpoGroupUserAddCommand_initOptionSets() {
+    this.optionSets.push(['groupId', 'groupName'], ['userName', 'email']);
+};
 module.exports = new SpoGroupUserAddCommand();
 //# sourceMappingURL=group-user-add.js.map