@pnp/cli-microsoft365 7.5.0-beta.494c631 → 7.5.0-beta.c0c1edf

package/dist/m365/spo/commands/spo-search.js

@@ -38,16 +38,15 @@ class SpoSearchCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Executing search query '${args.options.queryText}' on site at ${webUrl}...`);
             }
-            const startRow = args.options.startRow ? args.options.startRow : 0;
-            const results = await this.executeSearchQuery(logger, args, webUrl, [], startRow);
+            const results = await this.executeSearchQuery(logger, args, webUrl, []);
             this.printResults(logger, args, results);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async executeSearchQuery(logger, args, webUrl, resultSet, startRow) {
-        const requestUrl = await this.getRequestUrl(webUrl, logger, args, startRow);
+    async executeSearchQuery(logger, args, webUrl, resultSet, lastDocId = '0') {
+        const requestUrl = await this.getRequestUrl(webUrl, logger, args, lastDocId);
         const requestOptions = {
             url: requestUrl,
             headers: {
@@ -57,26 +56,36 @@ class SpoSearchCommand extends SpoCommand {
         };
         const searchResult = await request.get(requestOptions);
         resultSet.push(searchResult);
-        if (args.options.allResults && startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount < searchResult.PrimaryQueryResult.RelevantResults.TotalRows) {
-            const nextStartRow = startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount;
-            return this.executeSearchQuery(logger, args, webUrl, resultSet, nextStartRow);
+        const rowLimit = args.options.rowLimit ? args.options.rowLimit : 500;
+        if (args.options.allResults && searchResult.PrimaryQueryResult.RelevantResults.RowCount === rowLimit) {
+            if (this.verbose) {
+                await logger.logToStderr(`Processing search query, retrieved ${resultSet.length * searchResult.PrimaryQueryResult.RelevantResults.RowCount} of ${resultSet[0].PrimaryQueryResult.RelevantResults.TotalRows} items...`);
+            }
+            // When running in allResults mode, paging is done using the DocId property
+            // This is a more stable way than using the StartRow property.
+            // Explanation: https://learn.microsoft.com/sharepoint/dev/general-development/pagination-for-large-result-sets
+            const lastRow = searchResult.PrimaryQueryResult.RelevantResults.Table.Rows[searchResult.PrimaryQueryResult.RelevantResults.RowCount - 1];
+            const newLastDocId = lastRow.Cells.filter(cell => cell.Key === 'DocId')[0].Value;
+            return this.executeSearchQuery(logger, args, webUrl, resultSet, newLastDocId);
         }
         return resultSet;
     }
-    async getRequestUrl(webUrl, logger, args, startRow) {
+    async getRequestUrl(webUrl, logger, args, lastDocId) {
         // get the list of selected properties
         const selectPropertiesArray = this.getSelectPropertiesArray(args);
+        // get the sort list
+        const sortList = this.getSortList(args);
         // transform arg data to query string parameters
-        const propertySelectRequestString = `&selectproperties='${formatting.encodeQueryParameter(selectPropertiesArray.join(","))}'`;
-        const startRowRequestString = `&startrow=${startRow ? startRow : 0}`;
-        const rowLimitRequestString = args.options.rowLimit ? `&rowlimit=${args.options.rowLimit}` : ``;
+        const propertySelectRequestString = `&selectproperties='${formatting.encodeQueryParameter(selectPropertiesArray.join(','))}'`;
+        const startRowRequestString = `&startrow=${args.options.startRow ? args.options.startRow : 0}`;
+        const rowLimitRequestString = args.options.rowLimit ? `&rowlimit=${args.options.rowLimit}` : (args.options.allResults ? `&rowlimit=500` : '');
         const sourceIdRequestString = args.options.sourceId ? `&sourceid='${args.options.sourceId}'` : ``;
-        const trimDuplicatesRequestString = `&trimduplicates=${args.options.trimDuplicates ? args.options.trimDuplicates : "false"}`;
-        const enableStemmingRequestString = `&enablestemming=${typeof (args.options.enableStemming) === 'undefined' ? "true" : args.options.enableStemming}`;
+        const trimDuplicatesRequestString = `&trimduplicates=${args.options.trimDuplicates ? args.options.trimDuplicates : 'false'}`;
+        const enableStemmingRequestString = `&enablestemming=${typeof (args.options.enableStemming) === 'undefined' ? 'true' : args.options.enableStemming}`;
         const cultureRequestString = args.options.culture ? `&culture=${args.options.culture}` : ``;
         const refinementFiltersRequestString = args.options.refinementFilters ? `&refinementfilters='${args.options.refinementFilters}'` : ``;
         const queryTemplateRequestString = args.options.queryTemplate ? `&querytemplate='${args.options.queryTemplate}'` : ``;
-        const sortListRequestString = args.options.sortList ? `&sortList='${formatting.encodeQueryParameter(args.options.sortList)}'` : ``;
+        const sortListRequestString = sortList ? `&sortList='${sortList}'` : ``;
         const rankingModelIdRequestString = args.options.rankingModelId ? `&rankingmodelid='${args.options.rankingModelId}'` : ``;
         const propertiesRequestString = this.getPropertiesRequestString(args);
         const refinersRequestString = args.options.refiners ? `&refiners='${args.options.refiners}'` : ``;
@@ -86,8 +95,9 @@ class SpoSearchCommand extends SpoCommand {
         const processBestBetsRequestString = typeof (args.options.processBestBets) === 'undefined' ? `` : `&processbestbets=${args.options.processBestBets}`;
         const enableQueryRulesRequestString = typeof (args.options.enableQueryRules) === 'undefined' ? `` : `&enablequeryrules=${args.options.enableQueryRules}`;
         const processPersonalFavoritesRequestString = typeof (args.options.processPersonalFavorites) === 'undefined' ? `` : `&processpersonalfavorites=${args.options.processPersonalFavorites}`;
+        const indexDocIdQueryText = args.options.allResults ? ` IndexDocId>${lastDocId}` : '';
         // construct single requestUrl
-        const requestUrl = `${webUrl}/_api/search/query?querytext='${args.options.queryText}'`.concat(propertySelectRequestString, startRowRequestString, rowLimitRequestString, sourceIdRequestString, trimDuplicatesRequestString, enableStemmingRequestString, cultureRequestString, refinementFiltersRequestString, queryTemplateRequestString, sortListRequestString, rankingModelIdRequestString, propertiesRequestString, refinersRequestString, hiddenConstraintsRequestString, clientTypeRequestString, enablePhoneticRequestString, processBestBetsRequestString, enableQueryRulesRequestString, processPersonalFavoritesRequestString);
+        const requestUrl = `${webUrl}/_api/search/query?querytext='${args.options.queryText}${indexDocIdQueryText}'`.concat(propertySelectRequestString, startRowRequestString, rowLimitRequestString, sourceIdRequestString, trimDuplicatesRequestString, enableStemmingRequestString, cultureRequestString, refinementFiltersRequestString, queryTemplateRequestString, sortListRequestString, rankingModelIdRequestString, propertiesRequestString, refinersRequestString, hiddenConstraintsRequestString, clientTypeRequestString, enablePhoneticRequestString, processBestBetsRequestString, enableQueryRulesRequestString, processPersonalFavoritesRequestString);
         if (this.debug) {
             await logger.logToStderr(`RequestURL: ${requestUrl}`);
         }
@@ -96,7 +106,7 @@ class SpoSearchCommand extends SpoCommand {
     getPropertiesRequestString(args) {
         let properties = args.options.properties ? args.options.properties : '';
         if (args.options.sourceName) {
-            if (properties && !properties.endsWith(",")) {
+            if (properties && !properties.endsWith(',')) {
                 properties += `,`;
             }
             properties += `SourceName:${args.options.sourceName},SourceLevel:SPSite`;
@@ -104,9 +114,26 @@ class SpoSearchCommand extends SpoCommand {
         return properties ? `&properties='${properties}'` : ``;
     }
     getSelectPropertiesArray(args) {
-        return args.options.selectProperties
-            ? args.options.selectProperties.split(",")
-            : ["Title", "OriginalPath"];
+        const selectProperties = args.options.selectProperties
+            ? args.options.selectProperties.split(',')
+            : ['Title', 'OriginalPath'];
+        if (args.options.allResults) {
+            selectProperties.filter(p => p.toLowerCase() !== 'docid').push('DocId');
+        }
+        return selectProperties;
+    }
+    getSortList(args) {
+        const sortList = [];
+        if (args.options.allResults) {
+            sortList.push(formatting.encodeQueryParameter('[DocId]:ascending'));
+        }
+        if (args.options.sortList) {
+            const sortListArray = args.options.sortList.split(',');
+            sortListArray.forEach(sortItem => {
+                sortList.push(formatting.encodeQueryParameter(sortItem));
+            });
+        }
+        return sortList.join(',');
     }
     async printResults(logger, args, results) {
         if (args.options.rawOutput) {
@@ -116,9 +143,9 @@ class SpoSearchCommand extends SpoCommand {
             await logger.log(this.getParsedOutput(args, results));
         }
         if (!args.options.output || cli.shouldTrimOutput(args.options.output)) {
-            await logger.log("# Rows: " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
-            await logger.log("# Rows (Including duplicates): " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
-            await logger.log("Elapsed Time: " + this.getElapsedTime(results));
+            await logger.log('# Rows: ' + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
+            await logger.log('# Rows (Including duplicates): ' + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
+            await logger.log('Elapsed Time: ' + this.getElapsedTime(results));
         }
     }
     getElapsedTime(results) {
@@ -245,6 +272,9 @@ _SpoSearchCommand_instances = new WeakSet(), _SpoSearchCommand_initTelemetry = f
         if (args.options.startRow && !isNumber(args.options.startRow)) {
             return `${args.options.startRow} is not a valid number`;
         }
+        if (args.options.startRow && args.options.allResults) {
+            return 'You cannot specify startRow when allResults is set';
+        }
         if (args.options.culture && !isNumber(args.options.culture)) {
             return `${args.options.culture} is not a valid number`;
         }

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';
@@ -55,7 +55,7 @@ class SpoUserEnsureCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving user principal name for user with id ${entraId}`);
         }
-        return await aadUser.getUpnByUserId(entraId);
+        return await entraUser.getUpnByUserId(entraId);
     }
 }
 _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelemetry = function _SpoUserEnsureCommand_initTelemetry() {

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 '../../../entra/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';
         }

package/dist/m365/teams/commands/meeting/meeting-add.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMeetingAddCommand_instances, _TeamsMeetingAddCommand_initTelemetry, _TeamsMeetingAddCommand_initOptions, _TeamsMeetingAddCommand_initValidators;
 import auth from '../../../../Auth.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from "../../../base/GraphCommand.js";
@@ -53,7 +53,7 @@ class TeamsMeetingAddCommand extends GraphCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving Organizer Id...`);
             }
-            const organizerId = await aadUser.getUserIdByEmail(options.organizerEmail);
+            const organizerId = await entraUser.getUserIdByEmail(options.organizerEmail);
             requestUrl = `${this.resource}/v1.0/users/${organizerId}`;
         }
         if (this.verbose) {

package/dist/m365/teams/commands/meeting/meeting-attendancereport-list.js

@@ -9,7 +9,7 @@ import { cli } from '../../../../cli/cli.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../entra/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 TeamsMeetingAttendancereportListCommand extends GraphCommand {
@@ -71,7 +71,7 @@ class TeamsMeetingAttendancereportListCommand extends GraphCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
+        const output = await cli.executeCommandWithOutput(entraUserGetCommand, { options: { ...options, _: [] } });
         const getUserOutput = JSON.parse(output.stdout);
         return getUserOutput.id;
     }

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMeetingGetCommand_instances, _TeamsMeetingGetCommand_initTelemetry, _TeamsMeetingGetCommand_initOptions, _TeamsMeetingGetCommand_initValidators;
 import auth from '../../../../Auth.js';
 import request from '../../../../request.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -76,9 +76,9 @@ class TeamsMeetingGetCommand extends GraphCommand {
             return options.userId;
         }
         if (options.userName) {
-            return aadUser.getUserIdByUpn(options.userName);
+            return entraUser.getUserIdByUpn(options.userName);
         }
-        return aadUser.getUserIdByEmail(options.email);
+        return entraUser.getUserIdByEmail(options.email);
     }
 }
 _TeamsMeetingGetCommand_instances = new WeakSet(), _TeamsMeetingGetCommand_initTelemetry = function _TeamsMeetingGetCommand_initTelemetry() {

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMeetingListCommand_instances, _TeamsMeetingListCommand_initTelemetry, _TeamsMeetingListCommand_initOptions, _TeamsMeetingListCommand_initValidators;
 import auth from '../../../../Auth.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -60,7 +60,7 @@ class TeamsMeetingListCommand extends GraphCommand {
             requestUrl += `users/${options.userId || options.userName}`;
         }
         else if (options.email) {
-            const userId = await aadUser.getUserIdByEmail(options.email);
+            const userId = await entraUser.getUserIdByEmail(options.email);
             requestUrl += `users/${userId}`;
         }
         else {

package/dist/m365/teams/commands/meeting/meeting-transcript-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMeetingTranscriptListCommand_instances, _TeamsMeetingTranscriptListCommand_initTelemetry, _TeamsMeetingTranscriptListCommand_initOptions, _TeamsMeetingTranscriptListCommand_initValidators, _TeamsMeetingTranscriptListCommand_initOptionSets;
 import auth from '../../../../Auth.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -51,7 +51,7 @@ class TeamsMeetingTranscriptListCommand extends GraphCommand {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting user ID for user with email '${args.options.email}'.`);
                     }
-                    const userId = await aadUser.getUserIdByEmail(args.options.email);
+                    const userId = await entraUser.getUserIdByEmail(args.options.email);
                     requestUrl += userId;
                 }
             }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTabGetCommand_instances, _TeamsTabGetCommand_initTelemetry, _TeamsTabGetCommand_initOptions, _TeamsTabGetCommand_initValidators, _TeamsTabGetCommand_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';
@@ -31,7 +31,7 @@ class TeamsTabGetCommand 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/team/team-add.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamAddCommand_instances, _TeamsTeamAddCommand_initTelemetry, _TeamsTeamAddCommand_initOptions, _TeamsTeamAddCommand_initOptionSets;
 import { setTimeout } from 'timers/promises';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TeamsTeamAddCommand extends GraphCommand {
@@ -77,8 +77,8 @@ class TeamsTeamAddCommand extends GraphCommand {
             }
             else {
                 await this.waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger);
-                const aadGroup = await this.getAadGroup(teamsAsyncOperation.targetResourceId, logger);
-                await logger.log(aadGroup);
+                const entraGroup = await this.getEntraGroup(teamsAsyncOperation.targetResourceId, logger);
+                await logger.log(entraGroup);
             }
         }
         catch (err) {
@@ -104,17 +104,17 @@ class TeamsTeamAddCommand extends GraphCommand {
             await this.waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger);
         }
     }
-    async getAadGroup(id, logger) {
+    async getEntraGroup(id, logger) {
         let group;
         try {
-            group = await aadGroup.getGroupById(id);
+            group = await entraGroup.getGroupById(id);
         }
         catch {
             if (this.verbose) {
                 await logger.logToStderr(`Error occurred on retrieving the aad group. Retrying in ${this.pollingInterval / 1000} seconds.`);
             }
             await setTimeout(this.pollingInterval);
-            return await this.getAadGroup(id, logger);
+            return await this.getEntraGroup(id, logger);
         }
         return group;
     }

package/dist/m365/teams/commands/team/team-archive.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamArchiveCommand_instances, _TeamsTeamArchiveCommand_initTelemetry, _TeamsTeamArchiveCommand_initOptions, _TeamsTeamArchiveCommand_initValidators, _TeamsTeamArchiveCommand_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';
@@ -29,7 +29,7 @@ class TeamsTeamArchiveCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.name);
+        const group = await entraGroup.getGroupByDisplayName(args.options.name);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamGetCommand_instances, _TeamsTeamGetCommand_initTelemetry, _TeamsTeamGetCommand_initOptions, _TeamsTeamGetCommand_initValidators, _TeamsTeamGetCommand_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';
@@ -29,7 +29,7 @@ class TeamsTeamGetCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.name);
+        const group = await entraGroup.getGroupByDisplayName(args.options.name);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators, _TeamsTeamRemoveCommand_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';
@@ -30,7 +30,7 @@ class TeamsTeamRemoveCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.name);
+        const group = await entraGroup.getGroupByDisplayName(args.options.name);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw `The specified team does not exist in the Microsoft Teams`;
         }

package/dist/m365/teams/commands/team/team-unarchive.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamUnarchiveCommand_instances, _TeamsTeamUnarchiveCommand_initOptions, _TeamsTeamUnarchiveCommand_initValidators, _TeamsTeamUnarchiveCommand_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';
@@ -28,7 +28,7 @@ class TeamsTeamUnarchiveCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.name);
+        const group = await entraGroup.getGroupByDisplayName(args.options.name);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }