@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

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

@@ -35,24 +35,27 @@ 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));
+    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 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() {

package/dist/m365/spo/commands/group/group-remove.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 _SpoGroupRemoveCommand_instances, _SpoGroupRemoveCommand_initTelemetry, _SpoGroupRemoveCommand_initOptions, _SpoGroupRemoveCommand_initValidators;
+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");
@@ -27,6 +27,7 @@ class SpoGroupRemoveCommand extends SpoCommand_1.default {
         __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;
@@ -34,63 +35,60 @@ class SpoGroupRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes group from specific web';
     }
-    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);
-                }
-                groupId = args.options.id;
-                return Promise.resolve(undefined);
-            })().then((res) => {
-                if (res && res.Id) {
-                    groupId = res.Id;
+                    yield request_1.default.post(requestOptions);
+                    // REST post call doesn't return anything
                 }
-                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);
                 }
             });
-        }
+            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();
+                }
+            }
+        });
     }
 }
 _SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTelemetry = function _SpoGroupRemoveCommand_initTelemetry() {
@@ -117,17 +115,13 @@ _SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTel
         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

@@ -36,28 +36,33 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates a group in the specified site';
     }
-    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) {

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

@@ -13,10 +13,9 @@ 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 _SpoGroupUserAddCommand_instances, _SpoGroupUserAddCommand_initTelemetry, _SpoGroupUserAddCommand_initOptions, _SpoGroupUserAddCommand_initValidators;
+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 request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
@@ -29,6 +28,7 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
         __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;
@@ -39,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 ?
@@ -171,23 +168,13 @@ _SpoGroupUserAddCommand_instances = new WeakSet(), _SpoGroupUserAddCommand_initT
         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

package/dist/m365/spo/commands/group/group-user-list.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 _SpoGroupUserListCommand_instances, _SpoGroupUserListCommand_initTelemetry, _SpoGroupUserListCommand_initOptions, _SpoGroupUserListCommand_initValidators;
+var _SpoGroupUserListCommand_instances, _SpoGroupUserListCommand_initTelemetry, _SpoGroupUserListCommand_initOptions, _SpoGroupUserListCommand_initValidators, _SpoGroupUserListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.GROUP_USER_LIST;
@@ -36,26 +37,29 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'UserPrincipalName', 'Id', 'Email'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving the list of members from the SharePoint group :  ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
-        }
-        const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-            ? `GetById('${encodeURIComponent(args.options.groupId)}')`
-            : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((response) => {
-            logger.log(response);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving the list of members from the SharePoint group :  ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+            }
+            const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
+                ? `GetById('${encodeURIComponent(args.options.groupId)}')`
+                : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users`;
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const response = yield request_1.default.get(requestOptions);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoGroupUserListCommand_instances = new WeakSet(), _SpoGroupUserListCommand_initTelemetry = function _SpoGroupUserListCommand_initTelemetry() {
@@ -75,17 +79,13 @@ _SpoGroupUserListCommand_instances = new WeakSet(), _SpoGroupUserListCommand_ini
     });
 }, _SpoGroupUserListCommand_initValidators = function _SpoGroupUserListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && args.options.groupName) {
-            return 'Use either "groupName" or "groupId", but not both';
-        }
-        if (!args.options.groupId && !args.options.groupName) {
-            return 'Either "groupName" or "groupId" is required';
-        }
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoGroupUserListCommand_initOptionSets = function _SpoGroupUserListCommand_initOptionSets() {
+    this.optionSets.push(['groupName', 'groupId']);
 };
 module.exports = new SpoGroupUserListCommand();
 //# sourceMappingURL=group-user-list.js.map

package/dist/m365/spo/commands/group/group-user-remove.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 _SpoGroupUserRemoveCommand_instances, _SpoGroupUserRemoveCommand_initTelemetry, _SpoGroupUserRemoveCommand_initOptions, _SpoGroupUserRemoveCommand_initValidators;
+var _SpoGroupUserRemoveCommand_instances, _SpoGroupUserRemoveCommand_initTelemetry, _SpoGroupUserRemoveCommand_initOptions, _SpoGroupUserRemoveCommand_initValidators, _SpoGroupUserRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.GROUP_USER_REMOVE;
@@ -34,49 +35,48 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified user from a SharePoint group';
     }
-    commandAction(logger, args, cb) {
-        const removeUserfromSPGroup = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing User with Username ${args.options.userName} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
-            }
-            const loginName = `i:0#.f|membership|${args.options.userName}`;
-            const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-                ? `GetById('${encodeURIComponent(args.options.groupId)}')`
-                : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(loginName)}'`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(() => {
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            if (this.debug) {
-                logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
-            }
-            removeUserfromSPGroup();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeUserfromSPGroup = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing User with Username ${args.options.userName} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
                 }
-                else {
-                    removeUserfromSPGroup();
+                const loginName = `i:0#.f|membership|${args.options.userName}`;
+                const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
+                    ? `GetById('${encodeURIComponent(args.options.groupId)}')`
+                    : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(loginName)}'`;
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                if (this.debug) {
+                    logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
+                }
+                yield removeUserfromSPGroup();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
+                });
+                if (result.continue) {
+                    yield removeUserfromSPGroup();
+                }
+            }
+        });
     }
 }
 _SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand_initTelemetry = function _SpoGroupUserRemoveCommand_initTelemetry() {
@@ -101,17 +101,13 @@ _SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand
     });
 }, _SpoGroupUserRemoveCommand_initValidators = function _SpoGroupUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && args.options.groupName) {
-            return 'Use either "groupName" or "groupId", but not both';
-        }
-        if (!args.options.groupId && !args.options.groupName) {
-            return 'Either "groupName" or "groupId" is required';
-        }
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
+}, _SpoGroupUserRemoveCommand_initOptionSets = function _SpoGroupUserRemoveCommand_initOptionSets() {
+    this.optionSets.push(['groupName', 'groupId']);
 };
 module.exports = new SpoGroupUserRemoveCommand();
 //# sourceMappingURL=group-user-remove.js.map

package/dist/m365/spo/commands/hidedefaultthemes/hidedefaultthemes-get.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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -11,26 +20,27 @@ class SpoHideDefaultThemesGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets the current value of the HideDefaultThemes setting';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((spoAdminUrl) => {
-            if (this.verbose) {
-                logger.logToStderr(`Getting the current value of the HideDefaultThemes setting...`);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Getting the current value of the HideDefaultThemes setting...`);
+                }
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_api/thememanager/GetHideDefaultThemes`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res.value);
             }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/thememanager/GetHideDefaultThemes`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((rawRes) => {
-            logger.log(rawRes.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new SpoHideDefaultThemesGetCommand();