@pnp/cli-microsoft365 9.0.0-beta.2f8dd1e → 9.0.0-beta.39e78b2

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

@@ -0,0 +1,256 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _EntraGroupSetCommand_instances, _EntraGroupSetCommand_initTelemetry, _EntraGroupSetCommand_initOptions, _EntraGroupSetCommand_initValidators, _EntraGroupSetCommand_initOptionSets, _EntraGroupSetCommand_initTypes;
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
+class EntraGroupSetCommand extends GraphCommand {
+    get name() {
+        return commands.GROUP_SET;
+    }
+    get description() {
+        return 'Updates a Microsoft Entra group';
+    }
+    constructor() {
+        super();
+        _EntraGroupSetCommand_instances.add(this);
+        this.allowedVisibility = ['Public', 'Private'];
+        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraGroupSetCommand_instances, "m", _EntraGroupSetCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        let groupId = args.options.id;
+        try {
+            if (args.options.displayName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving group id...`);
+                }
+                groupId = await entraGroup.getGroupIdByDisplayName(args.options.displayName);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/groups/${groupId}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                data: {
+                    displayName: args.options.newDisplayName,
+                    description: args.options.description === '' ? null : args.options.description,
+                    mailNickName: args.options.mailNickname,
+                    visibility: args.options.visibility
+                }
+            };
+            await request.patch(requestOptions);
+            const ownerIds = await this.getUserIds(logger, args.options.ownerIds, args.options.ownerUserNames);
+            if (ownerIds.length !== 0) {
+                await this.updateUsers(logger, groupId, 'owners', ownerIds);
+            }
+            else if (this.verbose) {
+                await logger.logToStderr(`No owners to update.`);
+            }
+            const memberIds = await this.getUserIds(logger, args.options.memberIds, args.options.memberUserNames);
+            if (memberIds.length !== 0) {
+                await this.updateUsers(logger, groupId, 'members', memberIds);
+            }
+            else if (this.verbose) {
+                await logger.logToStderr(`No members to update.`);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    ;
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return formatting.splitAndTrim(userIds);
+        }
+        if (userNames) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving user IDs...`);
+            }
+            return entraUser.getUserIdsByUpns(formatting.splitAndTrim(userNames));
+        }
+        return [];
+    }
+    async updateUsers(logger, groupId, role, userIds) {
+        const groupUsers = await odata.getAllItems(`${this.resource}/v1.0/groups/${groupId}/${role}/microsoft.graph.user?$select=id`);
+        const userIdsToAdd = userIds.filter(userId => !groupUsers.some(groupUser => groupUser.id === userId));
+        const userIdsToRemove = groupUsers.filter(groupUser => !userIds.some(userId => groupUser.id === userId)).map(user => user.id);
+        if (this.verbose) {
+            await logger.logToStderr(`Adding ${userIdsToAdd.length} ${role}...`);
+        }
+        for (let i = 0; i < userIdsToAdd.length; i += 400) {
+            const userIdsBatch = userIdsToAdd.slice(i, i + 400);
+            const batchRequestOptions = this.getBatchRequestOptions();
+            // only 20 requests per one batch are allowed
+            for (let j = 0; j < userIdsBatch.length; j += 20) {
+                // only 20 users can be added in one request
+                const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                batchRequestOptions.data.requests.push({
+                    id: j + 1,
+                    method: 'PATCH',
+                    url: `/groups/${groupId}`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none',
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    body: {
+                        [`${role}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                    }
+                });
+            }
+            const res = await request.post(batchRequestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Removing ${userIdsToRemove.length} ${role}...`);
+        }
+        for (let i = 0; i < userIdsToRemove.length; i += 20) {
+            const userIdsBatch = userIdsToRemove.slice(i, i + 20);
+            const batchRequestOptions = this.getBatchRequestOptions();
+            userIdsBatch.map(userId => {
+                batchRequestOptions.data.requests.push({
+                    id: userId,
+                    method: 'DELETE',
+                    url: `/groups/${groupId}/${role}/${userId}/$ref`
+                });
+            });
+            const res = await request.post(batchRequestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
+        }
+    }
+    getBatchRequestOptions() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/$batch`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none',
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                requests: []
+            }
+        };
+        return requestOptions;
+    }
+}
+_EntraGroupSetCommand_instances = new WeakSet(), _EntraGroupSetCommand_initTelemetry = function _EntraGroupSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined',
+            newDisplayName: typeof args.options.newDisplayName !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            mailNickname: typeof args.options.mailNickname !== 'undefined',
+            ownerIds: typeof args.options.ownerIds !== 'undefined',
+            ownerUserNames: typeof args.options.ownerUserNames !== 'undefined',
+            memberIds: typeof args.options.memberIds !== 'undefined',
+            memberUserNames: typeof args.options.memberUserNames !== 'undefined',
+            visibility: typeof args.options.visibility !== 'undefined'
+        });
+    });
+}, _EntraGroupSetCommand_initOptions = function _EntraGroupSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '--mailNickname [mailNickname]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '--newDisplayName [newDisplayName]'
+    }, {
+        option: '--description [description]'
+    }, {
+        option: '--ownerIds [ownerIds]'
+    }, {
+        option: '--ownerUserNames [ownerUserNames]'
+    }, {
+        option: '--memberIds [memberIds]'
+    }, {
+        option: '--memberUserNames [memberUserNames]'
+    }, {
+        option: '--visibility [visibility]',
+        autocomplete: this.allowedVisibility
+    });
+}, _EntraGroupSetCommand_initValidators = function _EntraGroupSetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `Value '${args.options.id}' is not a valid GUID for option 'id'.`;
+        }
+        if (args.options.newDisplayName && args.options.newDisplayName.length > 256) {
+            return `The maximum amount of characters for 'newDisplayName' is 256.`;
+        }
+        if (args.options.mailNickname) {
+            if (!validation.isValidMailNickname(args.options.mailNickname)) {
+                return `Value '${args.options.mailNickname}' for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \ [] " ; : <> , SPACE.`;
+            }
+            if (args.options.mailNickname.length > 64) {
+                return `The maximum amount of characters for 'mailNickname' is 64.`;
+            }
+        }
+        if (args.options.ownerIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ownerIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for option 'ownerIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
+        if (args.options.ownerUserNames) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.ownerUserNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for option 'ownerUserNames': ${isValidUPNArrayResult}.`;
+            }
+        }
+        if (args.options.memberIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.memberIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for option 'memberIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
+        if (args.options.memberUserNames) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.memberUserNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for option 'memberUserNames': ${isValidUPNArrayResult}.`;
+            }
+        }
+        if (args.options.visibility && !this.allowedVisibility.includes(args.options.visibility)) {
+            return `Option 'visibility' must be one of the following values: ${this.allowedVisibility.join(', ')}.`;
+        }
+        if (args.options.newDisplayName === undefined && args.options.description === undefined && args.options.visibility === undefined
+            && args.options.ownerIds === undefined && args.options.ownerUserNames === undefined && args.options.memberIds === undefined
+            && args.options.memberUserNames === undefined && args.options.mailNickname === undefined) {
+            return `Specify at least one of the following options: 'newDisplayName', 'description', 'visibility', 'ownerIds', 'ownerUserNames', 'memberIds', 'memberUserNames', 'mailNickname'.`;
+        }
+        return true;
+    });
+}, _EntraGroupSetCommand_initOptionSets = function _EntraGroupSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] }, {
+        options: ['ownerIds', 'ownerUserNames'],
+        runsWhen: (args) => args.options.ownerIds || args.options.ownerUserNames
+    }, {
+        options: ['memberIds', 'memberUserNames'],
+        runsWhen: (args) => args.options.memberIds || args.options.memberUserNames
+    });
+}, _EntraGroupSetCommand_initTypes = function _EntraGroupSetCommand_initTypes() {
+    this.types.string.push('id', 'displayName', 'newDisplayName', 'description', 'mailNickname', 'ownerIds', 'ownerUserNames', 'memberIds', 'memberUserNames', 'visibility');
+};
+export default new EntraGroupSetCommand();
+//# sourceMappingURL=group-set.js.map

package/dist/m365/entra/commands/group/group-user-list.js

@@ -65,7 +65,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr('Retrieving Group Id...');
         }
-        return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
+        return await entraGroup.getGroupIdByDisplayName(options.groupName);
     }
     async getUsers(options, role, groupId, logger) {
         const { properties, filter } = options;
@@ -111,7 +111,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             role: typeof args.options.role !== 'undefined',
             properties: typeof args.options.properties !== 'undefined',
             filter: typeof args.options.filter !== 'undefined'
@@ -121,7 +121,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
-        option: "-n, --groupDisplayName [groupDisplayName]"
+        option: "-n, --groupName [groupName]"
     }, {
         option: "-r, --role [role]",
         autocomplete: ["Owner", "Member"]
@@ -132,7 +132,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     });
 }, _EntraGroupUserListCommand_initOptionSets = function _EntraGroupUserListCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['groupId', 'groupDisplayName']
+        options: ['groupId', 'groupName']
     });
 }, _EntraGroupUserListCommand_initValidators = function _EntraGroupUserListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/m365group/m365group-conversation-post-list.js

@@ -51,7 +51,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
         if (args.options.groupId) {
             return formatting.encodeQueryParameter(args.options.groupId);
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.groupDisplayName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.groupName);
         return group.id;
     }
 }
@@ -59,14 +59,14 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined'
+            groupName: typeof args.options.groupName !== 'undefined'
         });
     });
 }, _EntraM365GroupConversationPostListCommand_initOptions = function _EntraM365GroupConversationPostListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-t, --threadId <threadId>'
     });
@@ -78,7 +78,7 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
         return true;
     });
 }, _EntraM365GroupConversationPostListCommand_initOptionSets = function _EntraM365GroupConversationPostListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupDisplayName'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] });
 };
 export default new EntraM365GroupConversationPostListCommand();
 //# sourceMappingURL=m365group-conversation-post-list.js.map

package/dist/m365/entra/commands/m365group/m365group-recyclebinitem-list.js

@@ -32,7 +32,7 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_RECYCLEBINITEM_LIST, commands.M365GROUP_RECYCLEBINITEM_LIST);
         try {
             const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-            const displayNameFilter = args.options.groupDisplayName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupDisplayName).replace(/'/g, `''`)}')` : '';
+            const displayNameFilter = args.options.groupName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupName).replace(/'/g, `''`)}')` : '';
             const mailNicknameFilter = args.options.groupMailNickname ? ` and startswith(MailNickname,'${formatting.encodeQueryParameter(args.options.groupMailNickname).replace(/'/g, `''`)}')` : '';
             const topCount = '&$top=100';
             const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
@@ -47,13 +47,13 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
 _EntraM365GroupRecycleBinItemListCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemListCommand_initTelemetry = function _EntraM365GroupRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
         });
     });
 }, _EntraM365GroupRecycleBinItemListCommand_initOptions = function _EntraM365GroupRecycleBinItemListCommand_initOptions() {
     this.options.unshift({
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-m, --groupMailNickname [groupMailNickname]'
     });

package/dist/m365/entra/commands/m365group/m365group-set.js

@@ -13,6 +13,8 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
 class EntraM365GroupSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_SET;
@@ -35,22 +37,22 @@ class EntraM365GroupSetCommand extends GraphCommand {
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_SET, commands.M365GROUP_SET);
         try {
+            if ((args.options.allowExternalSenders !== undefined || args.options.autoSubscribeNewMembers !== undefined) && accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken)) {
+                throw `Option 'allowExternalSenders' and 'autoSubscribeNewMembers' can only be used when using delegated permissions.`;
+            }
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
             }
-            if (args.options.displayName || args.options.description || typeof args.options.isPrivate !== 'undefined') {
-                if (this.verbose) {
-                    await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
-                }
-                const update = {};
-                if (args.options.displayName) {
-                    update.displayName = args.options.displayName;
-                }
-                if (args.options.description) {
-                    update.description = args.options.description;
-                }
-                if (typeof args.options.isPrivate !== 'undefined') {
+            if (this.verbose) {
+                await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
+            }
+            if (args.options.displayName || args.options.description !== undefined || args.options.isPrivate !== undefined) {
+                const update = {
+                    displayName: args.options.displayName,
+                    description: args.options.description !== '' ? args.options.description : null
+                };
+                if (args.options.isPrivate !== undefined) {
                     update.visibility = args.options.isPrivate ? 'Private' : 'Public';
                 }
                 const requestOptions = {
@@ -63,6 +65,24 @@ class EntraM365GroupSetCommand extends GraphCommand {
                 };
                 await request.patch(requestOptions);
             }
+            // This has to be a separate request due to some Graph API limitations. Otherwise it will throw an error.
+            if (args.options.allowExternalSenders !== undefined || args.options.autoSubscribeNewMembers !== undefined || args.options.hideFromAddressLists !== undefined || args.options.hideFromOutlookClients !== undefined) {
+                const requestBody = {
+                    allowExternalSenders: args.options.allowExternalSenders,
+                    autoSubscribeNewMembers: args.options.autoSubscribeNewMembers,
+                    hideFromAddressLists: args.options.hideFromAddressLists,
+                    hideFromOutlookClients: args.options.hideFromOutlookClients
+                };
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: requestBody
+                };
+                await request.patch(requestOptions);
+            }
             if (args.options.logoPath) {
                 const fullPath = path.resolve(args.options.logoPath);
                 if (this.verbose) {
@@ -172,8 +192,12 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
             description: typeof args.options.description !== 'undefined',
             owners: typeof args.options.owners !== 'undefined',
             members: typeof args.options.members !== 'undefined',
-            isPrivate: args.options.isPrivate,
-            logoPath: typeof args.options.logoPath !== 'undefined'
+            isPrivate: !!args.options.isPrivate,
+            logoPath: typeof args.options.logoPath !== 'undefined',
+            allowExternalSenders: !!args.options.allowExternalSenders,
+            autoSubscribeNewMembers: !!args.options.autoSubscribeNewMembers,
+            hideFromAddressLists: !!args.options.hideFromAddressLists,
+            hideFromOutlookClients: !!args.options.hideFromOutlookClients
         });
     });
 }, _EntraM365GroupSetCommand_initOptions = function _EntraM365GroupSetCommand_initOptions() {
@@ -192,36 +216,49 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
         autocomplete: ['true', 'false']
     }, {
         option: '-l, --logoPath [logoPath]'
+    }, {
+        option: '--allowExternalSenders [allowExternalSenders]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--autoSubscribeNewMembers [autoSubscribeNewMembers]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--hideFromAddressLists [hideFromAddressLists]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--hideFromOutlookClients [hideFromOutlookClients]',
+        autocomplete: ['true', 'false']
     });
 }, _EntraM365GroupSetCommand_initTypes = function _EntraM365GroupSetCommand_initTypes() {
-    this.types.boolean.push('isPrivate');
+    this.types.boolean.push('isPrivate', 'allowEternalSenders', 'autoSubscribeNewMembers', 'hideFromAddressLists', 'hideFromOutlookClients');
+    this.types.string.push('id', 'displayName', 'description', 'owners', 'members', 'logoPath');
 }, _EntraM365GroupSetCommand_initValidators = function _EntraM365GroupSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!args.options.displayName &&
-            !args.options.description &&
+            args.options.description === undefined &&
             !args.options.members &&
             !args.options.owners &&
-            typeof args.options.isPrivate === 'undefined' &&
-            !args.options.logoPath) {
-            return 'Specify at least one property to update';
+            args.options.isPrivate === undefined &&
+            !args.options.logoPath &&
+            args.options.allowExternalSenders === undefined &&
+            args.options.autoSubscribeNewMembers === undefined &&
+            args.options.hideFromAddressLists === undefined &&
+            args.options.hideFromOutlookClients === undefined) {
+            return 'Specify at least one option to update.';
         }
         if (!validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.owners) {
-            const owners = args.options.owners.split(',').map(o => o.trim());
-            for (let i = 0; i < owners.length; i++) {
-                if (owners[i].indexOf('@') < 0) {
-                    return `${owners[i]} is not a valid userPrincipalName`;
-                }
+            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.owners);
+            if (isValidArray !== true) {
+                return `Option 'owners' contains one or more invalid UPNs: ${isValidArray}.`;
             }
         }
         if (args.options.members) {
-            const members = args.options.members.split(',').map(m => m.trim());
-            for (let i = 0; i < members.length; i++) {
-                if (members[i].indexOf('@') < 0) {
-                    return `${members[i]} is not a valid userPrincipalName`;
-                }
+            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.members);
+            if (isValidArray !== true) {
+                return `Option 'members' contains one or more invalid UPNs: ${isValidArray}.`;
             }
         }
         if (args.options.logoPath) {