@pnp/cli-microsoft365 6.0.0-beta.27e1012 → 6.0.0-beta.2ab70db

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

@@ -1,81 +1,98 @@
 "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 _SpoGroupAddCommand_instances, _SpoGroupAddCommand_initTelemetry, _SpoGroupAddCommand_initOptions, _SpoGroupAddCommand_initValidators, _SpoGroupAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoGroupAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupAddCommand_instances, "m", _SpoGroupAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupAddCommand_instances, "m", _SpoGroupAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupAddCommand_instances, "m", _SpoGroupAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupAddCommand_instances, "m", _SpoGroupAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.GROUP_ADD;
     }
     get description() {
         return 'Creates group in the specified site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        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';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/sitegroups`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: {
-                Title: args.options.name,
-                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`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    Title: args.options.name,
+                    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 {
+                const response = yield request_1.default.post(requestOptions);
+                logger.log(response);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((response) => {
-            logger.log(response);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: '--description [description]'
-            },
-            {
-                option: '--allowMembersEditMembership [allowMembersEditMembership]'
-            },
-            {
-                option: '--onlyAllowMembersViewMembership [onlyAllowMembersViewMembership]'
-            },
-            {
-                option: '--allowRequestToJoinLeave [allowRequestToJoinLeave]'
-            },
-            {
-                option: '--autoAcceptRequestToJoinLeave [autoAcceptRequestToJoinLeave]'
-            },
-            {
-                option: '--requestToJoinLeaveEmailSetting [requestToJoinLeaveEmailSetting]'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
+}
+_SpoGroupAddCommand_instances = new WeakSet(), _SpoGroupAddCommand_initTelemetry = function _SpoGroupAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            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'
+        });
+    });
+}, _SpoGroupAddCommand_initOptions = function _SpoGroupAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-n, --name <name>'
+    }, {
+        option: '--description [description]'
+    }, {
+        option: '--allowMembersEditMembership [allowMembersEditMembership]'
+    }, {
+        option: '--onlyAllowMembersViewMembership [onlyAllowMembersViewMembership]'
+    }, {
+        option: '--allowRequestToJoinLeave [allowRequestToJoinLeave]'
+    }, {
+        option: '--autoAcceptRequestToJoinLeave [autoAcceptRequestToJoinLeave]'
+    }, {
+        option: '--requestToJoinLeaveEmailSetting [requestToJoinLeaveEmailSetting]'
+    });
+}, _SpoGroupAddCommand_initValidators = function _SpoGroupAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
@@ -90,7 +107,9 @@ class SpoGroupAddCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+}, _SpoGroupAddCommand_initOptionSets = function _SpoGroupAddCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new SpoGroupAddCommand();
 //# sourceMappingURL=group-add.js.map

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

@@ -1,75 +1,113 @@
 "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 _SpoGroupGetCommand_instances, _SpoGroupGetCommand_initTelemetry, _SpoGroupGetCommand_initOptions, _SpoGroupGetCommand_initValidators, _SpoGroupGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoGroupGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupGetCommand_instances, "m", _SpoGroupGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupGetCommand_instances, "m", _SpoGroupGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupGetCommand_instances, "m", _SpoGroupGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupGetCommand_instances, "m", _SpoGroupGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.GROUP_GET;
     }
     get description() {
         return 'Gets site group';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = (!(!args.options.id)).toString();
-        telemetryProps.name = (!(!args.options.name)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information for group in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetById('${encodeURIComponent(args.options.id)}')`;
-        }
-        else if (args.options.name) {
-            requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetByName('${encodeURIComponent(args.options.name)}')`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((groupInstance) => {
-            logger.log(groupInstance);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '--name [name]'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information for group in site at ${args.options.webUrl}...`);
+            }
+            let requestUrl = '';
+            if (args.options.id) {
+                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetById('${encodeURIComponent(args.options.id)}')`;
+            }
+            else if (args.options.name) {
+                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetByName('${encodeURIComponent(args.options.name)}')`;
+            }
+            else if (args.options.associatedGroup) {
+                switch (args.options.associatedGroup.toLowerCase()) {
+                    case 'owner':
+                        requestUrl = `${args.options.webUrl}/_api/web/AssociatedOwnerGroup`;
+                        break;
+                    case 'member':
+                        requestUrl = `${args.options.webUrl}/_api/web/AssociatedMemberGroup`;
+                        break;
+                    case 'visitor':
+                        requestUrl = `${args.options.webUrl}/_api/web/AssociatedVisitorGroup`;
+                        break;
+                }
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            const requestOptions = {
+                url: requestUrl,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const groupInstance = yield request_1.default.get(requestOptions);
+                logger.log(groupInstance);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    validate(args) {
-        if (args.options.id && args.options.name) {
-            return 'Use either "id" or "name", but not all.';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify id or name, one is required';
-        }
+}
+_SpoGroupGetCommand_instances = new WeakSet(), _SpoGroupGetCommand_initTelemetry = function _SpoGroupGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: (!(!args.options.id)).toString(),
+            name: (!(!args.options.name)).toString(),
+            associatedGroup: args.options.associatedGroup
+        });
+    });
+}, _SpoGroupGetCommand_initOptions = function _SpoGroupGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '--name [name]'
+    }, {
+        option: '--associatedGroup [associatedGroup]',
+        autocomplete: ['Owner', 'Member', 'Visitor']
+    });
+}, _SpoGroupGetCommand_initValidators = function _SpoGroupGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id && isNaN(args.options.id)) {
             return `Specified id ${args.options.id} is not a number`;
         }
+        if (args.options.associatedGroup && ['owner', 'member', 'visitor'].indexOf(args.options.associatedGroup.toLowerCase()) === -1) {
+            return `${args.options.associatedGroup} is not a valid associatedGroup value. Allowed values are Owner|Member|Visitor.`;
+        }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
-}
+    }));
+}, _SpoGroupGetCommand_initOptionSets = function _SpoGroupGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name', 'associatedGroup']);
+};
 module.exports = new SpoGroupGetCommand();
 //# sourceMappingURL=group-get.js.map

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

@@ -1,10 +1,31 @@
 "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 _SpoGroupListCommand_instances, _SpoGroupListCommand_initOptions, _SpoGroupListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupListCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoGroupListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupListCommand_instances, "m", _SpoGroupListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupListCommand_instances, "m", _SpoGroupListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.GROUP_LIST;
     }
@@ -14,37 +35,35 @@ class SpoGroupListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Title', 'LoginName', 'IsHiddenInUI', 'PrincipalType'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of groups for specified web at ${args.options.webUrl}...`);
-        }
-        const requestUrl = `${args.options.webUrl}/_api/web/sitegroups`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((groupProperties) => {
-            logger.log(groupProperties.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of groups for specified web at ${args.options.webUrl}...`);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+            const requestUrl = `${args.options.webUrl}/_api/web/sitegroups`;
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const groupProperties = yield request_1.default.get(requestOptions);
+                logger.log(groupProperties.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
+_SpoGroupListCommand_instances = new WeakSet(), _SpoGroupListCommand_initOptions = function _SpoGroupListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    });
+}, _SpoGroupListCommand_initValidators = function _SpoGroupListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+};
 module.exports = new SpoGroupListCommand();
 //# sourceMappingURL=group-list.js.map

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

@@ -1,4 +1,19 @@
 "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 request_1 = require("../../../../request");
@@ -6,111 +21,107 @@ const utils_1 = require("../../../../utils");
 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) {
+}
+_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 = utils_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