@pnp/cli-microsoft365 6.0.0 → 6.1.0-beta.11542c0

package/dist/m365/spo/commands/folder/folder-roleinheritance-reset.js

@@ -23,6 +23,12 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const commands_1 = require("../../commands");
 class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FOLDER_ROLEINHERITANCE_RESET;
+    }
+    get description() {
+        return 'Restores the role inheritance of a folder';
+    }
     constructor() {
         super();
         _SpoFolderRoleInheritanceResetCommand_instances.add(this);
@@ -30,12 +36,6 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderRoleInheritanceResetCommand_instances, "m", _SpoFolderRoleInheritanceResetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRoleInheritanceResetCommand_instances, "m", _SpoFolderRoleInheritanceResetCommand_initValidators).call(this);
     }
-    get name() {
-        return commands_1.default.FOLDER_ROLEINHERITANCE_RESET;
-    }
-    get description() {
-        return 'Restores the role inheritance of a folder';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);

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

@@ -13,27 +13,28 @@ 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 _SpoGroupAddCommand_instances, _SpoGroupAddCommand_initTelemetry, _SpoGroupAddCommand_initOptions, _SpoGroupAddCommand_initValidators, _SpoGroupAddCommand_initOptionSets;
+var _SpoGroupAddCommand_instances, _SpoGroupAddCommand_initTelemetry, _SpoGroupAddCommand_initOptions, _SpoGroupAddCommand_initTypes, _SpoGroupAddCommand_initValidators, _SpoGroupAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupAddCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.GROUP_ADD;
+    }
+    get description() {
+        return 'Creates group in the specified site';
+    }
     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_initTypes).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';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
@@ -66,10 +67,10 @@ _SpoGroupAddCommand_instances = new WeakSet(), _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',
+            allowMembersEditMembership: args.options.allowMembersEditMembership,
+            onlyAllowMembersViewMembership: args.options.onlyAllowMembersViewMembership,
+            allowRequestToJoinLeave: args.options.allowRequestToJoinLeave,
+            autoAcceptRequestToJoinLeave: args.options.autoAcceptRequestToJoinLeave,
             requestToJoinLeaveEmailSetting: typeof args.options.requestToJoinLeaveEmailSetting !== 'undefined'
         });
     });
@@ -81,31 +82,28 @@ _SpoGroupAddCommand_instances = new WeakSet(), _SpoGroupAddCommand_initTelemetry
     }, {
         option: '--description [description]'
     }, {
-        option: '--allowMembersEditMembership [allowMembersEditMembership]'
+        option: '--allowMembersEditMembership [allowMembersEditMembership]',
+        autocomplete: ['true', 'false']
     }, {
-        option: '--onlyAllowMembersViewMembership [onlyAllowMembersViewMembership]'
+        option: '--onlyAllowMembersViewMembership [onlyAllowMembersViewMembership]',
+        autocomplete: ['true', 'false']
     }, {
-        option: '--allowRequestToJoinLeave [allowRequestToJoinLeave]'
+        option: '--allowRequestToJoinLeave [allowRequestToJoinLeave]',
+        autocomplete: ['true', 'false']
     }, {
-        option: '--autoAcceptRequestToJoinLeave [autoAcceptRequestToJoinLeave]'
+        option: '--autoAcceptRequestToJoinLeave [autoAcceptRequestToJoinLeave]',
+        autocomplete: ['true', 'false']
     }, {
         option: '--requestToJoinLeaveEmailSetting [requestToJoinLeaveEmailSetting]'
     });
+}, _SpoGroupAddCommand_initTypes = function _SpoGroupAddCommand_initTypes() {
+    this.types.boolean.push('allowMembersEditMembership', 'onlyAllowMembersViewMembership', 'allowRequestToJoinLeave', 'autoAcceptRequestToJoinLeave');
 }, _SpoGroupAddCommand_initValidators = function _SpoGroupAddCommand_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;
         }
-        const booleanOptions = [
-            args.options.allowMembersEditMembership, args.options.onlyAllowMembersViewMembership,
-            args.options.allowRequestToJoinLeave, args.options.autoAcceptRequestToJoinLeave
-        ];
-        for (const option of booleanOptions) {
-            if (typeof option !== 'undefined' && !validation_1.validation.isValidBoolean(option)) {
-                return `Value '${option}' is not a valid boolean`;
-            }
-        }
         return true;
     }));
 }, _SpoGroupAddCommand_initOptionSets = function _SpoGroupAddCommand_initOptionSets() {

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

@@ -21,6 +21,12 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupGetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.GROUP_GET;
+    }
+    get description() {
+        return 'Gets site group';
+    }
     constructor() {
         super();
         _SpoGroupGetCommand_instances.add(this);
@@ -29,12 +35,6 @@ class SpoGroupGetCommand extends SpoCommand_1.default {
         __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';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {

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

@@ -21,13 +21,6 @@ const validation_1 = require("../../../../utils/validation");
 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_initTelemetry).call(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;
     }
@@ -37,6 +30,13 @@ class SpoGroupListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Title', 'LoginName', 'IsHiddenInUI', 'PrincipalType', 'Type'];
     }
+    constructor() {
+        super();
+        _SpoGroupListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupListCommand_instances, "m", _SpoGroupListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupListCommand_instances, "m", _SpoGroupListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupListCommand_instances, "m", _SpoGroupListCommand_initValidators).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {

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

@@ -20,17 +20,10 @@ const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const SpoUserGetCommand = require("../user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupMemberAddCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoGroupMemberAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptionSets).call(this);
-    }
     get name() {
         return commands_1.default.GROUP_MEMBER_ADD;
     }
@@ -40,13 +33,21 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['DisplayName', 'Email'];
     }
+    constructor() {
+        super();
+        _SpoGroupMemberAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptionSets).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const groupId = yield this.getGroupId(args);
+                const groupId = yield this.getGroupId(args, logger);
                 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}`);
+                    logger.logToStderr(`Adding user(s) to SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
                 }
                 const data = {
                     url: args.options.webUrl,
@@ -73,7 +74,10 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    getGroupId(args) {
+    getGroupId(args, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Getting group Id for SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+        }
         const getGroupMethod = args.options.groupName ?
             `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')` :
             `GetById('${args.options.groupId}')`;
@@ -100,34 +104,23 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
         }
         const validUserNames = [];
         const invalidUserNames = [];
-        const userInfo = args.options.userName ? args.options.userName : args.options.email;
+        const userIdentifiers = args.options.userName || args.options.email || args.options.userId.toString();
         return Promise
-            .all(userInfo.split(',').map(singleUserName => {
-            const options = {
-                output: 'json',
-                debug: args.options.debug,
-                verbose: args.options.verbose
-            };
-            if (args.options.userName) {
-                options.userName = singleUserName.trim();
-            }
-            else {
-                options.email = singleUserName.trim();
-            }
-            return Cli_1.Cli
-                .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
-                .then((getUserGetOutput) => {
-                if (this.debug) {
-                    logger.logToStderr(getUserGetOutput.stderr);
+            .all(userIdentifiers.split(',').map((userIdentifier) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.userId) {
+                    yield this.spoUserGet(args.options, userIdentifier.trim(), logger, validUserNames);
                 }
-                validUserNames.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
-            }, (err) => {
-                if (this.debug) {
-                    logger.logToStderr(err.stderr);
+                else {
+                    yield this.aadUserGet(args.options, userIdentifier.trim(), logger, validUserNames);
                 }
-                invalidUserNames.push(singleUserName);
-            });
-        }))
+            }
+            catch (err) {
+                logger.logToStderr(err.stderr);
+                invalidUserNames.push(userIdentifier);
+                return err;
+            }
+        })))
             .then(() => {
             if (invalidUserNames.length > 0) {
                 return Promise.reject(`Users not added to the group because the following users don't exist: ${invalidUserNames.join(', ')}`);
@@ -135,6 +128,38 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
             return Promise.resolve(validUserNames);
         });
     }
+    aadUserGet(options, userIdentifier, logger, validUserNames) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Get UPN from Azure AD for user ${userIdentifier}`);
+            }
+            const aadUserGetCommandoptions = Object.assign(Object.assign(Object.assign({}, (options.userName && { userName: userIdentifier })), (options.email && { email: userIdentifier })), { output: 'json', debug: options.debug, verbose: options.verbose });
+            const aadUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
+            if (this.debug) {
+                logger.logToStderr(aadUserGetOutput.stderr);
+            }
+            validUserNames.push(JSON.parse(aadUserGetOutput.stdout).userPrincipalName);
+        });
+    }
+    spoUserGet(options, userIdentifier, logger, validUserNames) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Get UPN from SharePoint for user ${userIdentifier}`);
+            }
+            const spoUserGetCommandoptions = {
+                id: userIdentifier,
+                webUrl: options.webUrl,
+                output: 'json',
+                debug: options.debug,
+                verbose: options.verbose
+            };
+            const spoUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, spoUserGetCommandoptions), { _: [] }) });
+            if (this.debug) {
+                logger.logToStderr(spoUserGetOutput.stderr);
+            }
+            validUserNames.push(JSON.parse(spoUserGetOutput.stdout).UserPrincipalName);
+        });
+    }
     getFormattedUserList(activeUserList) {
         const generatedPeoplePicker = JSON.stringify(activeUserList.map(singleUsername => {
             return { Key: singleUsername.trim() };
@@ -148,7 +173,8 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
-            email: typeof args.options.email !== 'undefined'
+            email: typeof args.options.email !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined'
         });
     });
 }, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
@@ -162,6 +188,8 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         option: '--userName [userName]'
     }, {
         option: '--email [email]'
+    }, {
+        option: '--userId [userId]'
     });
 }, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -172,10 +200,20 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified groupId ${args.options.groupId} is not a number`;
         }
+        const userIdReg = new RegExp(/^[0-9,]*$/);
+        if (args.options.userId && !userIdReg.test(args.options.userId)) {
+            return `${args.options.userId} is not a number or a comma seperated value`;
+        }
+        if (args.options.userName && args.options.userName.split(',').some(e => !validation_1.validation.isValidUserPrincipalName(e))) {
+            return `${args.options.userName} contains one or more invalid usernames`;
+        }
+        if (args.options.email && args.options.email.split(',').some(e => !validation_1.validation.isValidUserPrincipalName(e))) {
+            return `${args.options.email} contains one or more invalid email addresses`;
+        }
         return true;
     }));
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email', 'userId'] });
 };
 module.exports = new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

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

@@ -21,14 +21,6 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupMemberListCommand extends SpoCommand_1.default {
-    constructor() {
-        super();
-        _SpoGroupMemberListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptionSets).call(this);
-    }
     get name() {
         return commands_1.default.GROUP_MEMBER_LIST;
     }
@@ -38,6 +30,14 @@ class SpoGroupMemberListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'UserPrincipalName', 'Id', 'Email'];
     }
+    constructor() {
+        super();
+        _SpoGroupMemberListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptionSets).call(this);
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {

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

@@ -19,9 +19,16 @@ const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 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 SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.GROUP_MEMBER_REMOVE;
+    }
+    get description() {
+        return 'Removes the specified member from a SharePoint group';
+    }
     constructor() {
         super();
         _SpoGroupMemberRemoveCommand_instances.add(this);
@@ -30,22 +37,42 @@ class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initOptionSets).call(this);
     }
-    get name() {
-        return commands_1.default.GROUP_MEMBER_REMOVE;
-    }
-    get description() {
-        return 'Removes the specified member from a SharePoint group';
+    getUserName(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.userName) {
+                return args.options.userName;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about the user ${args.options.email}`);
+            }
+            const options = {
+                email: args.options.email,
+                output: 'json',
+                debug: args.options.debug,
+                verbose: args.options.verbose
+            };
+            const userGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const userOutput = JSON.parse(userGetOutput.stdout);
+            return userOutput.userPrincipalName;
+        });
     }
     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}`);
+                    logger.logToStderr(`Removing User ${args.options.userName || args.options.email || args.options.userId} 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
+                let requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
                     ? `GetById('${args.options.groupId}')`
-                    : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
+                    : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}`;
+                if (args.options.userId) {
+                    requestUrl += `/users/removeById(${args.options.userId})`;
+                }
+                else {
+                    const userName = yield this.getUserName(logger, args);
+                    const loginName = `i:0#.f|membership|${userName}`;
+                    requestUrl += `/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
+                }
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -71,7 +98,7 @@ class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
+                    message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email} from the SharePoint group?`
                 });
                 if (result.continue) {
                     yield removeUserfromSPGroup();
@@ -85,6 +112,9 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         Object.assign(this.telemetryProperties, {
             groupId: (!(!args.options.groupId)).toString(),
             groupName: (!(!args.options.groupName)).toString(),
+            userName: (!(!args.options.userName)).toString(),
+            email: (!(!args.options.email)).toString(),
+            userId: (!(!args.options.userId)).toString(),
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -96,7 +126,11 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--userName <userName>'
+        option: '--userName [userName]'
+    }, {
+        option: '--email [email]'
+    }, {
+        option: '--userId [userId]'
     }, {
         option: '--confirm'
     });
@@ -105,10 +139,19 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
+        if (args.options.userId && isNaN(args.options.userId)) {
+            return `Specified "userId" ${args.options.userId} is not valid`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        if (args.options.email && !validation_1.validation.isValidUserPrincipalName(args.options.email)) {
+            return `${args.options.email} is not a valid email`;
+        }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupName', 'groupId'] });
+    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId'] });
 };
 module.exports = new SpoGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

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

@@ -21,6 +21,12 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.GROUP_REMOVE;
+    }
+    get description() {
+        return 'Removes group from specific web';
+    }
     constructor() {
         super();
         _SpoGroupRemoveCommand_instances.add(this);
@@ -29,12 +35,6 @@ class SpoGroupRemoveCommand extends SpoCommand_1.default {
         __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';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeGroup = () => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/group/group-set.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 _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupSetCommand_initOptions, _SpoGroupSetCommand_initValidators, _SpoGroupSetCommand_initOptionSets;
+var _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupSetCommand_initOptions, _SpoGroupSetCommand_initTypes, _SpoGroupSetCommand_initValidators, _SpoGroupSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -22,20 +22,21 @@ 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 {
+    get name() {
+        return commands_1.default.GROUP_SET;
+    }
+    get description() {
+        return 'Updates a group in the specified site';
+    }
     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_initTypes).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';
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
@@ -114,10 +115,10 @@ _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry
             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',
+            allowMembersEditMembership: args.options.allowMembersEditMembership,
+            onlyAllowMembersViewMembership: args.options.onlyAllowMembersViewMembership,
+            allowRequestToJoinLeave: args.options.allowRequestToJoinLeave,
+            autoAcceptRequestToJoinLeave: args.options.autoAcceptRequestToJoinLeave,
             requestToJoinLeaveEmailSetting: typeof args.options.requestToJoinLeaveEmailSetting !== 'undefined',
             ownerEmail: typeof args.options.ownerEmail !== 'undefined',
             ownerUserName: typeof args.options.ownerUserName !== 'undefined'
@@ -135,13 +136,17 @@ _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry
     }, {
         option: '--description [description]'
     }, {
-        option: '--allowMembersEditMembership [allowMembersEditMembership]'
+        option: '--allowMembersEditMembership [allowMembersEditMembership]',
+        autocomplete: ['true', 'false']
     }, {
-        option: '--onlyAllowMembersViewMembership [onlyAllowMembersViewMembership]'
+        option: '--onlyAllowMembersViewMembership [onlyAllowMembersViewMembership]',
+        autocomplete: ['true', 'false']
     }, {
-        option: '--allowRequestToJoinLeave [allowRequestToJoinLeave]'
+        option: '--allowRequestToJoinLeave [allowRequestToJoinLeave]',
+        autocomplete: ['true', 'false']
     }, {
-        option: '--autoAcceptRequestToJoinLeave [autoAcceptRequestToJoinLeave]'
+        option: '--autoAcceptRequestToJoinLeave [autoAcceptRequestToJoinLeave]',
+        autocomplete: ['true', 'false']
     }, {
         option: '--requestToJoinLeaveEmailSetting [requestToJoinLeaveEmailSetting]'
     }, {
@@ -149,6 +154,8 @@ _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry
     }, {
         option: '--ownerUserName [ownerUserName]'
     });
+}, _SpoGroupSetCommand_initTypes = function _SpoGroupSetCommand_initTypes() {
+    this.types.boolean.push('allowMembersEditMembership', 'onlyAllowMembersViewMembership', 'allowRequestToJoinLeave', 'autoAcceptRequestToJoinLeave');
 }, _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);
@@ -161,15 +168,6 @@ _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry
         if (args.options.ownerEmail && args.options.ownerUserName) {
             return 'Specify either ownerEmail or ownerUserName but not both';
         }
-        const booleanOptions = [
-            args.options.allowMembersEditMembership, args.options.onlyAllowMembersViewMembership,
-            args.options.allowRequestToJoinLeave, args.options.autoAcceptRequestToJoinLeave
-        ];
-        for (const option of booleanOptions) {
-            if (typeof option !== 'undefined' && !validation_1.validation.isValidBoolean(option)) {
-                return `Value '${option}' is not a valid boolean`;
-            }
-        }
         return true;
     }));
 }, _SpoGroupSetCommand_initOptionSets = function _SpoGroupSetCommand_initOptionSets() {