@pnp/cli-microsoft365 7.4.0-beta.fce7b64 → 7.5.0-beta.23612bc

package/dist/m365/spo/commands/folder/folder-roleassignment-remove.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFolderRoleAssignmentRemoveCommand_instances, _SpoFolderRoleAssignmentRemoveCommand_initTelemetry, _SpoFolderRoleAssignmentRemoveCommand_initOptions, _SpoFolderRoleAssignmentRemoveCommand_initValidators;
+var _SpoFolderRoleAssignmentRemoveCommand_instances, _SpoFolderRoleAssignmentRemoveCommand_initTelemetry, _SpoFolderRoleAssignmentRemoveCommand_initOptions, _SpoFolderRoleAssignmentRemoveCommand_initValidators, _SpoFolderRoleAssignmentRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -26,6 +26,7 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeRoleAssignment = async () => {
@@ -105,7 +106,7 @@ _SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleA
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            force: (!(!args.options.force)).toString()
+            force: !!args.options.force
         });
     });
 }, _SpoFolderRoleAssignmentRemoveCommand_initOptions = function _SpoFolderRoleAssignmentRemoveCommand_initOptions() {
@@ -140,6 +141,9 @@ _SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleA
         }
         return true;
     });
+}, _SpoFolderRoleAssignmentRemoveCommand_initTypes = function _SpoFolderRoleAssignmentRemoveCommand_initTypes() {
+    this.types.string.push('webUrl', 'folderUrl', 'upn', 'groupName');
+    this.types.boolean.push('force');
 };
 export default new SpoFolderRoleAssignmentRemoveCommand();
 //# sourceMappingURL=folder-roleassignment-remove.js.map

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFolderRoleInheritanceBreakCommand_instances, _SpoFolderRoleInheritanceBreakCommand_initTelemetry, _SpoFolderRoleInheritanceBreakCommand_initOptions, _SpoFolderRoleInheritanceBreakCommand_initValidators;
+var _SpoFolderRoleInheritanceBreakCommand_instances, _SpoFolderRoleInheritanceBreakCommand_initTelemetry, _SpoFolderRoleInheritanceBreakCommand_initOptions, _SpoFolderRoleInheritanceBreakCommand_initValidators, _SpoFolderRoleInheritanceBreakCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -24,6 +24,7 @@ class SpoFolderRoleInheritanceBreakCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoFolderRoleInheritanceBreakCommand_instances, "m", _SpoFolderRoleInheritanceBreakCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderRoleInheritanceBreakCommand_instances, "m", _SpoFolderRoleInheritanceBreakCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRoleInheritanceBreakCommand_instances, "m", _SpoFolderRoleInheritanceBreakCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleInheritanceBreakCommand_instances, "m", _SpoFolderRoleInheritanceBreakCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const keepExistingPermissions = !args.options.clearExistingPermissions;
@@ -81,6 +82,9 @@ _SpoFolderRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFolderRoleI
     });
 }, _SpoFolderRoleInheritanceBreakCommand_initValidators = function _SpoFolderRoleInheritanceBreakCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+}, _SpoFolderRoleInheritanceBreakCommand_initTypes = function _SpoFolderRoleInheritanceBreakCommand_initTypes() {
+    this.types.string.push('webUrl', 'folderUrl');
+    this.types.boolean.push('clearExistingPermissions', 'force');
 };
 export default new SpoFolderRoleInheritanceBreakCommand();
 //# sourceMappingURL=folder-roleinheritance-break.js.map

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFolderRoleInheritanceResetCommand_instances, _SpoFolderRoleInheritanceResetCommand_initTelemetry, _SpoFolderRoleInheritanceResetCommand_initOptions, _SpoFolderRoleInheritanceResetCommand_initValidators;
+var _SpoFolderRoleInheritanceResetCommand_instances, _SpoFolderRoleInheritanceResetCommand_initTelemetry, _SpoFolderRoleInheritanceResetCommand_initOptions, _SpoFolderRoleInheritanceResetCommand_initValidators, _SpoFolderRoleInheritanceResetCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -24,6 +24,7 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoFolderRoleInheritanceResetCommand_instances, "m", _SpoFolderRoleInheritanceResetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderRoleInheritanceResetCommand_instances, "m", _SpoFolderRoleInheritanceResetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRoleInheritanceResetCommand_instances, "m", _SpoFolderRoleInheritanceResetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleInheritanceResetCommand_instances, "m", _SpoFolderRoleInheritanceResetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
@@ -77,6 +78,9 @@ _SpoFolderRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFolderRoleI
     });
 }, _SpoFolderRoleInheritanceResetCommand_initValidators = function _SpoFolderRoleInheritanceResetCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+}, _SpoFolderRoleInheritanceResetCommand_initTypes = function _SpoFolderRoleInheritanceResetCommand_initTypes() {
+    this.types.string.push('webUrl', 'folderUrl');
+    this.types.boolean.push('force');
 };
 export default new SpoFolderRoleInheritanceResetCommand();
 //# sourceMappingURL=folder-roleinheritance-reset.js.map

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

@@ -5,8 +5,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupMemberAddCommand_instances, _SpoGroupMemberAddCommand_initTelemetry, _SpoGroupMemberAddCommand_initOptions, _SpoGroupMemberAddCommand_initValidators, _SpoGroupMemberAddCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.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,21 +104,21 @@ 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}`);
                     }
-                    const groupId = await aadGroup.getGroupIdByDisplayName(trimmedIdentifier);
+                    const groupId = await entraGroup.getGroupIdByDisplayName(trimmedIdentifier);
                     validUserNames.push(groupId);
                 }
                 else {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting Azure AD ID for user ${trimmedIdentifier}`);
                     }
-                    const upn = await aadUser.getUserIdByEmail(trimmedIdentifier);
+                    const upn = await entraUser.getUserIdByEmail(trimmedIdentifier);
                     validUserNames.push(upn);
                 }
             }
@@ -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

@@ -8,7 +8,7 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import entraUserGetCommand from '../../../entra/commands/user/user-get.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import SpoGroupMemberListCommand from './group-member-list.js';
@@ -40,11 +40,19 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
             debug: args.options.debug,
             verbose: args.options.verbose
         };
-        const userGetOutput = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
+        const userGetOutput = await cli.executeCommandWithOutput(entraUserGetCommand, { options: { ...options, _: [] } });
         const userOutput = JSON.parse(userGetOutput.stdout);
         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/group/group-set.js

@@ -7,7 +7,7 @@ var _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupS
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import entraUserGetCommand from '../../../entra/commands/user/user-get.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 class SpoGroupSetCommand extends SpoCommand {
@@ -77,7 +77,7 @@ class SpoGroupSetCommand extends SpoCommand {
             debug: options.debug,
             verbose: options.verbose
         };
-        const output = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...cmdOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(entraUserGetCommand, { options: { ...cmdOptions, _: [] } });
         const getUserOutput = JSON.parse(output.stdout);
         const requestOptions = {
             url: `${options.webUrl}/_api/web/ensureUser('${getUserOutput.userPrincipalName}')?$select=Id`,

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

@@ -8,7 +8,7 @@ import chalk from 'chalk';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -57,7 +57,7 @@ class SpoSiteRemoveCommand extends SpoCommand {
                         await logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
                     }
                     try {
-                        const group = await aadGroup.getGroupById(groupId);
+                        const group = await entraGroup.getGroupById(groupId);
                         if (args.options.skipRecycleBin || args.options.wait) {
                             await logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
                         }

package/dist/m365/spo/commands/site/site-set.js

@@ -12,7 +12,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
-import aadM365GroupSetCommand from '../../../aad/commands/m365group/m365group-set.js';
+import entraM365GroupSetCommand from '../../../entra/commands/m365group/m365group-set.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { SharingCapabilities } from '../site/SharingCapabilities.js';
@@ -243,7 +243,7 @@ class SpoSiteSetCommand extends SpoCommand {
                 debug: this.debug,
                 verbose: this.verbose
             };
-            promises.push(cli.executeCommand(aadM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
+            promises.push(cli.executeCommand(entraM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
         }
         if (args.options.description) {
             promises.push(this.setGroupifiedSiteDescription(args.options.description));

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoUserEnsureCommand_instances, _SpoUserEnsureCommand_initTelemetry, _SpoUserEnsureCommand_initOptions, _SpoUserEnsureCommand_initValidators, _SpoUserEnsureCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.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 entraUser.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

package/dist/m365/teams/commands/app/app-install.js

@@ -8,7 +8,7 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import entraUserGetCommand from '../../../entra/commands/user/user-get.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TeamsAppInstallCommand extends GraphCommand {
@@ -70,7 +70,7 @@ class TeamsAppInstallCommand extends GraphCommand {
             verbose: args.options.verbose
         };
         try {
-            const res = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
+            const res = await cli.executeCommandWithOutput(entraUserGetCommand, { options: { ...options, _: [] } });
             if (this.verbose) {
                 await logger.logToStderr(res.stderr);
             }

package/dist/m365/teams/commands/channel/channel-get.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelGetCommand_instances, _TeamsChannelGetCommand_initTelemetry, _TeamsChannelGetCommand_initOptions, _TeamsChannelGetCommand_initValidators, _TeamsChannelGetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -30,7 +30,7 @@ class TeamsChannelGetCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw `The specified team does not exist in the Microsoft Teams`;
         }

package/dist/m365/teams/commands/channel/channel-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsChannelListCommand_instances, _TeamsChannelListCommand_initTelemetry, _TeamsChannelListCommand_initOptions, _TeamsChannelListCommand_initValidators, _TeamsChannelListCommand_initOptionSets;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -31,7 +31,7 @@ class TeamsChannelListCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/channel/channel-member-add.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelMemberAddCommand_instances, _TeamsChannelMemberAddCommand_initTelemetry, _TeamsChannelMemberAddCommand_initOptions, _TeamsChannelMemberAddCommand_initValidators, _TeamsChannelMemberAddCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -63,7 +63,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/channel/channel-member-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelMemberListCommand_instances, _TeamsChannelMemberListCommand_initTelemetry, _TeamsChannelMemberListCommand_initOptions, _TeamsChannelMemberListCommand_initValidators, _TeamsChannelMemberListCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -55,7 +55,7 @@ class TeamsChannelMemberListCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/channel/channel-member-remove.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelMemberRemoveCommand_instances, _TeamsChannelMemberRemoveCommand_initTelemetry, _TeamsChannelMemberRemoveCommand_initOptions, _TeamsChannelMemberRemoveCommand_initValidators, _TeamsChannelMemberRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -72,7 +72,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/channel/channel-member-set.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelMemberSetCommand_instances, _TeamsChannelMemberSetCommand_initTelemetry, _TeamsChannelMemberSetCommand_initOptions, _TeamsChannelMemberSetCommand_initValidators, _TeamsChannelMemberSetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -56,7 +56,7 @@ class TeamsChannelMemberSetCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw `The specified team does not exist in the Microsoft Teams`;
         }

package/dist/m365/teams/commands/channel/channel-remove.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators, _TeamsChannelRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -63,7 +63,7 @@ class TeamsChannelRemoveCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist';
         }

package/dist/m365/teams/commands/channel/channel-set.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelSetCommand_instances, _TeamsChannelSetCommand_initTelemetry, _TeamsChannelSetCommand_initOptions, _TeamsChannelSetCommand_initValidators, _TeamsChannelSetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -58,7 +58,7 @@ class TeamsChannelSetCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist';
         }