@pnp/cli-microsoft365 5.0.0-beta.a1bb50f → 5.0.0-beta.ae24497

package/dist/Utils.js

@@ -51,6 +51,10 @@ class Utils {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+@thread\.(skype|tacv2)$/i);
         return guidRegEx.test(guid);
     }
+    static isValidTeamsChatId(guid) {
+        const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+(@thread\.v2|@unq\.gbl\.spaces)$/i);
+        return guidRegEx.test(guid);
+    }
     static isValidUserPrincipalName(upn) {
         const upnRegEx = new RegExp(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i);
         return upnRegEx.test(upn);

package/dist/cli/Cli.js

@@ -447,16 +447,14 @@ class Cli {
         }
         if (options.output === 'csv') {
             const { stringify } = require('csv-stringify/sync');
-            /*
-              https://csv.js.org/stringify/options/
-              header: Display the column names on the first line if the columns option is provided or discovered.
-              escape: Single character used for escaping; only apply to characters matching the quote and the escape options default to ".
-              quote: The quote characters surrounding a field, defaults to the " (double quotation marks), an empty quote value will preserve the original field, whether it contains quotation marks or not.
-              quoted: Boolean, default to false, quote all the non-empty fields even if not required.
-              quotedEmpty: Quote empty strings and overrides quoted_string on empty strings when defined; default is false.
-            */
+            const cli = Cli.getInstance();
+            // https://csv.js.org/stringify/options/
             return stringify(logStatement, {
-                header: true
+                header: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvHeader, true),
+                escape: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvEscape, '"'),
+                quote: cli.config.get(settingsNames_1.settingsNames.csvQuote),
+                quoted: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvQuoted, false),
+                quotedEmpty: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvQuotedEmpty, false)
             });
         }
         // display object as a list of key-value pairs

package/dist/m365/aad/commands/user/user-hibp.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const Utils_1 = require("../../../../Utils");
+const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
+const commands_1 = require("../../commands");
+class AadUserHibpCommand extends AnonymousCommand_1.default {
+    get name() {
+        return commands_1.default.USER_HIBP;
+    }
+    get description() {
+        return 'Allows you to retrieve all accounts that have been pwned with the specified username';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.domain = args.options.domain;
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        const requestOptions = {
+            url: `https://haveibeenpwned.com/api/v3/breachedaccount/${encodeURIComponent(args.options.userName)}${(args.options.domain ? `?domain=${encodeURIComponent(args.options.domain)}` : '')}`,
+            headers: {
+                'accept': 'application/json',
+                'hibp-api-key': args.options.apiKey,
+                'x-anonymous': true
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        })
+            .catch((err) => {
+            if ((err && err.response !== undefined && err.response.status === 404) && (this.debug || this.verbose)) {
+                logger.log('No pwnage found');
+                cb();
+                return;
+            }
+            return this.handleRejectedODataJsonPromise(err, logger, cb);
+        });
+    }
+    options() {
+        const options = [
+            {
+                option: '-n, --userName <userName>'
+            },
+            {
+                option: '--apiKey, <apiKey>'
+            },
+            {
+                option: '--domain, [domain]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!Utils_1.default.isValidUserPrincipalName(args.options.userName)) {
+            return 'Specify valid userName';
+        }
+        return true;
+    }
+}
+module.exports = new AadUserHibpCommand();
+//# sourceMappingURL=user-hibp.js.map

package/dist/m365/aad/commands.js

@@ -51,6 +51,7 @@ exports.default = {
     SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
     USER_GET: `${prefix} user get`,
+    USER_HIBP: `${prefix} user hibp`,
     USER_LIST: `${prefix} user list`,
     USER_PASSWORD_VALIDATE: `${prefix} user password validate`,
     USER_SET: `${prefix} user set`

package/dist/m365/cli/commands/config/config-set.js

@@ -21,6 +21,9 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
         switch (args.options.key) {
             case settingsNames_1.settingsNames.showHelpOnFailure:
             case settingsNames_1.settingsNames.printErrorsAsPlainText:
+            case settingsNames_1.settingsNames.csvHeader:
+            case settingsNames_1.settingsNames.csvQuoted:
+            case settingsNames_1.settingsNames.csvQuotedEmpty:
                 value = args.options.value === 'true';
                 break;
             default:
@@ -47,7 +50,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
         if (CliConfigSetCommand.optionNames.indexOf(args.options.key) < 0) {
             return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigSetCommand.optionNames.join(', ')}`;
         }
-        const allowedOutputs = ['text', 'json'];
+        const allowedOutputs = ['text', 'json', 'csv'];
         if (args.options.key === settingsNames_1.settingsNames.output &&
             allowedOutputs.indexOf(args.options.value) === -1) {
             return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedOutputs.join(', ')}`;

package/dist/m365/planner/AppliedCategories.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=AppliedCategories.js.map

package/dist/m365/planner/commands/task/task-set.js

@@ -0,0 +1,357 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const Utils_1 = require("../../../../Utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PlannerTaskSetCommand extends GraphCommand_1.default {
+    constructor() {
+        super(...arguments);
+        this.allowedAppliedCategories = ['category1', 'category2', 'category3', 'category4', 'category5', 'category6'];
+    }
+    get name() {
+        return commands_1.default.TASK_SET;
+    }
+    get description() {
+        return 'Updates a Microsoft Planner Task';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.title = typeof args.options.title !== 'undefined';
+        telemetryProps.planId = typeof args.options.planId !== 'undefined';
+        telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
+        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
+        telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
+        telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
+        telemetryProps.startDateTime = typeof args.options.startDateTime !== 'undefined';
+        telemetryProps.dueDateTime = typeof args.options.dueDateTime !== 'undefined';
+        telemetryProps.percentComplete = typeof args.options.percentComplete !== 'undefined';
+        telemetryProps.assignedToUserIds = typeof args.options.assignedToUserIds !== 'undefined';
+        telemetryProps.assignedToUserNames = typeof args.options.assignedToUserNames !== 'undefined';
+        telemetryProps.assigneePriority = typeof args.options.assigneePriority !== 'undefined';
+        telemetryProps.description = typeof args.options.description !== 'undefined';
+        telemetryProps.appliedCategories = typeof args.options.appliedCategories !== 'undefined';
+        telemetryProps.orderHint = typeof args.options.orderHint !== 'undefined';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getBucketId(args.options)
+            .then(bucketId => {
+            this.bucketId = bucketId;
+            return this.generateUserAssignments(args.options);
+        })
+            .then(resultAssignments => {
+            this.assignments = resultAssignments;
+            return this.getTaskEtag(args.options.id);
+        })
+            .then(etag => {
+            const appliedCategories = this.generateAppliedCategories(args.options);
+            const data = this.mapRequestBody(args.options, appliedCategories);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks/${args.options.id}`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'If-Match': etag,
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json',
+                data: data
+            };
+            return request_1.default.patch(requestOptions);
+        })
+            .then(newTask => this.updateTaskDetails(args.options, newTask))
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    updateTaskDetails(options, newTask) {
+        if (!options.description) {
+            return Promise.resolve(newTask);
+        }
+        const taskId = newTask.id;
+        return this
+            .getTaskDetailsEtag(taskId)
+            .then(etag => {
+            const requestOptionsTaskDetails = {
+                url: `${this.resource}/v1.0/planner/tasks/${taskId}/details`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'If-Match': etag,
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json',
+                data: {
+                    description: options.description
+                }
+            };
+            return request_1.default.patch(requestOptionsTaskDetails);
+        })
+            .then(taskDetails => {
+            return Object.assign(Object.assign({}, newTask), taskDetails);
+        });
+    }
+    getTaskDetailsEtag(taskId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
+            headers: {
+                accept: 'application/json'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const etag = response ? response['@odata.etag'] : undefined;
+            if (!etag) {
+                return Promise.reject(`Error fetching task details`);
+            }
+            return Promise.resolve(etag);
+        });
+    }
+    getTaskEtag(taskId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}`,
+            headers: {
+                accept: 'application/json'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const etag = response ? response['@odata.etag'] : undefined;
+            if (!etag) {
+                return Promise.reject(`Error fetching task`);
+            }
+            return Promise.resolve(etag);
+        });
+    }
+    generateAppliedCategories(options) {
+        if (!options.appliedCategories) {
+            return {};
+        }
+        const categories = {};
+        options.appliedCategories.toLocaleLowerCase().split(',').forEach(x => categories[x] = true);
+        return categories;
+    }
+    generateUserAssignments(options) {
+        const assignments = {};
+        if (!options.assignedToUserIds && !options.assignedToUserNames) {
+            return Promise.resolve(assignments);
+        }
+        return this
+            .getUserIds(options)
+            .then((userIds) => {
+            userIds.forEach(x => assignments[x] = {
+                '@odata.type': '#microsoft.graph.plannerAssignment',
+                orderHint: ' !'
+            });
+            return Promise.resolve(assignments);
+        });
+    }
+    getUserIds(options) {
+        if (options.assignedToUserIds) {
+            return Promise.resolve(options.assignedToUserIds.split(',').map(o => o.trim()));
+        }
+        // Hitting this section means assignedToUserNames won't be undefined
+        const userNames = options.assignedToUserNames;
+        const userArr = userNames.split(',').map(o => o.trim());
+        let userIds = [];
+        const promises = userArr.map(user => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${Utils_1.default.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                headers: {
+                    'accept ': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+        return Promise
+            .all(promises)
+            .then((usersRes) => {
+            let userUpns = [];
+            userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
+            userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
+            // Find the members where no graph response was found
+            const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
+            if (invalidUsers && invalidUsers.length > 0) {
+                return Promise.reject(`Cannot proceed with planner task update. The following users provided are invalid : ${invalidUsers.join(',')}`);
+            }
+            return Promise.resolve(userIds);
+        });
+    }
+    getBucketId(options) {
+        if (options.bucketId) {
+            return Promise.resolve(options.bucketId);
+        }
+        if (!options.bucketName) {
+            return Promise.resolve(undefined);
+        }
+        return this
+            .getPlanId(options)
+            .then(planId => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans/${planId}/buckets?$select=id,name`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then((response) => {
+            const bucket = response.value.find(val => val.name === options.bucketName);
+            if (!bucket) {
+                return Promise.reject(`The specified bucket does not exist`);
+            }
+            return Promise.resolve(bucket.id);
+        });
+    }
+    getPlanId(options) {
+        if (options.planId) {
+            return Promise.resolve(options.planId);
+        }
+        return this
+            .getGroupId(options)
+            .then((groupId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans?$filter=(owner eq '${groupId}')&$select=id,title`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then((response) => {
+            const plan = response.value.find(val => val.title === options.planName);
+            if (!plan) {
+                return Promise.reject(`The specified plan does not exist`);
+            }
+            return Promise.resolve(plan.id);
+        });
+    }
+    getGroupId(options) {
+        if (options.ownerGroupId) {
+            return Promise.resolve(options.ownerGroupId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(options.ownerGroupName)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const group = response.value[0];
+            if (!group) {
+                return Promise.reject(`The specified owner group does not exist`);
+            }
+            return Promise.resolve(group.id);
+        });
+    }
+    mapRequestBody(options, appliedCategories) {
+        const requestBody = {};
+        if (options.title) {
+            requestBody.title = options.title;
+        }
+        if (this.bucketId) {
+            requestBody.bucketId = this.bucketId;
+        }
+        if (options.startDateTime) {
+            requestBody.startDateTime = options.startDateTime;
+        }
+        if (options.dueDateTime) {
+            requestBody.dueDateTime = options.dueDateTime;
+        }
+        if (options.percentComplete) {
+            requestBody.percentComplete = options.percentComplete;
+        }
+        if (this.assignments && Object.keys(this.assignments).length > 0) {
+            requestBody.assignments = this.assignments;
+        }
+        if (options.assigneePriority) {
+            requestBody.assigneePriority = options.assigneePriority;
+        }
+        if (appliedCategories && Object.keys(appliedCategories).length > 0) {
+            requestBody.appliedCategories = appliedCategories;
+        }
+        if (options.orderHint) {
+            requestBody.orderHint = options.orderHint;
+        }
+        return requestBody;
+    }
+    options() {
+        const options = [
+            { option: '-i, --id <id>' },
+            { option: '-t, --title [title]' },
+            { option: '--planId [planId]' },
+            { option: '--planName [planName]' },
+            { option: '--ownerGroupId [ownerGroupId]' },
+            { option: '--ownerGroupName [ownerGroupName]' },
+            { option: '--bucketId [bucketId]' },
+            { option: '--bucketName [bucketName]' },
+            { option: '--startDateTime [startDateTime]' },
+            { option: '--dueDateTime [dueDateTime]' },
+            { option: '--percentComplete [percentComplete]' },
+            { option: '--assignedToUserIds [assignedToUserIds]' },
+            { option: '--assignedToUserNames [assignedToUserNames]' },
+            { option: '--assigneePriority [assigneePriority]' },
+            { option: '--description [description]' },
+            { option: '--appliedCategories [appliedCategories]' },
+            { option: '--orderHint [orderHint]' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.bucketId && args.options.bucketName) {
+            return 'Specify either bucketId or bucketName but not both';
+        }
+        if (args.options.bucketName && !args.options.planId && !args.options.planName) {
+            return 'Specify either planId or planName when using bucketName';
+        }
+        if (args.options.bucketName && args.options.planId && args.options.planName) {
+            return 'Specify either planId or planName when using bucketName but not both';
+        }
+        if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planName';
+        }
+        if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
+        }
+        if (args.options.ownerGroupId && !Utils_1.default.isValidGuid(args.options.ownerGroupId)) {
+            return `${args.options.ownerGroupId} is not a valid GUID`;
+        }
+        if (args.options.startDateTime && !Utils_1.default.isValidISODateTime(args.options.startDateTime)) {
+            return 'The startDateTime is not a valid ISO date string';
+        }
+        if (args.options.dueDateTime && !Utils_1.default.isValidISODateTime(args.options.dueDateTime)) {
+            return 'The dueDateTime is not a valid ISO date string';
+        }
+        if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
+            return `percentComplete is not a number`;
+        }
+        if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
+            return `percentComplete should be between 0 and 100`;
+        }
+        if (args.options.assignedToUserIds && !Utils_1.default.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+            return 'assignedToUserIds contains invalid GUID';
+        }
+        if (args.options.assignedToUserIds && args.options.assignedToUserNames) {
+            return 'Specify either assignedToUserIds or assignedToUserNames but not both';
+        }
+        if (args.options.appliedCategories && args.options.appliedCategories.split(',').filter(category => this.allowedAppliedCategories.indexOf(category.toLocaleLowerCase()) < 0).length !== 0) {
+            return 'The appliedCategories contains invalid value. Specify either category1, category2, category3, category4, category5 and/or category6 as properties';
+        }
+        return true;
+    }
+}
+module.exports = new PlannerTaskSetCommand();
+//# sourceMappingURL=task-set.js.map

package/dist/m365/planner/commands.js

@@ -8,6 +8,7 @@ exports.default = {
     PLAN_GET: `${prefix} plan get`,
     PLAN_LIST: `${prefix} plan list`,
     TASK_ADD: `${prefix} task add`,
-    TASK_LIST: `${prefix} task list`
+    TASK_LIST: `${prefix} task list`,
+    TASK_SET: `${prefix} task set`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
-const SpoCommand_1 = require("../../../base/SpoCommand");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupUserAddCommand extends SpoCommand_1.default {
     get name() {
@@ -17,15 +17,21 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
         return ['DisplayName', 'Email'];
     }
     commandAction(logger, args, cb) {
-        this.getOnlyActiveUsers(args, logger)
+        let groupId = 0;
+        this
+            .getGroupId(args)
+            .then((_groupId) => {
+            groupId = _groupId;
+            return this.getOnlyActiveUsers(args, logger);
+        })
             .then((resolvedUsernameList) => {
             if (this.verbose) {
-                logger.logToStderr(`Start adding Active user/s to SharePoint Group ${args.options.groupId}...`);
+                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:${args.options.groupId}`
+                roleValue: `group:${groupId}`
             };
             const requestOptions = {
                 url: `${args.options.webUrl}/_api/SP.Web.ShareObject`,
@@ -46,24 +52,51 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    getGroupId(args) {
+        if (args.options.groupId) {
+            return Promise.resolve(args.options.groupId);
+        }
+        const requestOptions = {
+            url: `${args.options.webUrl}/_api/web/sitegroups/GetByName('${encodeURIComponent(args.options.groupName)}')`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const groupId = response.Id;
+            if (!groupId) {
+                return Promise.reject(`The specified group not exist in the SharePoint site`);
+            }
+            return Promise.resolve(groupId);
+        });
+    }
     getOnlyActiveUsers(args, logger) {
         if (this.verbose) {
             logger.logToStderr(`Removing Users which are not active from the original list`);
         }
-        const activeUsernamelist = [];
-        return Promise.all(args.options.userName.split(",").map(singleUsername => {
+        const activeUserNameList = [];
+        const userInfo = args.options.userName ? args.options.userName : args.options.email;
+        return Promise.all(userInfo.split(',').map(singleUserName => {
             const options = {
-                userName: singleUsername.trim(),
                 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);
                 }
-                activeUsernamelist.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
+                activeUserNameList.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
             }, (err) => {
                 if (this.debug) {
                     logger.logToStderr(err.stderr);
@@ -71,7 +104,7 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
             });
         }))
             .then(() => {
-            return Promise.resolve(activeUsernamelist);
+            return Promise.resolve(activeUserNameList);
         });
     }
     getFormattedUserList(activeUserList) {
@@ -86,10 +119,16 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
                 option: '-u, --webUrl <webUrl>'
             },
             {
-                option: '--groupId <groupId>'
+                option: '--groupId [groupId]'
+            },
+            {
+                option: '--groupName [groupName]'
+            },
+            {
+                option: '--userName [userName]'
             },
             {
-                option: '--userName <userName>'
+                option: '--email [email]'
             }
         ];
         const parentOptions = super.options();
@@ -100,8 +139,20 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (typeof args.options.groupId !== 'number') {
-            return `Group Id : ${args.options.groupId} is not a number`;
+        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;
     }