@pnp/cli-microsoft365 7.4.0-beta.5c123d7 → 7.4.0-beta.8d6724f

package/dist/Auth.js

@@ -262,7 +262,8 @@ export class Auth {
                     },
                     piiLoggingEnabled: false,
                     logLevel: debug ? LogLevel.Verbose : LogLevel.Error
-                }
+                },
+                proxyUrl: process.env.HTTP_PROXY || process.env.HTTPS_PROXY
             }
         };
     }

package/dist/appInsights.js

@@ -24,6 +24,8 @@ appInsightsClient.commonProperties = {
     env: env,
     ci: Boolean(process.env.CI).toString()
 };
+appInsightsClient.config.proxyHttpUrl = process.env.HTTP_PROXY ?? '';
+appInsightsClient.config.proxyHttpsUrl = process.env.HTTPS_PROXY ?? '';
 appInsightsClient.context.tags['ai.cloud.roleInstance'] = crypto.createHash('sha256').update(appInsightsClient.context.tags['ai.cloud.roleInstance']).digest('hex');
 delete appInsightsClient.context.tags['ai.cloud.role'];
 delete appInsightsClient.context.tags['ai.cloud.roleName'];

package/dist/m365/entra/aadCommands.js

@@ -7,6 +7,7 @@ export default {
     ADMINISTRATIVEUNIT_MEMBER_ADD: `${prefix} administrativeunit member add`,
     ADMINISTRATIVEUNIT_MEMBER_GET: `${prefix} administrativeunit member get`,
     ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
+    ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD: `${prefix} administrativeunit roleassignment add`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.js

@@ -0,0 +1,102 @@
+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 _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets;
+import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { aadUser } from '../../../../utils/aadUser.js';
+import { roleAssignment } from '../../../../utils/roleAssignment.js';
+import { roleDefinition } from '../../../../utils/roleDefinition.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Assigns a Microsoft Entra role with administrative unit scope to a user';
+    }
+    constructor() {
+        super();
+        _EntraAdministrativeUnitRoleAssignmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            let { administrativeUnitId, roleDefinitionId, userId } = args.options;
+            if (args.options.administrativeUnitName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving administrative unit by its name '${args.options.administrativeUnitName}'`);
+                }
+                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+            }
+            if (args.options.roleDefinitionName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving role definition by its name '${args.options.roleDefinitionName}'`);
+                }
+                roleDefinitionId = (await roleDefinition.getRoleDefinitionByDisplayName(args.options.roleDefinitionName)).id;
+            }
+            if (args.options.userName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving user by UPN '${args.options.userName}'`);
+                }
+                userId = await aadUser.getUserIdByUpn(args.options.userName);
+            }
+            const unifiedRoleAssignment = await roleAssignment.createRoleAssignmentWithAdministrativeUnitScope(roleDefinitionId, userId, administrativeUnitId);
+            await logger.log(unifiedRoleAssignment);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_EntraAdministrativeUnitRoleAssignmentAddCommand_instances = new WeakSet(), _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
+            administrativeUnitName: typeof args.options.administrativeUnitName !== 'undefined',
+            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
+            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --administrativeUnitId [administrativeUnitId]'
+    }, {
+        option: '-n, --administrativeUnitName [administrativeUnitName]'
+    }, {
+        option: '--roleDefinitionId [roleDefinitionId]'
+    }, {
+        option: '--roleDefinitionName [roleDefinitionName]'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        if (args.options.roleDefinitionId && !validation.isValidGuid(args.options.roleDefinitionId)) {
+            return `${args.options.roleDefinitionId} is not a valid GUID`;
+        }
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
+    this.optionSets.push({ options: ['roleDefinitionId', 'roleDefinitionName'] });
+    this.optionSets.push({ options: ['userId', 'userName'] });
+};
+export default new EntraAdministrativeUnitRoleAssignmentAddCommand();
+//# sourceMappingURL=administrativeunit-roleassignment-add.js.map

package/dist/m365/entra/commands.js

@@ -7,6 +7,7 @@ export default {
     ADMINISTRATIVEUNIT_MEMBER_ADD: `${prefix} administrativeunit member add`,
     ADMINISTRATIVEUNIT_MEMBER_GET: `${prefix} administrativeunit member get`,
     ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
+    ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD: `${prefix} administrativeunit roleassignment add`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/external/commands/connection/connection-urltoitemresolver-add.js

@@ -0,0 +1,69 @@
+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 _ExternalConnectionUrlToItemResolverAddCommand_instances, _ExternalConnectionUrlToItemResolverAddCommand_initOptions;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class ExternalConnectionUrlToItemResolverAddCommand extends GraphCommand {
+    get name() {
+        return commands.CONNECTION_URLTOITEMRESOLVER_ADD;
+    }
+    get description() {
+        return 'Adds a URL to item resolver to an external connection';
+    }
+    constructor() {
+        super();
+        _ExternalConnectionUrlToItemResolverAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ExternalConnectionUrlToItemResolverAddCommand_instances, "m", _ExternalConnectionUrlToItemResolverAddCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const baseUrls = args.options.baseUrls.split(',').map(b => b.trim());
+        const itemIdResolver = {
+            itemId: args.options.itemId,
+            priority: args.options.priority,
+            urlMatchInfo: {
+                baseUrls: baseUrls,
+                urlPattern: args.options.urlPattern
+            }
+        };
+        // not a part of the type definition, but required by the API
+        itemIdResolver['@odata.type'] = '#microsoft.graph.externalConnectors.itemIdResolver';
+        const requestOptions = {
+            url: `${this.resource}/v1.0/external/connections/${args.options.externalConnectionId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json'
+            },
+            responseType: 'json',
+            data: {
+                activitySettings: {
+                    urlToItemResolvers: [itemIdResolver]
+                }
+            }
+        };
+        try {
+            await request.patch(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_ExternalConnectionUrlToItemResolverAddCommand_instances = new WeakSet(), _ExternalConnectionUrlToItemResolverAddCommand_initOptions = function _ExternalConnectionUrlToItemResolverAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-c, --externalConnectionId <externalConnectionId>'
+    }, {
+        option: '--baseUrls <baseUrls>'
+    }, {
+        option: '--urlPattern <urlPattern>'
+    }, {
+        option: '-i, --itemId <itemId>'
+    }, {
+        option: '-p, --priority <priority>'
+    });
+};
+export default new ExternalConnectionUrlToItemResolverAddCommand();
+//# sourceMappingURL=connection-urltoitemresolver-add.js.map

package/dist/m365/external/commands.js

@@ -7,6 +7,7 @@ export default {
     CONNECTION_LIST: `${prefix} connection list`,
     CONNECTION_REMOVE: `${prefix} connection remove`,
     CONNECTION_SCHEMA_ADD: `${prefix} connection schema add`,
+    CONNECTION_URLTOITEMRESOLVER_ADD: `${prefix} connection urltoitemresolver add`,
     EXTERNALCONNECTION_ADD: `${searchPrefix} externalconnection add`,
     EXTERNALCONNECTION_GET: `${searchPrefix} externalconnection get`,
     EXTERNALCONNECTION_LIST: `${searchPrefix} externalconnection list`,

package/dist/m365/flow/commands/run/run-get.js

@@ -30,8 +30,12 @@ class FlowRunGetCommand extends PowerAutomateCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
+        if (args.options.includeTriggerInformation) {
+            await this.warn(logger, `Parameter 'includeTriggerInformation' is deprecated. Please use 'withTrigger instead`);
+        }
+        const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -43,17 +47,11 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             res.endTime = res.properties.endTime || '';
             res.status = res.properties.status;
             res.triggerName = res.properties.trigger.name;
-            if (args.options.includeTriggerInformation && res.properties.trigger.outputsLink) {
-                const triggerInformationOptions = {
-                    url: res.properties.trigger.outputsLink.uri,
-                    headers: {
-                        accept: 'application/json',
-                        'x-anonymous': true
-                    },
-                    responseType: 'json'
-                };
-                const triggerInformationResponse = await request.get(triggerInformationOptions);
-                res.triggerInformation = triggerInformationResponse.body;
+            if ((args.options.includeTriggerInformation || args.options.withTrigger) && res.properties.trigger.outputsLink) {
+                res.triggerInformation = await this.getTriggerInformation(res);
+            }
+            if (!!args.options.withActions) {
+                res.actions = await this.getActionsInformation(res, args.options.withActions);
             }
             await logger.log(res);
         }
@@ -61,6 +59,38 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getTriggerInformation(res) {
+        return await this.requestAdditionalInformation(res.properties.trigger.outputsLink.uri);
+    }
+    async getActionsInformation(res, withActions) {
+        const chosenActions = typeof withActions === 'string' ? withActions.split(',') : null;
+        const actionsResult = {};
+        for (const action in res.properties.actions) {
+            if (!res.properties.actions[action] || (chosenActions && chosenActions.indexOf(action) === -1)) {
+                continue;
+            }
+            actionsResult[action] = res.properties.actions[action];
+            if (!!res.properties.actions[action].inputsLink?.uri) {
+                actionsResult[action].input = await this.requestAdditionalInformation(res.properties.actions[action].inputsLink?.uri);
+            }
+            if (!!res.properties.actions[action].outputsLink?.uri) {
+                actionsResult[action].output = await this.requestAdditionalInformation(res.properties.actions[action].outputsLink?.uri);
+            }
+        }
+        return actionsResult;
+    }
+    async requestAdditionalInformation(requestUri) {
+        const additionalInformationOptions = {
+            url: requestUri,
+            headers: {
+                accept: 'application/json',
+                'x-anonymous': true
+            },
+            responseType: 'json'
+        };
+        const additionalInformationResponse = await request.get(additionalInformationOptions);
+        return additionalInformationResponse.body ? additionalInformationResponse.body : additionalInformationResponse;
+    }
 }
 _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = function _FlowRunGetCommand_initOptions() {
     this.options.unshift({
@@ -71,18 +101,27 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
         option: '-e, --environmentName <environmentName>'
     }, {
         option: '--includeTriggerInformation'
+    }, {
+        option: '--withTrigger'
+    }, {
+        option: '--withActions [withActions]'
     });
 }, _FlowRunGetCommand_initValidators = function _FlowRunGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.flowName)) {
             return `${args.options.flowName} is not a valid GUID`;
         }
+        if (args.options.withActions && (typeof args.options.withActions !== 'string' && typeof args.options.withActions !== 'boolean')) {
+            return 'the withActions parameter must be a string or boolean';
+        }
         return true;
     });
 }, _FlowRunGetCommand_initTelemetry = function _FlowRunGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeTriggerInformation: !!args.options.includeTriggerInformation
+            includeTriggerInformation: !!args.options.includeTriggerInformation,
+            withTrigger: !!args.options.withTrigger,
+            withActions: typeof args.options.withActions !== 'undefined'
         });
     });
 };

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

@@ -32,6 +32,14 @@ class SpoGroupMemberAddCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
+            if (args.options.aadGroupIds) {
+                args.options.entraGroupIds = args.options.aadGroupIds;
+                this.warn(logger, `Option 'aadGroupIds' is deprecated. Please use 'entraGroupIds' instead`);
+            }
+            if (args.options.aadGroupNames) {
+                args.options.entraGroupNames = args.options.aadGroupNames;
+                this.warn(logger, `Option 'aadGroupNames' is deprecated. Please use 'entraGroupNames' instead`);
+            }
             const groupId = await this.getGroupId(args, logger);
             const resolvedUsernameList = await this.getValidUsers(args, logger);
             if (this.verbose) {
@@ -82,7 +90,7 @@ class SpoGroupMemberAddCommand extends SpoCommand {
             await logger.logToStderr('Checking if the specified users and groups exist');
         }
         const validUserNames = [];
-        const identifiers = args.options.userNames ?? args.options.emails ?? args.options.aadGroupIds ?? args.options.aadGroupNames ?? args.options.userIds.toString();
+        const identifiers = args.options.userNames ?? args.options.emails ?? args.options.entraGroupIds ?? args.options.entraGroupNames ?? args.options.userIds.toString();
         await Promise.all(identifiers.split(',').map(async (identifier) => {
             const trimmedIdentifier = identifier.trim();
             try {
@@ -96,10 +104,10 @@ class SpoGroupMemberAddCommand extends SpoCommand {
                 else if (args.options.userNames) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupIds) {
+                else if (args.options.entraGroupIds) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupNames) {
+                else if (args.options.entraGroupNames) {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting ID of Azure AD group ${trimmedIdentifier}`);
                     }
@@ -135,7 +143,9 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             userNames: typeof args.options.userNames !== 'undefined',
             emails: typeof args.options.emails !== 'undefined',
             userIds: typeof args.options.userIds !== 'undefined',
+            entraGroupIds: typeof args.options.entraGroupIds !== 'undefined',
             aadGroupIds: typeof args.options.aadGroupIds !== 'undefined',
+            entraGroupNames: typeof args.options.entraGroupNames !== 'undefined',
             aadGroupNames: typeof args.options.aadGroupNames !== 'undefined'
         });
     });
@@ -152,8 +162,12 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         option: '--emails [emails]'
     }, {
         option: '--userIds [userIds]'
+    }, {
+        option: '--entraGroupIds [entraGroupIds]'
     }, {
         option: '--aadGroupIds [aadGroupIds]'
+    }, {
+        option: '--entraGroupNames [entraGroupNames]'
     }, {
         option: '--aadGroupNames [aadGroupNames]'
     });
@@ -176,13 +190,16 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         if (args.options.emails && args.options.emails.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
             return `${args.options.emails} contains one or more invalid email addresses`;
         }
+        if (args.options.entraGroupIds && args.options.entraGroupIds.split(',').some(e => !validation.isValidGuid(e))) {
+            return `${args.options.entraGroupIds} contains one or more invalid GUIDs`;
+        }
         if (args.options.aadGroupIds && args.options.aadGroupIds.split(',').some(e => !validation.isValidGuid(e))) {
             return `${args.options.aadGroupIds} contains one or more invalid GUIDs`;
         }
         return true;
     });
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'aadGroupIds', 'aadGroupNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'entraGroupIds', 'aadGroupIds', 'entraGroupNames', 'aadGroupNames'] });
 };
 export default new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

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

@@ -45,6 +45,14 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
         return userOutput.userPrincipalName;
     }
     async commandAction(logger, args) {
+        if (args.options.aadGroupId) {
+            args.options.entraGroupId = args.options.aadGroupId;
+            this.warn(logger, `Option 'aadGroupId' is deprecated. Please use 'entraGroupId' instead`);
+        }
+        if (args.options.aadGroupName) {
+            args.options.entraGroupName = args.options.aadGroupName;
+            this.warn(logger, `Option 'aadGroupName' is deprecated. Please use 'entraGroupName' instead`);
+        }
         if (args.options.force) {
             if (this.debug) {
                 await logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
@@ -52,7 +60,7 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
             await this.removeUserfromSPGroup(logger, args);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email || args.options.aadGroupId || args.options.aadGroupName} from the SharePoint group?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove user ${args.options.userName || args.options.userId || args.options.email || args.options.entraGroupId || args.options.entraGroupName} from the SharePoint group?` });
             if (result) {
                 await this.removeUserfromSPGroup(logger, args);
             }
@@ -60,7 +68,7 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
     }
     async removeUserfromSPGroup(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Removing User ${args.options.userName || args.options.email || args.options.userId || args.options.aadGroupId || args.options.aadGroupName} from Group: ${args.options.groupId || args.options.groupName}`);
+            await logger.logToStderr(`Removing User ${args.options.userName || args.options.email || args.options.userId || args.options.entraGroupId || args.options.entraGroupName} from Group: ${args.options.groupId || args.options.groupName}`);
         }
         let requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
             ? `GetById('${args.options.groupId}')`
@@ -74,8 +82,8 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
             requestUrl += `/users/removeByLoginName(@LoginName)?@LoginName='${formatting.encodeQueryParameter(loginName)}'`;
         }
         else {
-            const aadGroupId = await this.getGroupId(args);
-            requestUrl += `/users/RemoveById(${aadGroupId})`;
+            const entraGroupId = await this.getGroupId(args);
+            requestUrl += `/users/RemoveById(${entraGroupId})`;
         }
         const requestOptions = {
             url: requestUrl,
@@ -107,14 +115,14 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
         const output = await cli.executeCommandWithOutput(SpoGroupMemberListCommand, { options: { ...options, _: [] } });
         const getGroupMemberListOutput = JSON.parse(output.stdout);
         let foundGroups;
-        if (args.options.aadGroupId) {
-            foundGroups = getGroupMemberListOutput.filter((x) => { return x.LoginName.indexOf(args.options.aadGroupId) > -1 && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
+        if (args.options.entraGroupId) {
+            foundGroups = getGroupMemberListOutput.filter((x) => { return x.LoginName.indexOf(args.options.entraGroupId) > -1 && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
         }
         else {
-            foundGroups = getGroupMemberListOutput.filter((x) => { return x.Title === args.options.aadGroupName && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
+            foundGroups = getGroupMemberListOutput.filter((x) => { return x.Title === args.options.entraGroupName && (x.LoginName.indexOf("c:0o.c|federateddirectoryclaimprovider|") === 0 || x.LoginName.indexOf("c:0t.c|tenant|") === 0); });
         }
         if (foundGroups.length === 0) {
-            throw `The Azure AD group ${args.options.aadGroupId || args.options.aadGroupName} is not found in SharePoint group ${args.options.groupId || args.options.groupName}`;
+            throw `The Azure AD group ${args.options.entraGroupId || args.options.entraGroupName} is not found in SharePoint group ${args.options.groupId || args.options.groupName}`;
         }
         return foundGroups[0].Id;
     }
@@ -127,8 +135,10 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
             userName: (!(!args.options.userName)).toString(),
             email: (!(!args.options.email)).toString(),
             userId: (!(!args.options.userId)).toString(),
+            entraGroupId: (!(!args.options.entraGroupId)).toString(),
             aadGroupId: (!(!args.options.groupId)).toString(),
-            aadGroupName: (!(!args.options.groupName)).toString(),
+            entraGroupName: (!(!args.options.entraGroupName)).toString(),
+            aadGroupName: (!(!args.options.aadGroupName)).toString(),
             force: (!(!args.options.force)).toString()
         });
     });
@@ -145,8 +155,12 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         option: '--email [email]'
     }, {
         option: '--userId [userId]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
     }, {
         option: '--aadGroupId [aadGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '--aadGroupName [aadGroupName]'
     }, {
@@ -166,13 +180,16 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
         if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
             return `${args.options.email} is not a valid email`;
         }
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `${args.options.entraGroupId} is not a valid GUID`;
+        }
         if (args.options.aadGroupId && !validation.isValidGuid(args.options.aadGroupId)) {
             return `${args.options.aadGroupId} is not a valid GUID`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 }, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId', 'aadGroupId', 'aadGroupName'] });
+    this.optionSets.push({ options: ['groupName', 'groupId'] }, { options: ['userName', 'email', 'userId', 'entraGroupId', 'aadGroupId', 'entraGroupName', 'aadGroupName'] });
 };
 export default new SpoGroupMemberRemoveCommand();
 //# sourceMappingURL=group-member-remove.js.map

package/dist/m365/spo/commands/user/user-ensure.js

@@ -25,12 +25,16 @@ class SpoUserEnsureCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.aadId) {
+            args.options.entraId = args.options.aadId;
+            this.warn(logger, `Option 'aadId' is deprecated. Please use 'entraId' instead`);
+        }
         if (this.verbose) {
-            await logger.logToStderr(`Ensuring user ${args.options.aadId || args.options.userName} at site ${args.options.webUrl}`);
+            await logger.logToStderr(`Ensuring user ${args.options.entraId || args.options.userName} at site ${args.options.webUrl}`);
         }
         try {
             const requestBody = {
-                logonName: args.options.userName || await this.getUpnByUserId(args.options.aadId, logger)
+                logonName: args.options.userName || await this.getUpnByUserId(args.options.entraId, logger)
             };
             const requestOptions = {
                 url: `${args.options.webUrl}/_api/web/ensureuser`,
@@ -47,16 +51,17 @@ class SpoUserEnsureCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getUpnByUserId(aadId, logger) {
+    async getUpnByUserId(entraId, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving user principal name for user with id ${aadId}`);
+            await logger.logToStderr(`Retrieving user principal name for user with id ${entraId}`);
         }
-        return await aadUser.getUpnByUserId(aadId);
+        return await aadUser.getUpnByUserId(entraId);
     }
 }
 _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelemetry = function _SpoUserEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            entraId: typeof args.options.entraId !== 'undefined',
             aadId: typeof args.options.aadId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined'
         });
@@ -64,6 +69,8 @@ _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelem
 }, _SpoUserEnsureCommand_initOptions = function _SpoUserEnsureCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--entraId [entraId]'
     }, {
         option: '--aadId [aadId]'
     }, {
@@ -75,6 +82,9 @@ _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelem
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
+        if (args.options.entraId && !validation.isValidGuid(args.options.entraId)) {
+            return `${args.options.entraId} is not a valid GUID.`;
+        }
         if (args.options.aadId && !validation.isValidGuid(args.options.aadId)) {
             return `${args.options.aadId} is not a valid GUID.`;
         }
@@ -84,7 +94,7 @@ _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelem
         return true;
     });
 }, _SpoUserEnsureCommand_initOptionSets = function _SpoUserEnsureCommand_initOptionSets() {
-    this.optionSets.push({ options: ['aadId', 'userName'] });
+    this.optionSets.push({ options: ['entraId', 'aadId', 'userName'] });
 };
 export default new SpoUserEnsureCommand();
 //# sourceMappingURL=user-ensure.js.map