@pnp/cli-microsoft365 9.0.0-beta.2f8dd1e → 9.0.0-beta.59b026e

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) {

package/dist/m365/entra/commands/m365group/m365group-user-add.js

@@ -3,14 +3,15 @@ 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 _EntraM365GroupUserAddCommand_instances, _EntraM365GroupUserAddCommand_initTelemetry, _EntraM365GroupUserAddCommand_initOptions, _EntraM365GroupUserAddCommand_initValidators, _EntraM365GroupUserAddCommand_initOptionSets;
+var _EntraM365GroupUserAddCommand_instances, _EntraM365GroupUserAddCommand_initTelemetry, _EntraM365GroupUserAddCommand_initOptions, _EntraM365GroupUserAddCommand_initValidators, _EntraM365GroupUserAddCommand_initOptionSets, _EntraM365GroupUserAddCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
-import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import aadCommands from '../../aadCommands.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import commands from '../../commands.js';
 class EntraM365GroupUserAddCommand extends GraphCommand {
     get name() {
@@ -25,79 +26,155 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
     constructor() {
         super();
         _EntraM365GroupUserAddCommand_instances.add(this);
+        this.allowedRoles = ['owner', 'member'];
         __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_ADD, commands.M365GROUP_USER_ADD);
+        if (args.options.userName) {
+            await this.warn(logger, `Option 'userName' is deprecated. Please use 'ids' or 'userNames' instead.`);
+        }
         try {
-            const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+            const userNames = args.options.userNames || args.options.userName;
+            const providedGroupId = await this.getGroupId(logger, args);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(providedGroupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${providedGroupId}' is not a Microsoft 365 group.`);
             }
-            let requestOptions = {
-                url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userName)}/id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            const endpoint = `${this.resource}/v1.0/groups/${providedGroupId}/${((typeof args.options.role !== 'undefined') ? args.options.role : '').toLowerCase() === 'owner' ? 'owners' : 'members'}/$ref`;
-            requestOptions = {
-                url: endpoint,
+            const userIds = await this.getUserIds(logger, args.options.ids, userNames);
+            if (this.verbose) {
+                await logger.logToStderr(`Adding user(s) ${args.options.ids || userNames} to group ${args.options.groupId || args.options.groupName || args.options.teamId || args.options.teamName}...`);
+            }
+            await this.addUsers(providedGroupId, userIds, args.options.role);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getGroupId(logger, args) {
+        if (args.options.groupId) {
+            return args.options.groupId;
+        }
+        if (args.options.teamId) {
+            return args.options.teamId;
+        }
+        const name = args.options.groupName || args.options.teamName;
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving Group ID by display name...');
+        }
+        return entraGroup.getGroupIdByDisplayName(name);
+    }
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return formatting.splitAndTrim(userIds);
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving user ID(s) by username(s)...');
+        }
+        return entraUser.getUserIdsByUpns(formatting.splitAndTrim(userNames));
+    }
+    async addUsers(groupId, userIds, role) {
+        for (let i = 0; i < userIds.length; i += 400) {
+            const userIdsBatch = userIds.slice(i, i + 400);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/$batch`,
                 headers: {
-                    'accept': 'application/json;odata.metadata=none'
+                    'content-type': 'application/json;odata.metadata=none'
                 },
                 responseType: 'json',
-                data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + res.value }
+                data: {
+                    requests: []
+                }
             };
-            await request.post(requestOptions);
-        }
-        catch (err) {
-            this.handleRejectedODataJsonPromise(err);
+            for (let j = 0; j < userIdsBatch.length; j += 20) {
+                const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                requestOptions.data.requests.push({
+                    id: j + 1,
+                    method: 'PATCH',
+                    url: `/groups/${groupId}`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    body: {
+                        [`${((typeof role !== 'undefined') ? role : '').toLowerCase() === 'owner' ? 'owners' : 'members'}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                    }
+                });
+            }
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
         }
     }
 }
 _EntraM365GroupUserAddCommand_instances = new WeakSet(), _EntraM365GroupUserAddCommand_initTelemetry = function _EntraM365GroupUserAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            role: args.options.role,
+            role: args.options.role !== 'undefined',
             teamId: typeof args.options.teamId !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined'
+            groupId: typeof args.options.groupId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            ids: typeof args.options.ids !== 'undefined',
+            userNames: typeof args.options.userNames !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _EntraM365GroupUserAddCommand_initOptions = function _EntraM365GroupUserAddCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --userName <userName>'
+        option: '-n, --userName [userName]'
     }, {
-        option: "-i, --groupId [groupId]"
+        option: '--ids [ids]'
     }, {
-        option: "--teamId [teamId]"
+        option: '--userNames [userNames]'
+    }, {
+        option: '-i, --groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
     }, {
         option: '-r, --role [role]',
-        autocomplete: ['Owner', 'Member']
+        autocomplete: this.allowedRoles
     });
 }, _EntraM365GroupUserAddCommand_initValidators = function _EntraM365GroupUserAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
+            return `'${args.options.teamId}' is not a valid GUID for option 'teamId'.`;
         }
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
+            return `'${args.options.groupId}' is not a valid GUID for option 'groupId'.`;
         }
-        if (args.options.role) {
-            if (['owner', 'member'].indexOf(args.options.role.toLowerCase()) === -1) {
-                return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
+        if (args.options.ids) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ids);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'ids': ${isValidGUIDArrayResult}.`;
             }
         }
+        if (args.options.userNames) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'userNames': ${isValidUPNArrayResult}.`;
+            }
+        }
+        if (args.options.role && !this.allowedRoles.some(role => role.toLowerCase() === args.options.role.toLowerCase())) {
+            return `'${args.options.role}' is not a valid role. Allowed values are: ${this.allowedRoles.join(',')}`;
+        }
         return true;
     });
 }, _EntraM365GroupUserAddCommand_initOptionSets = function _EntraM365GroupUserAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'teamId'] });
+    this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
+    this.optionSets.push({ options: ['userName', 'ids', 'userNames'] });
+}, _EntraM365GroupUserAddCommand_initTypes = function _EntraM365GroupUserAddCommand_initTypes() {
+    this.types.string.push('userName', 'ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
 };
 export default new EntraM365GroupUserAddCommand();
 //# sourceMappingURL=m365group-user-add.js.map

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

@@ -31,9 +31,6 @@ class EntraM365GroupUserListCommand extends GraphCommand {
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_LIST, commands.M365GROUP_USER_LIST);
         try {
-            if (args.options.role === 'Guest') {
-                await this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
-            }
             const groupId = await this.getGroupId(args.options, logger);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
@@ -42,9 +39,9 @@ class EntraM365GroupUserListCommand extends GraphCommand {
             let users = [];
             if (!args.options.role || args.options.role === 'Owner') {
                 const owners = await this.getUsers(args.options, 'Owners', groupId, logger);
-                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'], userType: 'Owner' }));
+                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'] }));
             }
-            if (!args.options.role || args.options.role === 'Member' || args.options.role === 'Guest') {
+            if (!args.options.role || args.options.role === 'Member') {
                 const members = await this.getUsers(args.options, 'Members', groupId, logger);
                 members.forEach((member) => {
                     const user = users.find((u) => u.id === member.id);
@@ -57,7 +54,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
                 });
             }
             if (args.options.role) {
-                users = users.filter(i => i.userType === args.options.role);
+                users = users.filter(i => i.roles.indexOf(args.options.role) > -1);
             }
             await logger.log(users);
         }
@@ -128,7 +125,7 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
         option: "-n, --groupDisplayName [groupDisplayName]"
     }, {
         option: "-r, --role [type]",
-        autocomplete: ["Owner", "Member", "Guest"]
+        autocomplete: ["Owner", "Member"]
     }, {
         option: "-p, --properties [properties]"
     }, {
@@ -144,8 +141,8 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {
-            if (['Owner', 'Member', 'Guest'].indexOf(args.options.role) === -1) {
-                return `${args.options.role} is not a valid role value. Allowed values Owner|Member|Guest`;
+            if (['Owner', 'Member'].indexOf(args.options.role) === -1) {
+                return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
             }
         }
         return true;