From 423f2574f42f4defd36beb2e5e071d085a8e9961 Mon Sep 17 00:00:00 2001 From: Nico De Cleyre Date: Sun, 14 Jan 2024 14:20:49 +0100 Subject: [PATCH] Renames 'aad' utils to 'entra'. Closes #5757 --- src/m365/app/commands/app-get.ts | 6 ++-- .../administrativeunit-get.spec.ts | 6 ++-- .../administrativeunit-get.ts | 4 +-- .../administrativeunit-member-add.spec.ts | 28 ++++++++--------- .../administrativeunit-member-add.ts | 16 +++++----- .../administrativeunit-member-get.spec.ts | 6 ++-- .../administrativeunit-member-get.ts | 4 +-- .../administrativeunit-member-list.spec.ts | 6 ++-- .../administrativeunit-member-list.ts | 4 +-- .../administrativeunit-remove.spec.ts | 6 ++-- .../administrativeunit-remove.ts | 4 +-- ...inistrativeunit-roleassignment-add.spec.ts | 28 ++++++++--------- .../administrativeunit-roleassignment-add.ts | 8 ++--- src/m365/entra/commands/group/group-get.ts | 6 ++-- .../entra/commands/group/group-remove.spec.ts | 8 ++--- src/m365/entra/commands/group/group-remove.ts | 4 +-- .../commands/group/group-user-list.spec.ts | 6 ++-- .../entra/commands/group/group-user-list.ts | 4 +-- .../m365group-conversation-list.spec.ts | 8 ++--- .../m365group/m365group-conversation-list.ts | 4 +-- .../m365group-conversation-post-list.spec.ts | 8 ++--- .../m365group-conversation-post-list.ts | 6 ++-- .../commands/m365group/m365group-get.spec.ts | 8 ++--- .../entra/commands/m365group/m365group-get.ts | 6 ++-- .../m365group/m365group-remove.spec.ts | 8 ++--- .../commands/m365group/m365group-remove.ts | 4 +-- .../m365group/m365group-renew.spec.ts | 8 ++--- .../commands/m365group/m365group-renew.ts | 4 +-- .../commands/m365group/m365group-set.spec.ts | 8 ++--- .../entra/commands/m365group/m365group-set.ts | 4 +-- .../m365group/m365group-teamify.spec.ts | 8 ++--- .../commands/m365group/m365group-teamify.ts | 4 +-- .../m365group/m365group-user-add.spec.ts | 8 ++--- .../commands/m365group/m365group-user-add.ts | 4 +-- .../m365group/m365group-user-list.spec.ts | 14 ++++----- .../commands/m365group/m365group-user-list.ts | 6 ++-- .../m365group/m365group-user-remove.spec.ts | 8 ++--- .../m365group/m365group-user-remove.ts | 4 +-- .../m365group/m365group-user-set.spec.ts | 8 ++--- .../commands/m365group/m365group-user-set.ts | 4 +-- .../flow/commands/owner/owner-ensure.spec.ts | 12 ++++---- src/m365/flow/commands/owner/owner-ensure.ts | 8 ++--- .../flow/commands/owner/owner-remove.spec.ts | 12 ++++---- src/m365/flow/commands/owner/owner-remove.ts | 8 ++--- .../commands/notebook/notebook-list.ts | 4 +-- src/m365/onenote/commands/page/page-list.ts | 4 +-- src/m365/pa/commands/app/app-owner-set.ts | 4 +-- .../app/app-permission-ensure.spec.ts | 8 ++--- .../pa/commands/app/app-permission-ensure.ts | 8 ++--- .../app/app-permission-remove.spec.ts | 12 ++++---- .../pa/commands/app/app-permission-remove.ts | 8 ++--- .../planner/commands/bucket/bucket-add.ts | 4 +-- .../planner/commands/bucket/bucket-get.ts | 4 +-- .../planner/commands/bucket/bucket-list.ts | 4 +-- .../planner/commands/bucket/bucket-remove.ts | 4 +-- .../planner/commands/bucket/bucket-set.ts | 4 +-- src/m365/planner/commands/plan/plan-add.ts | 4 +-- src/m365/planner/commands/plan/plan-get.ts | 4 +-- src/m365/planner/commands/plan/plan-list.ts | 4 +-- src/m365/planner/commands/plan/plan-remove.ts | 4 +-- src/m365/planner/commands/plan/plan-set.ts | 4 +-- .../commands/roster/roster-member-add.spec.ts | 6 ++-- .../commands/roster/roster-member-add.ts | 4 +-- .../commands/roster/roster-member-get.ts | 4 +-- .../commands/roster/roster-member-remove.ts | 4 +-- src/m365/planner/commands/task/task-add.ts | 4 +-- src/m365/planner/commands/task/task-get.ts | 4 +-- src/m365/planner/commands/task/task-list.ts | 4 +-- src/m365/planner/commands/task/task-remove.ts | 4 +-- src/m365/planner/commands/task/task-set.ts | 4 +-- .../spo/commands/group/group-member-add.ts | 9 +++--- .../spo/commands/group/group-member-remove.ts | 6 ++-- src/m365/spo/commands/group/group-set.ts | 6 ++-- src/m365/spo/commands/site/site-remove.ts | 4 +-- src/m365/spo/commands/site/site-set.ts | 6 ++-- .../spo/commands/user/user-ensure.spec.ts | 10 +++---- src/m365/spo/commands/user/user-ensure.ts | 4 +-- src/m365/teams/commands/app/app-install.ts | 6 ++-- .../teams/commands/channel/channel-get.ts | 4 +-- .../teams/commands/channel/channel-list.ts | 4 +-- .../commands/channel/channel-member-add.ts | 4 +-- .../commands/channel/channel-member-list.ts | 4 +-- .../commands/channel/channel-member-remove.ts | 4 +-- .../commands/channel/channel-member-set.ts | 4 +-- .../teams/commands/channel/channel-remove.ts | 4 +-- .../teams/commands/channel/channel-set.ts | 4 +-- .../commands/meeting/meeting-add.spec.ts | 4 +-- .../teams/commands/meeting/meeting-add.ts | 4 +-- .../meeting/meeting-attendancereport-list.ts | 6 ++-- .../commands/meeting/meeting-get.spec.ts | 10 +++---- .../teams/commands/meeting/meeting-get.ts | 6 ++-- .../commands/meeting/meeting-list.spec.ts | 8 ++--- .../teams/commands/meeting/meeting-list.ts | 4 +-- .../meeting/meeting-transcript-list.ts | 4 +-- src/m365/teams/commands/tab/tab-get.ts | 4 +-- src/m365/teams/commands/team/team-add.spec.ts | 6 ++-- src/m365/teams/commands/team/team-add.ts | 12 ++++---- src/m365/teams/commands/team/team-archive.ts | 4 +-- src/m365/teams/commands/team/team-get.ts | 4 +-- src/m365/teams/commands/team/team-remove.ts | 4 +-- .../teams/commands/team/team-unarchive.ts | 4 +-- ...pec.ts => entraAdministrativeUnit.spec.ts} | 12 ++++---- ...tiveUnit.ts => entraAdministrativeUnit.ts} | 2 +- ...{aadDevice.spec.ts => entraDevice.spec.ts} | 12 ++++---- src/utils/{aadDevice.ts => entraDevice.ts} | 2 +- .../{aadGroup.spec.ts => entraGroup.spec.ts} | 30 +++++++++---------- src/utils/{aadGroup.ts => entraGroup.ts} | 2 +- .../{aadUser.spec.ts => entraUser.spec.ts} | 14 ++++----- src/utils/{aadUser.ts => entraUser.ts} | 2 +- src/utils/spo.spec.ts | 4 +-- src/utils/spo.ts | 4 +-- 111 files changed, 357 insertions(+), 358 deletions(-) rename src/utils/{aadAdministrativeUnit.spec.ts => entraAdministrativeUnit.spec.ts} (82%) rename src/utils/{aadAdministrativeUnit.ts => entraAdministrativeUnit.ts} (96%) rename src/utils/{aadDevice.spec.ts => entraDevice.spec.ts} (85%) rename src/utils/{aadDevice.ts => entraDevice.ts} (97%) rename src/utils/{aadGroup.spec.ts => entraGroup.spec.ts} (85%) rename src/utils/{aadGroup.ts => entraGroup.ts} (99%) rename src/utils/{aadUser.spec.ts => entraUser.spec.ts} (81%) rename src/utils/{aadUser.ts => entraUser.ts} (98%) diff --git a/src/m365/app/commands/app-get.ts b/src/m365/app/commands/app-get.ts index e72330ca2e2..70e6c67ba8d 100644 --- a/src/m365/app/commands/app-get.ts +++ b/src/m365/app/commands/app-get.ts @@ -1,7 +1,7 @@ import { cli } from '../../../cli/cli.js'; import { Logger } from '../../../cli/Logger.js'; import Command from '../../../Command.js'; -import aadAppGetCommand, { Options as AadAppGetCommandOptions } from '../../entra/commands/app/app-get.js'; +import entraAppGetCommand, { Options as EntraAppGetCommandOptions } from '../../entra/commands/app/app-get.js'; import AppCommand, { AppCommandArgs } from '../../base/AppCommand.js'; import commands from '../commands.js'; @@ -15,7 +15,7 @@ class AppGetCommand extends AppCommand { } public async commandAction(logger: Logger, args: AppCommandArgs): Promise { - const options: AadAppGetCommandOptions = { + const options: EntraAppGetCommandOptions = { appId: this.appId, output: 'json', debug: args.options.debug, @@ -23,7 +23,7 @@ class AppGetCommand extends AppCommand { }; try { - const appGetOutput = await cli.executeCommandWithOutput(aadAppGetCommand as Command, { options: { ...options, _: [] } }); + const appGetOutput = await cli.executeCommandWithOutput(entraAppGetCommand as Command, { options: { ...options, _: [] } }); if (this.verbose) { await logger.logToStderr(appGetOutput.stderr); } diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-get.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-get.spec.ts index 3fd827f0ea8..5eba7086d42 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-get.spec.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-get.spec.ts @@ -12,7 +12,7 @@ import command from './administrativeunit-get.js'; import request from '../../../../request.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; import { CommandError } from '../../../../Command.js'; -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; import aadCommands from '../../aadCommands.js'; describe(commands.ADMINISTRATIVEUNIT_GET, () => { @@ -65,7 +65,7 @@ describe(commands.ADMINISTRATIVEUNIT_GET, () => { afterEach(() => { sinonUtil.restore([ request.get, - aadAdministrativeUnit.getAdministrativeUnitByDisplayName, + entraAdministrativeUnit.getAdministrativeUnitByDisplayName, cli.handleMultipleResultsFound ]); }); @@ -107,7 +107,7 @@ describe(commands.ADMINISTRATIVEUNIT_GET, () => { }); it('retrieves information about the specified administrative unit by displayName', async () => { - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').resolves(administrativeUnitsReponse.value[0]); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').resolves(administrativeUnitsReponse.value[0]); await command.action(logger, { options: { displayName: validDisplayName } }); assert(loggerLogSpy.calledOnceWithExactly(administrativeUnitsReponse.value[0])); diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-get.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-get.ts index 31bf18f9b67..0d92d13abbc 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-get.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-get.ts @@ -5,7 +5,7 @@ import { validation } from "../../../../utils/validation.js"; import request, { CliRequestOptions } from "../../../../request.js"; import GraphCommand from "../../../base/GraphCommand.js"; import commands from "../../commands.js"; -import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js"; +import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js"; import aadCommands from "../../aadCommands.js"; interface CommandArgs { @@ -88,7 +88,7 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand { administrativeUnit = await this.getAdministrativeUnitById(args.options.id); } else { - administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName!); + administrativeUnit = await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName!); } await logger.log(administrativeUnit); diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.spec.ts index 04ca4fcbc97..4630784eb9e 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.spec.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.spec.ts @@ -12,10 +12,10 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js'; import { cli } from '../../../../cli/cli.js'; import { CommandInfo } from '../../../../cli/CommandInfo.js'; import command from './administrativeunit-member-add.js'; -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; -import { aadUser } from '../../../../utils/aadUser.js'; -import { aadDevice } from '../../../../utils/aadDevice.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; +import { entraUser } from '../../../../utils/entraUser.js'; +import { entraDevice } from '../../../../utils/entraDevice.js'; import { settingsNames } from '../../../../settingsNames.js'; import aadCommands from '../../aadCommands.js'; @@ -60,10 +60,10 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_ADD, () => { afterEach(() => { sinonUtil.restore([ request.post, - aadAdministrativeUnit.getAdministrativeUnitByDisplayName, - aadUser.getUserIdByUpn, - aadGroup.getGroupIdByDisplayName, - aadDevice.getDeviceByDisplayName, + entraAdministrativeUnit.getAdministrativeUnitByDisplayName, + entraUser.getUserIdByUpn, + entraGroup.getGroupIdByDisplayName, + entraDevice.getDeviceByDisplayName, cli.getSettingWithDefaultValue, cli.handleMultipleResultsFound, cli.promptForSelection @@ -374,8 +374,8 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_ADD, () => { }); it('adds a user specified by its name to an administrative unit specified by its name (verbose)', async () => { - sinon.stub(aadUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); + sinon.stub(entraUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); const postStub = sinon.stub(request, 'post').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/$ref`) { @@ -405,8 +405,8 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_ADD, () => { }); it('adds a group specified by its name to an administrative unit specified by its name (verbose)', async () => { - sinon.stub(aadGroup, 'getGroupIdByDisplayName').withArgs(groupName).resolves(groupId); - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); + sinon.stub(entraGroup, 'getGroupIdByDisplayName').withArgs(groupName).resolves(groupId); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); const postStub = sinon.stub(request, 'post').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/$ref`) { @@ -436,8 +436,8 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_ADD, () => { }); it('adds a device specified by its name to an administrative unit specified by its name (verbose)', async () => { - sinon.stub(aadDevice, 'getDeviceByDisplayName').withArgs(deviceName).resolves({ id: deviceId, displayName: deviceName }); - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); + sinon.stub(entraDevice, 'getDeviceByDisplayName').withArgs(deviceName).resolves({ id: deviceId, displayName: deviceName }); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); const postStub = sinon.stub(request, 'post').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/$ref`) { diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.ts index df85b6d04a2..49e0972edf7 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-member-add.ts @@ -1,13 +1,13 @@ import GlobalOptions from "../../../../GlobalOptions.js"; import { Logger } from "../../../../cli/Logger.js"; -import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js"; -import { aadGroup } from "../../../../utils/aadGroup.js"; -import { aadUser } from "../../../../utils/aadUser.js"; +import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js"; +import { entraGroup } from "../../../../utils/entraGroup.js"; +import { entraUser } from "../../../../utils/entraUser.js"; import { validation } from "../../../../utils/validation.js"; import GraphCommand from "../../../base/GraphCommand.js"; import commands from "../../commands.js"; import request, { CliRequestOptions } from "../../../../request.js"; -import { aadDevice } from "../../../../utils/aadDevice.js"; +import { entraDevice } from "../../../../utils/entraDevice.js"; import aadCommands from "../../aadCommands.js"; interface CommandArgs { @@ -129,7 +129,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand { await logger.logToStderr(`Retrieving Administrative Unit Id...`); } - administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id!; + administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id!; } if (args.options.userId || args.options.userName) { @@ -141,7 +141,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand { await logger.logToStderr(`Retrieving User Id...`); } - memberId = await aadUser.getUserIdByUpn(args.options.userName); + memberId = await entraUser.getUserIdByUpn(args.options.userName); } } else if (args.options.groupId || args.options.groupName) { @@ -153,7 +153,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand { await logger.logToStderr(`Retrieving Group Id...`); } - memberId = await aadGroup.getGroupIdByDisplayName(args.options.groupName); + memberId = await entraGroup.getGroupIdByDisplayName(args.options.groupName); } } else if (args.options.deviceId || args.options.deviceName) { @@ -165,7 +165,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand { await logger.logToStderr(`Device with name ${args.options.deviceName} retrieved, returned id: ${memberId}`); } - memberId = (await aadDevice.getDeviceByDisplayName(args.options.deviceName)).id; + memberId = (await entraDevice.getDeviceByDisplayName(args.options.deviceName)).id; } } diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.spec.ts index 04b9ca8b705..c4cad90a757 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.spec.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.spec.ts @@ -12,7 +12,7 @@ import command from './administrativeunit-member-get.js'; import request from '../../../../request.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; import { CommandError } from '../../../../Command.js'; -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; import { settingsNames } from '../../../../settingsNames.js'; import aadCommands from '../../aadCommands.js'; @@ -71,7 +71,7 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_GET, () => { afterEach(() => { sinonUtil.restore([ request.get, - aadAdministrativeUnit.getAdministrativeUnitByDisplayName, + entraAdministrativeUnit.getAdministrativeUnitByDisplayName, cli.getSettingWithDefaultValue ]); }); @@ -170,7 +170,7 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_GET, () => { }); it('get member info for an administrative unit specified by name and member specified by id (verbose)', async () => { - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); sinon.stub(request, 'get').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/${userId}`) { diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.ts index bbdee4b6b3f..6ce2ef1a644 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-member-get.ts @@ -4,7 +4,7 @@ import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; import { Logger } from '../../../../cli/Logger.js'; import { validation } from '../../../../utils/validation.js'; -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; import request, { CliRequestOptions } from '../../../../request.js'; import aadCommands from '../../aadCommands.js'; @@ -103,7 +103,7 @@ class EntraAdministrativeUnitMemberGetCommand extends GraphCommand { await logger.logToStderr(`Retrieving Administrative Unit Id...`); } - administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id!; + administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id!; } const url = this.getRequestUrl(administrativeUnitId!, args.options.id, args.options); diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.spec.ts index 784133feb23..8b9df45de98 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.spec.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.spec.ts @@ -13,7 +13,7 @@ import command from './administrativeunit-member-list.js'; import { settingsNames } from '../../../../settingsNames.js'; import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { cli } from '../../../../cli/cli.js'; -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; import aadCommands from '../../aadCommands.js'; describe(commands.ADMINISTRATIVEUNIT_MEMBER_LIST, () => { @@ -308,7 +308,7 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_LIST, () => { afterEach(() => { sinonUtil.restore([ request.get, - aadAdministrativeUnit.getAdministrativeUnitByDisplayName, + entraAdministrativeUnit.getAdministrativeUnitByDisplayName, cli.getSettingWithDefaultValue ]); }); @@ -543,7 +543,7 @@ describe(commands.ADMINISTRATIVEUNIT_MEMBER_LIST, () => { }); it('should get all members of an administrative unit specified by its name when type not specified', async () => { - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); sinon.stub(request, 'get').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}/members`) { diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.ts index 8be41e36c4b..827cef1e4c5 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-member-list.ts @@ -4,7 +4,7 @@ import { odata } from '../../../../utils/odata.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; import GlobalOptions from '../../../../GlobalOptions.js'; -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; import { validation } from '../../../../utils/validation.js'; import { CliRequestOptions } from '../../../../request.js'; import aadCommands from '../../aadCommands.js'; @@ -114,7 +114,7 @@ class EntraAdministrativeUnitMemberListCommand extends GraphCommand { try { if (args.options.administrativeUnitName) { - administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id; + administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id; } let results; diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-remove.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-remove.spec.ts index 2c9d3276950..a38477d838c 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-remove.spec.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-remove.spec.ts @@ -12,7 +12,7 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js'; import { cli } from '../../../../cli/cli.js'; import { CommandInfo } from '../../../../cli/CommandInfo.js'; import command from './administrativeunit-remove.js'; -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; import aadCommands from '../../aadCommands.js'; describe(commands.ADMINISTRATIVEUNIT_REMOVE, () => { @@ -57,7 +57,7 @@ describe(commands.ADMINISTRATIVEUNIT_REMOVE, () => { afterEach(() => { sinonUtil.restore([ request.delete, - aadAdministrativeUnit.getAdministrativeUnitByDisplayName, + entraAdministrativeUnit.getAdministrativeUnitByDisplayName, cli.handleMultipleResultsFound, cli.promptForConfirmation ]); @@ -100,7 +100,7 @@ describe(commands.ADMINISTRATIVEUNIT_REMOVE, () => { }); it('removes the specified administrative unit by displayName while prompting for confirmation', async () => { - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').resolves({ id: administrativeUnitId, displayName: displayName }); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').resolves({ id: administrativeUnitId, displayName: displayName }); const deleteRequestStub = sinon.stub(request, 'delete').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/directory/administrativeUnits/${administrativeUnitId}`) { diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-remove.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-remove.ts index 11bde38d93d..428a7853ffc 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-remove.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-remove.ts @@ -1,4 +1,4 @@ -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; import GlobalOptions from "../../../../GlobalOptions.js"; import { Logger } from "../../../../cli/Logger.js"; import { validation } from "../../../../utils/validation.js"; @@ -95,7 +95,7 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand { let administrativeUnitId = args.options.id; if (args.options.displayName) { - const administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName); + const administrativeUnit = await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName); administrativeUnitId = administrativeUnit.id; } diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.spec.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.spec.ts index 6d44815b9c9..dc2719d3356 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.spec.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.spec.ts @@ -11,8 +11,8 @@ import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; import { Logger } from '../../../../cli/Logger.js'; import { CommandError } from '../../../../Command.js'; -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; +import { entraUser } from '../../../../utils/entraUser.js'; import { roleAssignment } from '../../../../utils/roleAssignment.js'; import { roleDefinition } from '../../../../utils/roleDefinition.js'; import { settingsNames } from '../../../../settingsNames.js'; @@ -64,8 +64,8 @@ describe(commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD, () => { afterEach(() => { sinonUtil.restore([ - aadAdministrativeUnit.getAdministrativeUnitByDisplayName, - aadUser.getUserIdByUpn, + entraAdministrativeUnit.getAdministrativeUnitByDisplayName, + entraUser.getUserIdByUpn, roleAssignment.createRoleAssignmentWithAdministrativeUnitScope, roleDefinition.getRoleDefinitionByDisplayName, cli.getSettingWithDefaultValue, @@ -270,8 +270,8 @@ describe(commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD, () => { }); it('correctly assigns a role specified by name to and administrative unit specified by name and to a user specified by name (verbose)', async () => { - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); - sinon.stub(aadUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); + sinon.stub(entraUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); sinon.stub(roleDefinition, 'getRoleDefinitionByDisplayName').withArgs(roleDefinitionName).resolves({ id: roleDefinitionId, displayName: roleDefinitionName }); sinon.stub(roleAssignment, 'createRoleAssignmentWithAdministrativeUnitScope').withArgs(roleDefinitionId, userId, administrativeUnitId).resolves(unifiedRoleAssignment); @@ -299,8 +299,8 @@ describe(commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD, () => { }); it('fails if an administrative unit specified by name was not found', async () => { - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).throws(Error("The specified administrative unit 'Marketing Department' does not exist.")); - sinon.stub(aadUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).throws(Error("The specified administrative unit 'Marketing Department' does not exist.")); + sinon.stub(entraUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); sinon.stub(roleDefinition, 'getRoleDefinitionByDisplayName').withArgs(roleDefinitionName).resolves({ id: roleDefinitionId, displayName: roleDefinitionName }); sinon.stub(roleAssignment, 'createRoleAssignmentWithAdministrativeUnitScope').withArgs(roleDefinitionId, userId, administrativeUnitId).resolves(unifiedRoleAssignment); @@ -314,8 +314,8 @@ describe(commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD, () => { }); it('fails if a role definition specified by name was not found', async () => { - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); - sinon.stub(aadUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); + sinon.stub(entraUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); sinon.stub(roleDefinition, 'getRoleDefinitionByDisplayName').withArgs(roleDefinitionName).throws(Error("The specified role definition 'User Administrator' does not exist.")); sinon.stub(roleAssignment, 'createRoleAssignmentWithAdministrativeUnitScope').withArgs(roleDefinitionId, userId, administrativeUnitId).resolves(unifiedRoleAssignment); @@ -329,8 +329,8 @@ describe(commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD, () => { }); it('fails if a user specified by UPN was not found', async () => { - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); - sinon.stub(aadUser, 'getUserIdByUpn').withArgs(userName).throws(Error("The specified user with user name AdeleVance@contoso.com does not exist.")); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); + sinon.stub(entraUser, 'getUserIdByUpn').withArgs(userName).throws(Error("The specified user with user name AdeleVance@contoso.com does not exist.")); sinon.stub(roleDefinition, 'getRoleDefinitionByDisplayName').withArgs(roleDefinitionName).resolves({ id: roleDefinitionId, displayName: roleDefinitionName }); sinon.stub(roleAssignment, 'createRoleAssignmentWithAdministrativeUnitScope').withArgs(roleDefinitionId, userId, administrativeUnitId).resolves(unifiedRoleAssignment); @@ -344,8 +344,8 @@ describe(commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD, () => { }); it('correctly handles API OData error when creating role assignment with an administrative unit scope failed', async () => { - sinon.stub(aadAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); - sinon.stub(aadUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); + sinon.stub(entraAdministrativeUnit, 'getAdministrativeUnitByDisplayName').withArgs(administrativeUnitName).resolves({ id: administrativeUnitId, displayName: administrativeUnitName }); + sinon.stub(entraUser, 'getUserIdByUpn').withArgs(userName).resolves(userId); sinon.stub(roleDefinition, 'getRoleDefinitionByDisplayName').withArgs(roleDefinitionName).resolves({ id: roleDefinitionId, displayName: roleDefinitionName }); sinon.stub(request, 'post').rejects({ error: { diff --git a/src/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.ts b/src/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.ts index d95af45a78e..f26c9a37d51 100644 --- a/src/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.ts +++ b/src/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.ts @@ -1,7 +1,7 @@ import GlobalOptions from '../../../../GlobalOptions.js'; import { Logger } from '../../../../cli/Logger.js'; -import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js'; +import { entraUser } from '../../../../utils/entraUser.js'; import { roleAssignment } from '../../../../utils/roleAssignment.js'; import { roleDefinition } from '../../../../utils/roleDefinition.js'; import { validation } from '../../../../utils/validation.js'; @@ -110,7 +110,7 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand { await logger.logToStderr(`Retrieving administrative unit by its name '${args.options.administrativeUnitName}'`); } - administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id; + administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id; } if (args.options.roleDefinitionName) { @@ -126,7 +126,7 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand { await logger.logToStderr(`Retrieving user by UPN '${args.options.userName}'`); } - userId = await aadUser.getUserIdByUpn(args.options.userName); + userId = await entraUser.getUserIdByUpn(args.options.userName); } const unifiedRoleAssignment = await roleAssignment.createRoleAssignmentWithAdministrativeUnitScope(roleDefinitionId!, userId!, administrativeUnitId!); diff --git a/src/m365/entra/commands/group/group-get.ts b/src/m365/entra/commands/group/group-get.ts index 371fc884e79..361b1b36510 100644 --- a/src/m365/entra/commands/group/group-get.ts +++ b/src/m365/entra/commands/group/group-get.ts @@ -1,7 +1,7 @@ import { Group } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; @@ -81,10 +81,10 @@ class EntraGroupGetCommand extends GraphCommand { try { if (args.options.id) { - group = await aadGroup.getGroupById(args.options.id); + group = await entraGroup.getGroupById(args.options.id); } else { - group = await aadGroup.getGroupByDisplayName(args.options.displayName!); + group = await entraGroup.getGroupByDisplayName(args.options.displayName!); } await logger.log(group); diff --git a/src/m365/entra/commands/group/group-remove.spec.ts b/src/m365/entra/commands/group/group-remove.spec.ts index 8e9efcc2c6a..e44b53f269c 100644 --- a/src/m365/entra/commands/group/group-remove.spec.ts +++ b/src/m365/entra/commands/group/group-remove.spec.ts @@ -9,7 +9,7 @@ import { CommandError } from '../../../../Command.js'; import { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { cli } from '../../../../cli/cli.js'; import { CommandInfo } from '../../../../cli/CommandInfo.js'; import command from './group-remove.js'; @@ -53,7 +53,7 @@ describe(commands.GROUP_REMOVE, () => { sinonUtil.restore([ request.get, request.delete, - aadGroup.getGroupIdByDisplayName, + entraGroup.getGroupIdByDisplayName, cli.getSettingWithDefaultValue, cli.handleMultipleResultsFound, cli.promptForConfirmation @@ -99,7 +99,7 @@ describe(commands.GROUP_REMOVE, () => { it('removes the specified group by displayName when passing the force option', async () => { const confirmationStub = sinon.stub(cli, 'promptForConfirmation').resolves(true); - sinon.stub(aadGroup, 'getGroupIdByDisplayName').resolves(groupId); + sinon.stub(entraGroup, 'getGroupIdByDisplayName').resolves(groupId); const deleteRequestStub = sinon.stub(request, 'delete').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/groups/${groupId}`) { @@ -117,7 +117,7 @@ describe(commands.GROUP_REMOVE, () => { it('removes the specified group by displayName while prompting for confirmation', async () => { const confirmationStub = sinon.stub(cli, 'promptForConfirmation').resolves(true); - sinon.stub(aadGroup, 'getGroupIdByDisplayName').resolves(groupId); + sinon.stub(entraGroup, 'getGroupIdByDisplayName').resolves(groupId); const deleteRequestStub = sinon.stub(request, 'delete').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/groups/${groupId}`) { diff --git a/src/m365/entra/commands/group/group-remove.ts b/src/m365/entra/commands/group/group-remove.ts index 2cec1842566..529ebc3946d 100644 --- a/src/m365/entra/commands/group/group-remove.ts +++ b/src/m365/entra/commands/group/group-remove.ts @@ -4,7 +4,7 @@ import GlobalOptions from '../../../../GlobalOptions.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { validation } from '../../../../utils/validation.js'; import aadCommands from '../../aadCommands.js'; @@ -99,7 +99,7 @@ class EntraGroupRemoveCommand extends GraphCommand { let groupId = args.options.id; if (args.options.displayName) { - groupId = await aadGroup.getGroupIdByDisplayName(args.options.displayName); + groupId = await entraGroup.getGroupIdByDisplayName(args.options.displayName); } const requestOptions: CliRequestOptions = { diff --git a/src/m365/entra/commands/group/group-user-list.spec.ts b/src/m365/entra/commands/group/group-user-list.spec.ts index 4296d8edac8..6e1a6b6644b 100644 --- a/src/m365/entra/commands/group/group-user-list.spec.ts +++ b/src/m365/entra/commands/group/group-user-list.spec.ts @@ -7,7 +7,7 @@ import { Logger } from '../../../../cli/Logger.js'; import { CommandError } from '../../../../Command.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; @@ -55,7 +55,7 @@ describe(commands.GROUP_USER_LIST, () => { afterEach(() => { sinonUtil.restore([ request.get, - aadGroup.getGroupIdByDisplayName, + entraGroup.getGroupIdByDisplayName, cli.getSettingWithDefaultValue, cli.handleMultipleResultsFound ]); @@ -159,7 +159,7 @@ describe(commands.GROUP_USER_LIST, () => { }); it('correctly lists all users in a Azure AD group by name', async () => { - sinon.stub(aadGroup, 'getGroupIdByDisplayName').resolves(groupId); + sinon.stub(entraGroup, 'getGroupIdByDisplayName').resolves(groupId); sinon.stub(request, 'get').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/groups/2c1ba4c4-cd9b-4417-832f-92a34bc34b2a/Owners/microsoft.graph.user?$select=id,displayName,userPrincipalName,givenName,surname`) { diff --git a/src/m365/entra/commands/group/group-user-list.ts b/src/m365/entra/commands/group/group-user-list.ts index 1ec5626ea5b..86ac3508678 100644 --- a/src/m365/entra/commands/group/group-user-list.ts +++ b/src/m365/entra/commands/group/group-user-list.ts @@ -2,7 +2,7 @@ import { User } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import { CliRequestOptions } from '../../../../request.js'; -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'; @@ -152,7 +152,7 @@ class EntraGroupUserListCommand extends GraphCommand { await logger.logToStderr('Retrieving Group Id...'); } - return await aadGroup.getGroupIdByDisplayName(options.groupDisplayName!); + return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName!); } private async getUsers(options: Options, role: string, groupId: string, logger: Logger): Promise { diff --git a/src/m365/entra/commands/m365group/m365group-conversation-list.spec.ts b/src/m365/entra/commands/m365group/m365group-conversation-list.spec.ts index 4fa9fecbc22..877e0abb754 100644 --- a/src/m365/entra/commands/m365group/m365group-conversation-list.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-conversation-list.spec.ts @@ -12,7 +12,7 @@ import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; import commands from '../../commands.js'; import command from './m365group-conversation-list.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_CONVERSATION_LIST, () => { @@ -50,7 +50,7 @@ describe(commands.M365GROUP_CONVERSATION_LIST, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -140,8 +140,8 @@ describe(commands.M365GROUP_CONVERSATION_LIST, () => { it('shows error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { groupId: groupId } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-conversation-list.ts b/src/m365/entra/commands/m365group/m365group-conversation-list.ts index 052eacfa2ca..7cf9bd67321 100644 --- a/src/m365/entra/commands/m365group/m365group-conversation-list.ts +++ b/src/m365/entra/commands/m365group/m365group-conversation-list.ts @@ -5,7 +5,7 @@ import { odata } from '../../../../utils/odata.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; interface CommandArgs { @@ -62,7 +62,7 @@ class EntraM365GroupConversationListCommand extends GraphCommand { public async commandAction(logger: Logger, args: CommandArgs): Promise { try { - const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.groupId); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.groupId); if (!isUnifiedGroup) { throw Error(`Specified group with id '${args.options.groupId}' is not a Microsoft 365 group.`); diff --git a/src/m365/entra/commands/m365group/m365group-conversation-post-list.spec.ts b/src/m365/entra/commands/m365group/m365group-conversation-post-list.spec.ts index 3a62cebd167..9531b2c0af6 100644 --- a/src/m365/entra/commands/m365group/m365group-conversation-post-list.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-conversation-post-list.spec.ts @@ -13,7 +13,7 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js'; import commands from '../../commands.js'; import command from './m365group-conversation-post-list.js'; import { settingsNames } from '../../../../settingsNames.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_CONVERSATION_POST_LIST, () => { @@ -81,7 +81,7 @@ describe(commands.M365GROUP_CONVERSATION_POST_LIST, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -231,8 +231,8 @@ describe(commands.M365GROUP_CONVERSATION_POST_LIST, () => { it('shows error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { groupId: groupId, threadId: 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E=' } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-conversation-post-list.ts b/src/m365/entra/commands/m365group/m365group-conversation-post-list.ts index b00b6bcacfd..90a0a1bc21e 100644 --- a/src/m365/entra/commands/m365group/m365group-conversation-post-list.ts +++ b/src/m365/entra/commands/m365group/m365group-conversation-post-list.ts @@ -1,7 +1,7 @@ import { Post } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.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'; @@ -87,7 +87,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand { public async commandAction(logger: Logger, args: CommandArgs): Promise { try { const retrievedgroupId = await this.getGroupId(args); - const isUnifiedGroup = await aadGroup.isUnifiedGroup(retrievedgroupId); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(retrievedgroupId); if (!isUnifiedGroup) { throw Error(`Specified group with id '${retrievedgroupId}' is not a Microsoft 365 group.`); @@ -106,7 +106,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand { return formatting.encodeQueryParameter(args.options.groupId); } - const group = await aadGroup.getGroupByDisplayName(args.options.groupDisplayName!); + const group = await entraGroup.getGroupByDisplayName(args.options.groupDisplayName!); return group.id!; } } diff --git a/src/m365/entra/commands/m365group/m365group-get.spec.ts b/src/m365/entra/commands/m365group/m365group-get.spec.ts index 614206b2943..c7732055bcb 100644 --- a/src/m365/entra/commands/m365group/m365group-get.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-get.spec.ts @@ -12,7 +12,7 @@ import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; import commands from '../../commands.js'; import command from './m365group-get.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_GET, () => { @@ -26,7 +26,7 @@ describe(commands.M365GROUP_GET, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -427,8 +427,8 @@ describe(commands.M365GROUP_GET, () => { it('shows error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { id: groupId } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-get.ts b/src/m365/entra/commands/m365group/m365group-get.ts index 2cc97bb310a..eb34b77ffc4 100644 --- a/src/m365/entra/commands/m365group/m365group-get.ts +++ b/src/m365/entra/commands/m365group/m365group-get.ts @@ -1,7 +1,7 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import aadCommands from '../../aadCommands.js'; @@ -64,13 +64,13 @@ class EntraM365GroupGetCommand extends GraphCommand { let group: GroupExtended; try { - const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id); if (!isUnifiedGroup) { throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`); } - group = await aadGroup.getGroupById(args.options.id); + group = await entraGroup.getGroupById(args.options.id); if (args.options.includeSiteUrl) { const requestOptions: CliRequestOptions = { diff --git a/src/m365/entra/commands/m365group/m365group-remove.spec.ts b/src/m365/entra/commands/m365group/m365group-remove.spec.ts index c133762454b..5537acfa57e 100644 --- a/src/m365/entra/commands/m365group/m365group-remove.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-remove.spec.ts @@ -14,7 +14,7 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js'; import commands from '../../commands.js'; import { spo } from '../../../../utils/spo.js'; import command from './m365group-remove.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_REMOVE, () => { @@ -102,7 +102,7 @@ describe(commands.M365GROUP_REMOVE, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; auth.service.spoUrl = 'https://contoso.sharepoint.com'; commandInfo = cli.getCommandInfo(command); @@ -311,8 +311,8 @@ describe(commands.M365GROUP_REMOVE, () => { it('throws error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { id: groupId, force: true } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-remove.ts b/src/m365/entra/commands/m365group/m365group-remove.ts index 7cb431dbb95..53bd7bc3e9d 100644 --- a/src/m365/entra/commands/m365group/m365group-remove.ts +++ b/src/m365/entra/commands/m365group/m365group-remove.ts @@ -2,7 +2,7 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; @@ -88,7 +88,7 @@ class EntraM365GroupRemoveCommand extends GraphCommand { } try { - const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id); if (!isUnifiedGroup) { throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`); diff --git a/src/m365/entra/commands/m365group/m365group-renew.spec.ts b/src/m365/entra/commands/m365group/m365group-renew.spec.ts index 045c5e2dc7c..e01ffbbb687 100644 --- a/src/m365/entra/commands/m365group/m365group-renew.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-renew.spec.ts @@ -12,7 +12,7 @@ import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; import commands from '../../commands.js'; import command from './m365group-renew.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_RENEW, () => { @@ -27,7 +27,7 @@ describe(commands.M365GROUP_RENEW, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -136,8 +136,8 @@ describe(commands.M365GROUP_RENEW, () => { it('throws error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { id: groupId } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-renew.ts b/src/m365/entra/commands/m365group/m365group-renew.ts index f91e437b377..ab37fc3aefc 100644 --- a/src/m365/entra/commands/m365group/m365group-renew.ts +++ b/src/m365/entra/commands/m365group/m365group-renew.ts @@ -1,7 +1,7 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import aadCommands from '../../aadCommands.js'; @@ -61,7 +61,7 @@ class EntraM365GroupRenewCommand extends GraphCommand { } try { - const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id); if (!isUnifiedGroup) { throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`); diff --git a/src/m365/entra/commands/m365group/m365group-set.spec.ts b/src/m365/entra/commands/m365group/m365group-set.spec.ts index 07b471f7bbd..07341d68c00 100644 --- a/src/m365/entra/commands/m365group/m365group-set.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-set.spec.ts @@ -14,7 +14,7 @@ import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; import commands from '../../commands.js'; import command from './m365group-set.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_SET, () => { @@ -29,7 +29,7 @@ describe(commands.M365GROUP_SET, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -580,8 +580,8 @@ describe(commands.M365GROUP_SET, () => { it('throws error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { id: groupId, displayName: 'Updated title' } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-set.ts b/src/m365/entra/commands/m365group/m365group-set.ts index 0a6585935c1..4192b41d25a 100644 --- a/src/m365/entra/commands/m365group/m365group-set.ts +++ b/src/m365/entra/commands/m365group/m365group-set.ts @@ -8,7 +8,7 @@ import request, { CliRequestOptions } from '../../../../request.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; interface CommandArgs { @@ -147,7 +147,7 @@ class EntraM365GroupSetCommand extends GraphCommand { public async commandAction(logger: Logger, args: CommandArgs): Promise { try { - const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id); if (!isUnifiedGroup) { throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`); diff --git a/src/m365/entra/commands/m365group/m365group-teamify.spec.ts b/src/m365/entra/commands/m365group/m365group-teamify.spec.ts index 5788a483614..99c6f2cc955 100644 --- a/src/m365/entra/commands/m365group/m365group-teamify.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-teamify.spec.ts @@ -13,7 +13,7 @@ import { sinonUtil } from '../../../../utils/sinonUtil.js'; import commands from '../../commands.js'; import command from './m365group-teamify.js'; import { settingsNames } from '../../../../settingsNames.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_TEAMIFY, () => { @@ -26,7 +26,7 @@ describe(commands.M365GROUP_TEAMIFY, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -640,8 +640,8 @@ describe(commands.M365GROUP_TEAMIFY, () => { it('throws error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { id: groupId } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-teamify.ts b/src/m365/entra/commands/m365group/m365group-teamify.ts index 30059ae159d..cea4ca5a548 100644 --- a/src/m365/entra/commands/m365group/m365group-teamify.ts +++ b/src/m365/entra/commands/m365group/m365group-teamify.ts @@ -2,7 +2,7 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -108,7 +108,7 @@ class EntraM365GroupTeamifyCommand extends GraphCommand { public async commandAction(logger: Logger, args: CommandArgs): Promise { try { const groupId = await this.getGroupId(args.options); - const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId); if (!isUnifiedGroup) { throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`); diff --git a/src/m365/entra/commands/m365group/m365group-user-add.spec.ts b/src/m365/entra/commands/m365group/m365group-user-add.spec.ts index b18e22981e6..c7a9a304f4a 100644 --- a/src/m365/entra/commands/m365group/m365group-user-add.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-user-add.spec.ts @@ -14,7 +14,7 @@ import teamsCommands from '../../../teams/commands.js'; import commands from '../../commands.js'; import command from './m365group-user-add.js'; import { settingsNames } from '../../../../settingsNames.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_USER_ADD, () => { @@ -27,7 +27,7 @@ describe(commands.M365GROUP_USER_ADD, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -335,8 +335,8 @@ describe(commands.M365GROUP_USER_ADD, () => { it('throws error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { groupId: groupId, userName: 'anne.matthews@contoso.onmicrosoft.com' } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-user-add.ts b/src/m365/entra/commands/m365group/m365group-user-add.ts index 74cd98bde10..762d019b65a 100644 --- a/src/m365/entra/commands/m365group/m365group-user-add.ts +++ b/src/m365/entra/commands/m365group/m365group-user-add.ts @@ -1,7 +1,7 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -99,7 +99,7 @@ class EntraM365GroupUserAddCommand extends GraphCommand { public async commandAction(logger: Logger, args: CommandArgs): Promise { try { const providedGroupId: string = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId as string; - const isUnifiedGroup = await aadGroup.isUnifiedGroup(providedGroupId); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(providedGroupId); if (!isUnifiedGroup) { throw Error(`Specified group with id '${providedGroupId}' is not a Microsoft 365 group.`); diff --git a/src/m365/entra/commands/m365group/m365group-user-list.spec.ts b/src/m365/entra/commands/m365group/m365group-user-list.spec.ts index fd95eb44f69..1d4b8506f30 100644 --- a/src/m365/entra/commands/m365group/m365group-user-list.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-user-list.spec.ts @@ -12,7 +12,7 @@ import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; import commands from '../../commands.js'; import command from './m365group-user-list.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_USER_LIST, () => { @@ -26,7 +26,7 @@ describe(commands.M365GROUP_USER_LIST, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -179,7 +179,7 @@ describe(commands.M365GROUP_USER_LIST, () => { }); it('correctly lists all users in a Microsoft 365 group by group name', async () => { - sinon.stub(aadGroup, 'getGroupIdByDisplayName').resolves('00000000-0000-0000-0000-000000000000'); + sinon.stub(entraGroup, 'getGroupIdByDisplayName').resolves('00000000-0000-0000-0000-000000000000'); sinon.stub(request, 'get').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/groups/00000000-0000-0000-0000-000000000000/Owners/microsoft.graph.user?$select=id,displayName,userPrincipalName,givenName,surname,userType`) { @@ -441,8 +441,8 @@ describe(commands.M365GROUP_USER_LIST, () => { it('throws error when the group by id is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { verbose: true, groupId: groupId } } as any), new CommandError(`Specified group '${groupId}' is not a Microsoft 365 group.`)); @@ -451,8 +451,8 @@ describe(commands.M365GROUP_USER_LIST, () => { it('throws error when the group by name is not a unified group', async () => { const groupDisplayName = 'CLI Test Group'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { verbose: true, groupDisplayName: groupDisplayName } } as any), new CommandError(`Specified group '${groupDisplayName}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-user-list.ts b/src/m365/entra/commands/m365group/m365group-user-list.ts index b6bb197eb0e..44d53352978 100644 --- a/src/m365/entra/commands/m365group/m365group-user-list.ts +++ b/src/m365/entra/commands/m365group/m365group-user-list.ts @@ -5,7 +5,7 @@ import { odata } from '../../../../utils/odata.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { CliRequestOptions } from '../../../../request.js'; import aadCommands from '../../aadCommands.js'; @@ -113,7 +113,7 @@ class EntraM365GroupUserListCommand extends GraphCommand { } const groupId = await this.getGroupId(args.options, logger); - const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId); if (!isUnifiedGroup) { throw Error(`Specified group '${args.options.groupId || args.options.groupDisplayName}' is not a Microsoft 365 group.`); @@ -160,7 +160,7 @@ class EntraM365GroupUserListCommand extends GraphCommand { await logger.logToStderr('Retrieving Group Id...'); } - return await aadGroup.getGroupIdByDisplayName(options.groupDisplayName!); + return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName!); } private async getUsers(options: Options, role: string, groupId: string, logger: Logger): Promise { diff --git a/src/m365/entra/commands/m365group/m365group-user-remove.spec.ts b/src/m365/entra/commands/m365group/m365group-user-remove.spec.ts index eb984b7f00b..d7df5316e02 100644 --- a/src/m365/entra/commands/m365group/m365group-user-remove.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-user-remove.spec.ts @@ -14,7 +14,7 @@ import teamsCommands from '../../../teams/commands.js'; import commands from '../../commands.js'; import command from './m365group-user-remove.js'; import { settingsNames } from '../../../../settingsNames.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_USER_REMOVE, () => { @@ -28,7 +28,7 @@ describe(commands.M365GROUP_USER_REMOVE, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -624,8 +624,8 @@ describe(commands.M365GROUP_USER_REMOVE, () => { it('throws error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { groupId: groupId, userName: 'anne.matthews@contoso.onmicrosoft.com', force: true } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-user-remove.ts b/src/m365/entra/commands/m365group/m365group-user-remove.ts index 76b5228ced7..160cf048b7b 100644 --- a/src/m365/entra/commands/m365group/m365group-user-remove.ts +++ b/src/m365/entra/commands/m365group/m365group-user-remove.ts @@ -2,7 +2,7 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.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'; @@ -99,7 +99,7 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand { const removeUser = async (): Promise => { try { - const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId); if (!isUnifiedGroup) { throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`); diff --git a/src/m365/entra/commands/m365group/m365group-user-set.spec.ts b/src/m365/entra/commands/m365group/m365group-user-set.spec.ts index 778cc2fd074..ef2cd7a9dcd 100644 --- a/src/m365/entra/commands/m365group/m365group-user-set.spec.ts +++ b/src/m365/entra/commands/m365group/m365group-user-set.spec.ts @@ -14,7 +14,7 @@ import teamsCommands from '../../../teams/commands.js'; import commands from '../../commands.js'; import command from './m365group-user-set.js'; import { settingsNames } from '../../../../settingsNames.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; describe(commands.M365GROUP_USER_SET, () => { @@ -27,7 +27,7 @@ describe(commands.M365GROUP_USER_SET, () => { sinon.stub(telemetry, 'trackEvent').returns(); sinon.stub(pid, 'getProcessName').returns(''); sinon.stub(session, 'getId').returns(''); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(true); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(true); auth.service.connected = true; commandInfo = cli.getCommandInfo(command); }); @@ -413,8 +413,8 @@ describe(commands.M365GROUP_USER_SET, () => { it('throws error when the group is not a unified group', async () => { const groupId = '3f04e370-cbc6-4091-80fe-1d038be2ad06'; - sinonUtil.restore(aadGroup.isUnifiedGroup); - sinon.stub(aadGroup, 'isUnifiedGroup').resolves(false); + sinonUtil.restore(entraGroup.isUnifiedGroup); + sinon.stub(entraGroup, 'isUnifiedGroup').resolves(false); await assert.rejects(command.action(logger, { options: { groupId: groupId, userName: 'anne.matthews@contoso.onmicrosoft.com', role: 'Owner' } } as any), new CommandError(`Specified group with id '${groupId}' is not a Microsoft 365 group.`)); diff --git a/src/m365/entra/commands/m365group/m365group-user-set.ts b/src/m365/entra/commands/m365group/m365group-user-set.ts index 962740619bb..dcf630343d8 100644 --- a/src/m365/entra/commands/m365group/m365group-user-set.ts +++ b/src/m365/entra/commands/m365group/m365group-user-set.ts @@ -7,7 +7,7 @@ import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import teamsCommands from '../../../teams/commands.js'; import commands from '../../commands.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import aadCommands from '../../aadCommands.js'; interface CommandArgs { @@ -99,7 +99,7 @@ class EntraM365GroupUserSetCommand extends GraphCommand { public async commandAction(logger: Logger, args: CommandArgs): Promise { try { const groupId: string = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId as string; - const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId); + const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId); if (!isUnifiedGroup) { throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`); diff --git a/src/m365/flow/commands/owner/owner-ensure.spec.ts b/src/m365/flow/commands/owner/owner-ensure.spec.ts index 5067dc12dd7..7921f53e96d 100644 --- a/src/m365/flow/commands/owner/owner-ensure.spec.ts +++ b/src/m365/flow/commands/owner/owner-ensure.spec.ts @@ -7,8 +7,8 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.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 { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; @@ -57,8 +57,8 @@ describe(commands.OWNER_ENSURE, () => { sinonUtil.restore([ request.get, request.post, - aadGroup.getGroupByDisplayName, - aadUser.getUserIdByUpn, + entraGroup.getGroupByDisplayName, + entraUser.getUserIdByUpn, cli.getSettingWithDefaultValue, cli.handleMultipleResultsFound ]); @@ -149,7 +149,7 @@ describe(commands.OWNER_ENSURE, () => { ] }; - sinon.stub(aadUser, 'getUserIdByUpn').resolves(validUserId); + sinon.stub(entraUser, 'getUserIdByUpn').resolves(validUserId); const postRequestStub = sinon.stub(request, 'post').callsFake(async opts => { if (opts.url === `https://api.flow.microsoft.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(validEnvironmentName)}/flows/${formatting.encodeQueryParameter(validFlowName)}/modifyPermissions?api-version=2016-11-01`) { @@ -205,7 +205,7 @@ describe(commands.OWNER_ENSURE, () => { ] }; - sinon.stub(aadGroup, 'getGroupIdByDisplayName').resolves(validGroupId); + sinon.stub(entraGroup, 'getGroupIdByDisplayName').resolves(validGroupId); const postRequestStub = sinon.stub(request, 'post').callsFake(async opts => { if (opts.url === `https://api.flow.microsoft.com/providers/Microsoft.ProcessSimple/scopes/admin/environments/${formatting.encodeQueryParameter(validEnvironmentName)}/flows/${formatting.encodeQueryParameter(validFlowName)}/modifyPermissions?api-version=2016-11-01`) { diff --git a/src/m365/flow/commands/owner/owner-ensure.ts b/src/m365/flow/commands/owner/owner-ensure.ts index 644e0c98014..4b6585bedc4 100644 --- a/src/m365/flow/commands/owner/owner-ensure.ts +++ b/src/m365/flow/commands/owner/owner-ensure.ts @@ -1,8 +1,8 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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 { validation } from '../../../../utils/validation.js'; import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js'; @@ -128,13 +128,13 @@ class FlowOwnerEnsureCommand extends PowerAutomateCommand { id = args.options.userId; } else if (args.options.userName) { - id = await aadUser.getUserIdByUpn(args.options.userName); + id = await entraUser.getUserIdByUpn(args.options.userName); } else if (args.options.groupId) { id = args.options.groupId; } else { - id = await aadGroup.getGroupIdByDisplayName(args.options.groupName!); + id = await entraGroup.getGroupIdByDisplayName(args.options.groupName!); } let type: string; diff --git a/src/m365/flow/commands/owner/owner-remove.spec.ts b/src/m365/flow/commands/owner/owner-remove.spec.ts index 56f9006cac2..cdb6e2cdcf9 100644 --- a/src/m365/flow/commands/owner/owner-remove.spec.ts +++ b/src/m365/flow/commands/owner/owner-remove.spec.ts @@ -7,8 +7,8 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.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 { settingsNames } from '../../../../settingsNames.js'; import { pid } from '../../../../utils/pid.js'; @@ -68,8 +68,8 @@ describe(commands.OWNER_REMOVE, () => { sinonUtil.restore([ request.get, request.post, - aadGroup.getGroupIdByDisplayName, - aadUser.getUserIdByUpn, + entraGroup.getGroupIdByDisplayName, + entraUser.getUserIdByUpn, cli.getSettingWithDefaultValue, cli.handleMultipleResultsFound, cli.promptForConfirmation @@ -103,7 +103,7 @@ describe(commands.OWNER_REMOVE, () => { }); it('deletes owner from flow by userName', async () => { - sinon.stub(aadUser, 'getUserIdByUpn').resolves(userId); + sinon.stub(entraUser, 'getUserIdByUpn').resolves(userId); const postStub = sinon.stub(request, 'post').callsFake(async opts => { if (opts.url === requestUrlNoAdmin) { return; @@ -132,7 +132,7 @@ describe(commands.OWNER_REMOVE, () => { }); it('deletes owner from flow by groupName as admin', async () => { - sinon.stub(aadGroup, 'getGroupIdByDisplayName').resolves(groupId); + sinon.stub(entraGroup, 'getGroupIdByDisplayName').resolves(groupId); const postStub = sinon.stub(request, 'post').callsFake(async opts => { if (opts.url === requestUrlAdmin) { return; diff --git a/src/m365/flow/commands/owner/owner-remove.ts b/src/m365/flow/commands/owner/owner-remove.ts index 31cbb0da1ee..9dd40047c97 100644 --- a/src/m365/flow/commands/owner/owner-remove.ts +++ b/src/m365/flow/commands/owner/owner-remove.ts @@ -2,8 +2,8 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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 { validation } from '../../../../utils/validation.js'; import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js'; @@ -124,13 +124,13 @@ class FlowOwnerRemoveCommand extends PowerAutomateCommand { idToRemove = args.options.userId; } else if (args.options.userName) { - idToRemove = await aadUser.getUserIdByUpn(args.options.userName); + idToRemove = await entraUser.getUserIdByUpn(args.options.userName); } else if (args.options.groupId) { idToRemove = args.options.groupId; } else { - idToRemove = await aadGroup.getGroupIdByDisplayName(args.options.groupName!); + idToRemove = await entraGroup.getGroupIdByDisplayName(args.options.groupName!); } const requestOptions: CliRequestOptions = { diff --git a/src/m365/onenote/commands/notebook/notebook-list.ts b/src/m365/onenote/commands/notebook/notebook-list.ts index dc08f13663f..918cf33c3f2 100644 --- a/src/m365/onenote/commands/notebook/notebook-list.ts +++ b/src/m365/onenote/commands/notebook/notebook-list.ts @@ -2,7 +2,7 @@ import { Notebook } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -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'; @@ -122,7 +122,7 @@ class OneNoteNotebookListCommand extends GraphCommand { } private async getGroupId(groupName: string): Promise { - const group = await aadGroup.getGroupByDisplayName(groupName); + const group = await entraGroup.getGroupByDisplayName(groupName); return group.id!; } diff --git a/src/m365/onenote/commands/page/page-list.ts b/src/m365/onenote/commands/page/page-list.ts index dfd04724dd1..46852b8d74d 100644 --- a/src/m365/onenote/commands/page/page-list.ts +++ b/src/m365/onenote/commands/page/page-list.ts @@ -1,7 +1,7 @@ import { OnenotePage } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { odata } from '../../../../utils/odata.js'; import { spo } from '../../../../utils/spo.js'; import { validation } from '../../../../utils/validation.js'; @@ -122,7 +122,7 @@ class OneNotePageListCommand extends GraphCommand { } private async getGroupId(groupName: string): Promise { - const group = await aadGroup.getGroupByDisplayName(groupName); + const group = await entraGroup.getGroupByDisplayName(groupName); return group.id!; } diff --git a/src/m365/pa/commands/app/app-owner-set.ts b/src/m365/pa/commands/app/app-owner-set.ts index a7faa564d12..ed55cd3b707 100644 --- a/src/m365/pa/commands/app/app-owner-set.ts +++ b/src/m365/pa/commands/app/app-owner-set.ts @@ -1,7 +1,7 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraUser } from '../../../../utils/entraUser.js'; import { validation } from '../../../../utils/validation.js'; import PowerAppsCommand from '../../../base/PowerAppsCommand.js'; import commands from '../../commands.js'; @@ -128,7 +128,7 @@ class PaAppOwnerSetCommand extends PowerAppsCommand { return options.userId; } - return aadUser.getUserIdByUpn(options.userName!); + return entraUser.getUserIdByUpn(options.userName!); } } diff --git a/src/m365/pa/commands/app/app-permission-ensure.spec.ts b/src/m365/pa/commands/app/app-permission-ensure.spec.ts index 2d138154f44..b10ce71d2e9 100644 --- a/src/m365/pa/commands/app/app-permission-ensure.spec.ts +++ b/src/m365/pa/commands/app/app-permission-ensure.spec.ts @@ -7,8 +7,8 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.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 { accessToken } from '../../../../utils/accessToken.js'; import { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; @@ -293,7 +293,7 @@ describe(commands.APP_PERMISSION_ENSURE, () => { }); it('updates permissions to a Power App by userName', async () => { - sinon.stub(aadUser, 'getUserIdByUpn').resolves(validUserId); + sinon.stub(entraUser, 'getUserIdByUpn').resolves(validUserId); const postStub = sinon.stub(request, 'post').callsFake(async (opts) => { if (opts.url === `https://api.powerapps.com/providers/Microsoft.PowerApps/apps/${validAppName}/modifyPermissions?api-version=2022-11-01`) { @@ -323,7 +323,7 @@ describe(commands.APP_PERMISSION_ENSURE, () => { }); it('updates permissions to a Power App by groupName', async () => { - sinon.stub(aadGroup, 'getGroupByDisplayName').resolves(groupResponse); + sinon.stub(entraGroup, 'getGroupByDisplayName').resolves(groupResponse); const postStub = sinon.stub(request, 'post').callsFake(async (opts) => { if (opts.url === `https://api.powerapps.com/providers/Microsoft.PowerApps/apps/${validAppName}/modifyPermissions?api-version=2022-11-01`) { diff --git a/src/m365/pa/commands/app/app-permission-ensure.ts b/src/m365/pa/commands/app/app-permission-ensure.ts index 731414b526f..b29d9bfb0ae 100644 --- a/src/m365/pa/commands/app/app-permission-ensure.ts +++ b/src/m365/pa/commands/app/app-permission-ensure.ts @@ -2,8 +2,8 @@ import Auth from '../../../../Auth.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import { Logger } from '../../../../cli/Logger.js'; import request, { CliRequestOptions } 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 { accessToken } from '../../../../utils/accessToken.js'; import { validation } from '../../../../utils/validation.js'; import PowerAppsCommand from '../../../base/PowerAppsCommand.js'; @@ -201,11 +201,11 @@ class PaAppPermissionEnsureCommand extends PowerAppsCommand { return options.userId; } if (options.groupName) { - const group = await aadGroup.getGroupByDisplayName(options.groupName); + const group = await entraGroup.getGroupByDisplayName(options.groupName); return group.id!; } if (options.userName) { - const userId = await aadUser.getUserIdByUpn(options.userName); + const userId = await entraUser.getUserIdByUpn(options.userName); return userId; } diff --git a/src/m365/pa/commands/app/app-permission-remove.spec.ts b/src/m365/pa/commands/app/app-permission-remove.spec.ts index 9d87a34fb71..2b643f85ece 100644 --- a/src/m365/pa/commands/app/app-permission-remove.spec.ts +++ b/src/m365/pa/commands/app/app-permission-remove.spec.ts @@ -7,8 +7,8 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.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 { accessToken } from '../../../../utils/accessToken.js'; import { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; @@ -99,8 +99,8 @@ describe(commands.APP_PERMISSION_REMOVE, () => { request.post, cli.getSettingWithDefaultValue, cli.promptForConfirmation, - aadUser.getUserIdByUpn, - aadGroup.getGroupByDisplayName, + entraUser.getUserIdByUpn, + entraGroup.getGroupByDisplayName, accessToken.getTenantIdFromAccessToken ]); }); @@ -259,7 +259,7 @@ describe(commands.APP_PERMISSION_REMOVE, () => { }); it('removes permissions for a Power App by using UPN', async () => { - sinon.stub(aadUser, 'getUserIdByUpn').resolves(validUserId); + sinon.stub(entraUser, 'getUserIdByUpn').resolves(validUserId); const postStub = sinon.stub(request, 'post').callsFake(async (opts) => { if (opts.url === `https://api.powerapps.com/providers/Microsoft.PowerApps/apps/${validAppName}/modifyPermissions?api-version=2022-11-01`) { @@ -278,7 +278,7 @@ describe(commands.APP_PERMISSION_REMOVE, () => { }); it('removes permissions for a Power App by using group name', async () => { - sinon.stub(aadGroup, 'getGroupByDisplayName').resolves(groupResponse); + sinon.stub(entraGroup, 'getGroupByDisplayName').resolves(groupResponse); const postStub = sinon.stub(request, 'post').callsFake(async (opts) => { if (opts.url === `https://api.powerapps.com/providers/Microsoft.PowerApps/apps/${validAppName}/modifyPermissions?api-version=2022-11-01`) { diff --git a/src/m365/pa/commands/app/app-permission-remove.ts b/src/m365/pa/commands/app/app-permission-remove.ts index d3019d7c926..f0e24da5813 100644 --- a/src/m365/pa/commands/app/app-permission-remove.ts +++ b/src/m365/pa/commands/app/app-permission-remove.ts @@ -3,8 +3,8 @@ import GlobalOptions from '../../../../GlobalOptions.js'; import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import request, { CliRequestOptions } 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 { accessToken } from '../../../../utils/accessToken.js'; import { validation } from '../../../../utils/validation.js'; import PowerAppsCommand from '../../../base/PowerAppsCommand.js'; @@ -182,11 +182,11 @@ class PaAppPermissionRemoveCommand extends PowerAppsCommand { return options.userId; } if (options.groupName) { - const group = await aadGroup.getGroupByDisplayName(options.groupName); + const group = await entraGroup.getGroupByDisplayName(options.groupName); return group.id!; } if (options.userName) { - const userId = await aadUser.getUserIdByUpn(options.userName); + const userId = await entraUser.getUserIdByUpn(options.userName); return userId; } diff --git a/src/m365/planner/commands/bucket/bucket-add.ts b/src/m365/planner/commands/bucket/bucket-add.ts index b6a6f11ce80..8416b65f521 100644 --- a/src/m365/planner/commands/bucket/bucket-add.ts +++ b/src/m365/planner/commands/bucket/bucket-add.ts @@ -1,7 +1,7 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; @@ -154,7 +154,7 @@ class PlannerBucketAddCommand extends GraphCommand { return args.options.ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/bucket/bucket-get.ts b/src/m365/planner/commands/bucket/bucket-get.ts index 19d5d7b0435..1da2c0f9c83 100644 --- a/src/m365/planner/commands/bucket/bucket-get.ts +++ b/src/m365/planner/commands/bucket/bucket-get.ts @@ -2,7 +2,7 @@ import { PlannerBucket } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; @@ -214,7 +214,7 @@ class PlannerBucketGetCommand extends GraphCommand { return ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/bucket/bucket-list.ts b/src/m365/planner/commands/bucket/bucket-list.ts index 844f923a9d1..f7a0ebcc466 100644 --- a/src/m365/planner/commands/bucket/bucket-list.ts +++ b/src/m365/planner/commands/bucket/bucket-list.ts @@ -1,7 +1,7 @@ import { PlannerBucket } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { odata } from '../../../../utils/odata.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; @@ -132,7 +132,7 @@ class PlannerBucketListCommand extends GraphCommand { return args.options.ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/bucket/bucket-remove.ts b/src/m365/planner/commands/bucket/bucket-remove.ts index 9b32aa554ce..ca622196c7d 100644 --- a/src/m365/planner/commands/bucket/bucket-remove.ts +++ b/src/m365/planner/commands/bucket/bucket-remove.ts @@ -3,7 +3,7 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; @@ -231,7 +231,7 @@ class PlannerBucketRemoveCommand extends GraphCommand { return ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/bucket/bucket-set.ts b/src/m365/planner/commands/bucket/bucket-set.ts index c1888077605..169f1b99821 100644 --- a/src/m365/planner/commands/bucket/bucket-set.ts +++ b/src/m365/planner/commands/bucket/bucket-set.ts @@ -2,7 +2,7 @@ import { PlannerBucket } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; @@ -231,7 +231,7 @@ class PlannerBucketSetCommand extends GraphCommand { return ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/plan/plan-add.ts b/src/m365/planner/commands/plan/plan-add.ts index 1b628ad31c3..0fafa6974d1 100644 --- a/src/m365/planner/commands/plan/plan-add.ts +++ b/src/m365/planner/commands/plan/plan-add.ts @@ -3,7 +3,7 @@ import { Logger } from '../../../../cli/Logger.js'; import { CommandError } from '../../../../Command.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -235,7 +235,7 @@ class PlannerPlanAddCommand extends GraphCommand { return args.options.ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/plan/plan-get.ts b/src/m365/planner/commands/plan/plan-get.ts index f24a3d7b47b..e7522b6c0bc 100644 --- a/src/m365/planner/commands/plan/plan-get.ts +++ b/src/m365/planner/commands/plan/plan-get.ts @@ -2,7 +2,7 @@ import { PlannerPlan, PlannerPlanDetails } from '@microsoft/microsoft-graph-type import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; @@ -156,7 +156,7 @@ class PlannerPlanGetCommand extends GraphCommand { return args.options.ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/plan/plan-list.ts b/src/m365/planner/commands/plan/plan-list.ts index 2bc6d55580b..66106fd4630 100644 --- a/src/m365/planner/commands/plan/plan-list.ts +++ b/src/m365/planner/commands/plan/plan-list.ts @@ -1,6 +1,6 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; @@ -107,7 +107,7 @@ class PlannerPlanListCommand extends GraphCommand { return args.options.ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/plan/plan-remove.ts b/src/m365/planner/commands/plan/plan-remove.ts index 9a164ccb875..ade74832ea2 100644 --- a/src/m365/planner/commands/plan/plan-remove.ts +++ b/src/m365/planner/commands/plan/plan-remove.ts @@ -3,7 +3,7 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; @@ -156,7 +156,7 @@ class PlannerPlanRemoveCommand extends GraphCommand { return ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/plan/plan-set.ts b/src/m365/planner/commands/plan/plan-set.ts index 3d361402361..aff39c5a500 100644 --- a/src/m365/planner/commands/plan/plan-set.ts +++ b/src/m365/planner/commands/plan/plan-set.ts @@ -2,7 +2,7 @@ import { PlannerPlan, PlannerPlanDetails, User } from '@microsoft/microsoft-grap import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { formatting } from '../../../../utils/formatting.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; @@ -180,7 +180,7 @@ class PlannerPlanSetCommand extends GraphCommand { return ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(ownerGroupName!); return group.id!; } diff --git a/src/m365/planner/commands/roster/roster-member-add.spec.ts b/src/m365/planner/commands/roster/roster-member-add.spec.ts index ab8ef1dbc77..94c809f1f7c 100644 --- a/src/m365/planner/commands/roster/roster-member-add.spec.ts +++ b/src/m365/planner/commands/roster/roster-member-add.spec.ts @@ -7,7 +7,7 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraUser } from '../../../../utils/entraUser.js'; import { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; @@ -58,7 +58,7 @@ describe(commands.ROSTER_MEMBER_ADD, () => { afterEach(() => { sinonUtil.restore([ request.post, - aadUser.getUserIdByUpn + entraUser.getUserIdByUpn ]); }); @@ -119,7 +119,7 @@ describe(commands.ROSTER_MEMBER_ADD, () => { }); it('adds a new member to the roster by userName', async () => { - sinon.stub(aadUser, 'getUserIdByUpn').resolves(validUserId); + sinon.stub(entraUser, 'getUserIdByUpn').resolves(validUserId); sinon.stub(request, 'post').callsFake(async opts => { if (opts.url === `https://graph.microsoft.com/beta/planner/rosters/${validRosterId}/members`) { diff --git a/src/m365/planner/commands/roster/roster-member-add.ts b/src/m365/planner/commands/roster/roster-member-add.ts index 4cddae46995..90455c94ee4 100644 --- a/src/m365/planner/commands/roster/roster-member-add.ts +++ b/src/m365/planner/commands/roster/roster-member-add.ts @@ -1,7 +1,7 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraUser } from '../../../../utils/entraUser.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; @@ -120,7 +120,7 @@ class PlannerRosterMemberAddCommand extends GraphCommand { return args.options.userId; } - const userId = await aadUser.getUserIdByUpn(args.options.userName!); + const userId = await entraUser.getUserIdByUpn(args.options.userName!); return userId; } diff --git a/src/m365/planner/commands/roster/roster-member-get.ts b/src/m365/planner/commands/roster/roster-member-get.ts index 85fb16fcd53..c89fa8a607f 100644 --- a/src/m365/planner/commands/roster/roster-member-get.ts +++ b/src/m365/planner/commands/roster/roster-member-get.ts @@ -4,7 +4,7 @@ import request, { CliRequestOptions } from '../../../../request.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraUser } from '../../../../utils/entraUser.js'; interface CommandArgs { options: Options; @@ -112,7 +112,7 @@ class PlannerRosterMemberGetCommand extends GraphCommand { return args.options.userId; } - return aadUser.getUserIdByUpn(args.options.userName!); + return entraUser.getUserIdByUpn(args.options.userName!); } } diff --git a/src/m365/planner/commands/roster/roster-member-remove.ts b/src/m365/planner/commands/roster/roster-member-remove.ts index de36d154f42..cec718b5c26 100644 --- a/src/m365/planner/commands/roster/roster-member-remove.ts +++ b/src/m365/planner/commands/roster/roster-member-remove.ts @@ -2,7 +2,7 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraUser } from '../../../../utils/entraUser.js'; import { odata } from '../../../../utils/odata.js'; import { validation } from '../../../../utils/validation.js'; import GraphCommand from '../../../base/GraphCommand.js'; @@ -113,7 +113,7 @@ class PlannerRosterMemberRemoveCommand extends GraphCommand { return args.options.userId; } - return aadUser.getUserIdByUpn(args.options.userName!); + return entraUser.getUserIdByUpn(args.options.userName!); } private async removeRosterMember(args: CommandArgs): Promise { diff --git a/src/m365/planner/commands/task/task-add.ts b/src/m365/planner/commands/task/task-add.ts index 6c44903c331..4f474281c99 100644 --- a/src/m365/planner/commands/task/task-add.ts +++ b/src/m365/planner/commands/task/task-add.ts @@ -2,7 +2,7 @@ import { PlannerBucket, PlannerPlan, PlannerTask, PlannerTaskDetails, User } fro import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { formatting } from '../../../../utils/formatting.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; @@ -342,7 +342,7 @@ class PlannerTaskAddCommand extends GraphCommand { return args.options.ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName!); return group.id!; } diff --git a/src/m365/planner/commands/task/task-get.ts b/src/m365/planner/commands/task/task-get.ts index 39c57777c5e..6924f901cab 100644 --- a/src/m365/planner/commands/task/task-get.ts +++ b/src/m365/planner/commands/task/task-get.ts @@ -2,7 +2,7 @@ import { PlannerBucket, PlannerPlan, PlannerTask, PlannerTaskDetails } from '@mi import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { formatting } from '../../../../utils/formatting.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; @@ -251,7 +251,7 @@ class PlannerTaskGetCommand extends GraphCommand { return options.ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(options.ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(options.ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/task/task-list.ts b/src/m365/planner/commands/task/task-list.ts index 600f4e1c69a..5536b07abea 100644 --- a/src/m365/planner/commands/task/task-list.ts +++ b/src/m365/planner/commands/task/task-list.ts @@ -2,7 +2,7 @@ import { PlannerPlan, PlannerTask } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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 { planner } from '../../../../utils/planner.js'; @@ -214,7 +214,7 @@ class PlannerTaskListCommand extends GraphCommand { return formatting.encodeQueryParameter(args.options.ownerGroupId); } - const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName!); return group.id!; } diff --git a/src/m365/planner/commands/task/task-remove.ts b/src/m365/planner/commands/task/task-remove.ts index 5eaecf18171..fd850d83005 100644 --- a/src/m365/planner/commands/task/task-remove.ts +++ b/src/m365/planner/commands/task/task-remove.ts @@ -3,7 +3,7 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { odata } from '../../../../utils/odata.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; @@ -256,7 +256,7 @@ class PlannerTaskRemoveCommand extends GraphCommand { return ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(ownerGroupName!); return group.id!; } } diff --git a/src/m365/planner/commands/task/task-set.ts b/src/m365/planner/commands/task/task-set.ts index d08b3a9eae0..1cca7d90f9a 100644 --- a/src/m365/planner/commands/task/task-set.ts +++ b/src/m365/planner/commands/task/task-set.ts @@ -2,7 +2,7 @@ import { PlannerBucket, PlannerPlan, PlannerTask, PlannerTaskDetails, User } fro import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { formatting } from '../../../../utils/formatting.js'; import { planner } from '../../../../utils/planner.js'; import { validation } from '../../../../utils/validation.js'; @@ -385,7 +385,7 @@ class PlannerTaskSetCommand extends GraphCommand { return options.ownerGroupId; } - const group = await aadGroup.getGroupByDisplayName(options.ownerGroupName!); + const group = await entraGroup.getGroupByDisplayName(options.ownerGroupName!); return group.id!; } diff --git a/src/m365/spo/commands/group/group-member-add.ts b/src/m365/spo/commands/group/group-member-add.ts index 1b150b58118..94eeffc5abc 100644 --- a/src/m365/spo/commands/group/group-member-add.ts +++ b/src/m365/spo/commands/group/group-member-add.ts @@ -1,8 +1,8 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -242,15 +242,14 @@ class SpoGroupMemberAddCommand extends SpoCommand { 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); } } diff --git a/src/m365/spo/commands/group/group-member-remove.ts b/src/m365/spo/commands/group/group-member-remove.ts index 46ad937b9aa..2d60227c782 100644 --- a/src/m365/spo/commands/group/group-member-remove.ts +++ b/src/m365/spo/commands/group/group-member-remove.ts @@ -5,7 +5,7 @@ import GlobalOptions from '../../../../GlobalOptions.js'; import request from '../../../../request.js'; import { formatting } from '../../../../utils/formatting.js'; import { validation } from '../../../../utils/validation.js'; -import aadUserGetCommand, { Options as AadUserGetCommandOptions } from '../../../entra/commands/user/user-get.js'; +import entraUserGetCommand, { Options as EntraUserGetCommandOptions } from '../../../entra/commands/user/user-get.js'; import SpoCommand from '../../../base/SpoCommand.js'; import commands from '../../commands.js'; import SpoGroupMemberListCommand, { Options as SpoGroupMemberListCommandOptions } from './group-member-list.js'; @@ -149,14 +149,14 @@ class SpoGroupMemberRemoveCommand extends SpoCommand { await logger.logToStderr(`Retrieving information about the user ${args.options.email}`); } - const options: AadUserGetCommandOptions = { + const options: EntraUserGetCommandOptions = { email: args.options.email, output: 'json', debug: args.options.debug, verbose: args.options.verbose }; - const userGetOutput: CommandOutput = await cli.executeCommandWithOutput(aadUserGetCommand as Command, { options: { ...options, _: [] } }); + const userGetOutput: CommandOutput = await cli.executeCommandWithOutput(entraUserGetCommand as Command, { options: { ...options, _: [] } }); const userOutput = JSON.parse(userGetOutput.stdout); return userOutput.userPrincipalName; } diff --git a/src/m365/spo/commands/group/group-set.ts b/src/m365/spo/commands/group/group-set.ts index 7af86565415..fb5b949f724 100644 --- a/src/m365/spo/commands/group/group-set.ts +++ b/src/m365/spo/commands/group/group-set.ts @@ -4,7 +4,7 @@ import Command from '../../../../Command.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; import { validation } from '../../../../utils/validation.js'; -import aadUserGetCommand, { Options as AadUserGetCommandOptions } from '../../../entra/commands/user/user-get.js'; +import entraUserGetCommand, { Options as EntraUserGetCommandOptions } from '../../../entra/commands/user/user-get.js'; import SpoCommand from '../../../base/SpoCommand.js'; import commands from '../../commands.js'; @@ -188,7 +188,7 @@ class SpoGroupSetCommand extends SpoCommand { } private async getOwnerId(options: Options): Promise { - const cmdOptions: AadUserGetCommandOptions = { + const cmdOptions: EntraUserGetCommandOptions = { userName: options.ownerUserName, email: options.ownerEmail, output: 'json', @@ -196,7 +196,7 @@ class SpoGroupSetCommand extends SpoCommand { verbose: options.verbose }; - const output: CommandOutput = await cli.executeCommandWithOutput(aadUserGetCommand as Command, { options: { ...cmdOptions, _: [] } }); + const output: CommandOutput = await cli.executeCommandWithOutput(entraUserGetCommand as Command, { options: { ...cmdOptions, _: [] } }); const getUserOutput = JSON.parse(output.stdout); const requestOptions: CliRequestOptions = { diff --git a/src/m365/spo/commands/site/site-remove.ts b/src/m365/spo/commands/site/site-remove.ts index 3b8cd0ffca9..bc0c7c1f45b 100644 --- a/src/m365/spo/commands/site/site-remove.ts +++ b/src/m365/spo/commands/site/site-remove.ts @@ -4,7 +4,7 @@ import { Logger } from '../../../../cli/Logger.js'; import config from '../../../../config.js'; import GlobalOptions from '../../../../GlobalOptions.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 { ClientSvcResponse, ClientSvcResponseContents, FormDigestInfo, spo, SpoOperation } from '../../../../utils/spo.js'; import { validation } from '../../../../utils/validation.js'; @@ -113,7 +113,7 @@ class SpoSiteRemoveCommand extends SpoCommand { } 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.`)); } diff --git a/src/m365/spo/commands/site/site-set.ts b/src/m365/spo/commands/site/site-set.ts index 4a4a3aa62ae..3d3139cf702 100644 --- a/src/m365/spo/commands/site/site-set.ts +++ b/src/m365/spo/commands/site/site-set.ts @@ -10,7 +10,7 @@ import { formatting } from '../../../../utils/formatting.js'; import { ClientSvcResponse, ClientSvcResponseContents, FormDigestInfo, spo, SpoOperation } from '../../../../utils/spo.js'; import { urlUtil } from '../../../../utils/urlUtil.js'; import { validation } from '../../../../utils/validation.js'; -import aadM365GroupSetCommand, { Options as AadM365GroupSetCommandOptions } from '../../../entra/commands/m365group/m365group-set.js'; +import entraM365GroupSetCommand, { Options as EntraM365GroupSetCommandOptions } from '../../../entra/commands/m365group/m365group-set.js'; import SpoCommand from '../../../base/SpoCommand.js'; import commands from '../../commands.js'; import { SharingCapabilities } from '../site/SharingCapabilities.js'; @@ -518,13 +518,13 @@ class SpoSiteSetCommand extends SpoCommand { } if (typeof args.options.isPublic !== 'undefined') { - const commandOptions: AadM365GroupSetCommandOptions = { + const commandOptions: EntraM365GroupSetCommandOptions = { id: this.groupId as string, isPrivate: (args.options.isPublic === false), debug: this.debug, verbose: this.verbose }; - promises.push(cli.executeCommand(aadM365GroupSetCommand as Command, { options: { ...commandOptions, _: [] } })); + promises.push(cli.executeCommand(entraM365GroupSetCommand as Command, { options: { ...commandOptions, _: [] } })); } if (args.options.description) { diff --git a/src/m365/spo/commands/user/user-ensure.spec.ts b/src/m365/spo/commands/user/user-ensure.spec.ts index 77e580b271c..aa45103dfe9 100644 --- a/src/m365/spo/commands/user/user-ensure.spec.ts +++ b/src/m365/spo/commands/user/user-ensure.spec.ts @@ -7,7 +7,7 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraUser } from '../../../../utils/entraUser.js'; import { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; @@ -69,7 +69,7 @@ describe(commands.USER_ENSURE, () => { afterEach(() => { sinonUtil.restore([ request.post, - aadUser.getUpnByUserId + entraUser.getUpnByUserId ]); }); @@ -100,7 +100,7 @@ describe(commands.USER_ENSURE, () => { }); it('ensures user for a specific web by entraId', async () => { - sinon.stub(aadUser, 'getUpnByUserId').callsFake(async () => { + sinon.stub(entraUser, 'getUpnByUserId').callsFake(async () => { return validUserName; }); @@ -117,7 +117,7 @@ describe(commands.USER_ENSURE, () => { }); it('ensures user for a specific web by aadId', async () => { - sinon.stub(aadUser, 'getUpnByUserId').callsFake(async () => { + sinon.stub(entraUser, 'getUpnByUserId').callsFake(async () => { return validUserName; }); @@ -134,7 +134,7 @@ describe(commands.USER_ENSURE, () => { }); it('throws error message when no user was found with a specific id', async () => { - sinon.stub(aadUser, 'getUpnByUserId').callsFake(async (id) => { + sinon.stub(entraUser, 'getUpnByUserId').callsFake(async (id) => { throw { "error": { "error": { diff --git a/src/m365/spo/commands/user/user-ensure.ts b/src/m365/spo/commands/user/user-ensure.ts index c775979afd2..0f7f10ac0fd 100644 --- a/src/m365/spo/commands/user/user-ensure.ts +++ b/src/m365/spo/commands/user/user-ensure.ts @@ -1,7 +1,7 @@ import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -129,7 +129,7 @@ class SpoUserEnsureCommand extends SpoCommand { await logger.logToStderr(`Retrieving user principal name for user with id ${entraId}`); } - return await aadUser.getUpnByUserId(entraId); + return await entraUser.getUpnByUserId(entraId); } } diff --git a/src/m365/teams/commands/app/app-install.ts b/src/m365/teams/commands/app/app-install.ts index 1b33fb33fb9..1a45e0aecae 100644 --- a/src/m365/teams/commands/app/app-install.ts +++ b/src/m365/teams/commands/app/app-install.ts @@ -5,7 +5,7 @@ import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } from '../../../../request.js'; import { formatting } from '../../../../utils/formatting.js'; import { validation } from '../../../../utils/validation.js'; -import aadUserGetCommand, { Options as AadUserGetCommandOptions } from '../../../entra/commands/user/user-get.js'; +import entraUserGetCommand, { Options as EntraUserGetCommandOptions } from '../../../entra/commands/user/user-get.js'; import GraphCommand from '../../../base/GraphCommand.js'; import commands from '../../commands.js'; @@ -131,14 +131,14 @@ class TeamsAppInstallCommand extends GraphCommand { await logger.logToStderr(`Checking if user ${args.options.userId} exists...`); } - const options: AadUserGetCommandOptions = { + const options: EntraUserGetCommandOptions = { id: args.options.userId, output: 'json', debug: args.options.debug, verbose: args.options.verbose }; try { - const res = await cli.executeCommandWithOutput(aadUserGetCommand as Command, { options: { ...options, _: [] } }); + const res = await cli.executeCommandWithOutput(entraUserGetCommand as Command, { options: { ...options, _: [] } }); if (this.verbose) { await logger.logToStderr(res.stderr); diff --git a/src/m365/teams/commands/channel/channel-get.ts b/src/m365/teams/commands/channel/channel-get.ts index a41da4b41a1..0af3cbcadf0 100644 --- a/src/m365/teams/commands/channel/channel-get.ts +++ b/src/m365/teams/commands/channel/channel-get.ts @@ -2,7 +2,7 @@ import { Channel, Group } from '@microsoft/microsoft-graph-types'; import GlobalOptions from '../../../../GlobalOptions.js'; import { Logger } from '../../../../cli/Logger.js'; import request, { CliRequestOptions } 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'; @@ -104,7 +104,7 @@ class TeamsChannelGetCommand extends GraphCommand { return args.options.teamId; } - const group = await aadGroup.getGroupByDisplayName(args.options.teamName!); + const group = await entraGroup.getGroupByDisplayName(args.options.teamName!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw `The specified team does not exist in the Microsoft Teams`; } diff --git a/src/m365/teams/commands/channel/channel-list.ts b/src/m365/teams/commands/channel/channel-list.ts index a35f3633d87..b5152269732 100644 --- a/src/m365/teams/commands/channel/channel-list.ts +++ b/src/m365/teams/commands/channel/channel-list.ts @@ -1,7 +1,7 @@ import { Channel, Group } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; -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'; @@ -92,7 +92,7 @@ class TeamsChannelListCommand extends GraphCommand { return args.options.teamId; } - const group = await aadGroup.getGroupByDisplayName(args.options.teamName!); + const group = await entraGroup.getGroupByDisplayName(args.options.teamName!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist in the Microsoft Teams'; } diff --git a/src/m365/teams/commands/channel/channel-member-add.ts b/src/m365/teams/commands/channel/channel-member-add.ts index 71173464998..40100e7e93f 100644 --- a/src/m365/teams/commands/channel/channel-member-add.ts +++ b/src/m365/teams/commands/channel/channel-member-add.ts @@ -2,7 +2,7 @@ import { Channel, Group } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -152,7 +152,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand { return args.options.teamId; } - const group = await aadGroup.getGroupByDisplayName(args.options.teamName!); + const group = await entraGroup.getGroupByDisplayName(args.options.teamName!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist in the Microsoft Teams'; } diff --git a/src/m365/teams/commands/channel/channel-member-list.ts b/src/m365/teams/commands/channel/channel-member-list.ts index 5af6240da4c..5e7faf3d6a8 100644 --- a/src/m365/teams/commands/channel/channel-member-list.ts +++ b/src/m365/teams/commands/channel/channel-member-list.ts @@ -2,7 +2,7 @@ import { Channel, ConversationMember, Group } from '@microsoft/microsoft-graph-t import GlobalOptions from '../../../../GlobalOptions.js'; import { Logger } from '../../../../cli/Logger.js'; import request, { CliRequestOptions } 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'; @@ -139,7 +139,7 @@ class TeamsChannelMemberListCommand extends GraphCommand { return args.options.teamId; } - const group = await aadGroup.getGroupByDisplayName(args.options.teamName!); + const group = await entraGroup.getGroupByDisplayName(args.options.teamName!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist in the Microsoft Teams'; } diff --git a/src/m365/teams/commands/channel/channel-member-remove.ts b/src/m365/teams/commands/channel/channel-member-remove.ts index 3c7394dd007..c9bff524752 100644 --- a/src/m365/teams/commands/channel/channel-member-remove.ts +++ b/src/m365/teams/commands/channel/channel-member-remove.ts @@ -3,7 +3,7 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -178,7 +178,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand { return args.options.teamId; } - const group = await aadGroup.getGroupByDisplayName(args.options.teamName!); + const group = await entraGroup.getGroupByDisplayName(args.options.teamName!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist in the Microsoft Teams'; diff --git a/src/m365/teams/commands/channel/channel-member-set.ts b/src/m365/teams/commands/channel/channel-member-set.ts index 14cc778bc3e..29df38c5ae5 100644 --- a/src/m365/teams/commands/channel/channel-member-set.ts +++ b/src/m365/teams/commands/channel/channel-member-set.ts @@ -2,7 +2,7 @@ import { Channel, ConversationMember, Group } from '@microsoft/microsoft-graph-t import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -161,7 +161,7 @@ class TeamsChannelMemberSetCommand extends GraphCommand { return args.options.teamId; } - const group = await aadGroup.getGroupByDisplayName(args.options.teamName!); + const group = await entraGroup.getGroupByDisplayName(args.options.teamName!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw `The specified team does not exist in the Microsoft Teams`; } diff --git a/src/m365/teams/commands/channel/channel-remove.ts b/src/m365/teams/commands/channel/channel-remove.ts index ca373aee712..22d4221897e 100644 --- a/src/m365/teams/commands/channel/channel-remove.ts +++ b/src/m365/teams/commands/channel/channel-remove.ts @@ -3,7 +3,7 @@ import GlobalOptions from '../../../../GlobalOptions.js'; import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import request, { CliRequestOptions } 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'; @@ -143,7 +143,7 @@ class TeamsChannelRemoveCommand extends GraphCommand { return args.options.teamId; } - const group: Group = await aadGroup.getGroupByDisplayName(args.options.teamName!); + const group: Group = await entraGroup.getGroupByDisplayName(args.options.teamName!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist'; diff --git a/src/m365/teams/commands/channel/channel-set.ts b/src/m365/teams/commands/channel/channel-set.ts index 9b8239a62e9..32474effe33 100644 --- a/src/m365/teams/commands/channel/channel-set.ts +++ b/src/m365/teams/commands/channel/channel-set.ts @@ -2,7 +2,7 @@ import { Channel, Group } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -146,7 +146,7 @@ class TeamsChannelSetCommand extends GraphCommand { return args.options.teamId; } - const group: Group = await aadGroup.getGroupByDisplayName(args.options.teamName!); + const group: Group = await entraGroup.getGroupByDisplayName(args.options.teamName!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist'; diff --git a/src/m365/teams/commands/meeting/meeting-add.spec.ts b/src/m365/teams/commands/meeting/meeting-add.spec.ts index 5fa81581ebd..3dfd63d9078 100644 --- a/src/m365/teams/commands/meeting/meeting-add.spec.ts +++ b/src/m365/teams/commands/meeting/meeting-add.spec.ts @@ -7,7 +7,7 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraUser } from '../../../../utils/entraUser.js'; import { accessToken } from '../../../../utils/accessToken.js'; import { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; @@ -68,7 +68,7 @@ describe(commands.MEETING_ADD, () => { accessToken.isAppOnlyAccessToken, request.get, request.post, - aadUser.getUserIdByEmail, + entraUser.getUserIdByEmail, fakeTimers ]); }); diff --git a/src/m365/teams/commands/meeting/meeting-add.ts b/src/m365/teams/commands/meeting/meeting-add.ts index d898a9e67d2..b0bcf8067d0 100644 --- a/src/m365/teams/commands/meeting/meeting-add.ts +++ b/src/m365/teams/commands/meeting/meeting-add.ts @@ -1,7 +1,7 @@ import auth from '../../../../Auth.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import { Logger } from '../../../../cli/Logger.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"; @@ -149,7 +149,7 @@ class TeamsMeetingAddCommand extends GraphCommand { 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}`; } diff --git a/src/m365/teams/commands/meeting/meeting-attendancereport-list.ts b/src/m365/teams/commands/meeting/meeting-attendancereport-list.ts index da9e3f4f75d..41ca606679f 100644 --- a/src/m365/teams/commands/meeting/meeting-attendancereport-list.ts +++ b/src/m365/teams/commands/meeting/meeting-attendancereport-list.ts @@ -6,7 +6,7 @@ import GlobalOptions from '../../../../GlobalOptions.js'; import { accessToken } from '../../../../utils/accessToken.js'; import { odata } from '../../../../utils/odata.js'; import { validation } from '../../../../utils/validation.js'; -import aadUserGetCommand, { Options as AadUserGetCommandOptions } from '../../../entra/commands/user/user-get.js'; +import entraUserGetCommand, { Options as EntraUserGetCommandOptions } from '../../../entra/commands/user/user-get.js'; import GraphCommand from "../../../base/GraphCommand.js"; import commands from '../../commands.js'; @@ -122,7 +122,7 @@ class TeamsMeetingAttendancereportListCommand extends GraphCommand { } private async getUserId(userName?: string, email?: string): Promise { - const options: AadUserGetCommandOptions = { + const options: EntraUserGetCommandOptions = { email: email, userName: userName, output: 'json', @@ -130,7 +130,7 @@ class TeamsMeetingAttendancereportListCommand extends GraphCommand { verbose: this.verbose }; - const output = await cli.executeCommandWithOutput(aadUserGetCommand as Command, { options: { ...options, _: [] } }); + const output = await cli.executeCommandWithOutput(entraUserGetCommand as Command, { options: { ...options, _: [] } }); const getUserOutput = JSON.parse(output.stdout); return getUserOutput.id; } diff --git a/src/m365/teams/commands/meeting/meeting-get.spec.ts b/src/m365/teams/commands/meeting/meeting-get.spec.ts index 28af0bb229f..5d70f946c42 100644 --- a/src/m365/teams/commands/meeting/meeting-get.spec.ts +++ b/src/m365/teams/commands/meeting/meeting-get.spec.ts @@ -7,7 +7,7 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.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 { pid } from '../../../../utils/pid.js'; @@ -144,8 +144,8 @@ describe(commands.MEETING_GET, () => { sinonUtil.restore([ accessToken.isAppOnlyAccessToken, request.get, - aadUser.getUserIdByEmail, - aadUser.getUserIdByUpn + entraUser.getUserIdByEmail, + entraUser.getUserIdByUpn ]); }); @@ -207,7 +207,7 @@ describe(commands.MEETING_GET, () => { it('retrieves specific meeting details using userName', async () => { sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true); - sinon.stub(aadUser, 'getUserIdByUpn').resolves(userId); + sinon.stub(entraUser, 'getUserIdByUpn').resolves(userId); sinon.stub(request, 'get').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/users/${userId}/onlineMeetings?$filter=JoinWebUrl eq '${formatting.encodeQueryParameter(joinUrl)}'`) { @@ -230,7 +230,7 @@ describe(commands.MEETING_GET, () => { it('retrieves specific meeting details using email', async () => { sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true); - sinon.stub(aadUser, 'getUserIdByEmail').resolves(userId); + sinon.stub(entraUser, 'getUserIdByEmail').resolves(userId); sinon.stub(request, 'get').callsFake(async (opts) => { if (opts.url === `https://graph.microsoft.com/v1.0/users/${userId}/onlineMeetings?$filter=JoinWebUrl eq '${formatting.encodeQueryParameter(joinUrl)}'`) { return meetingResponse; diff --git a/src/m365/teams/commands/meeting/meeting-get.ts b/src/m365/teams/commands/meeting/meeting-get.ts index 36d77c0604d..b57a5cfa886 100644 --- a/src/m365/teams/commands/meeting/meeting-get.ts +++ b/src/m365/teams/commands/meeting/meeting-get.ts @@ -3,7 +3,7 @@ import auth from '../../../../Auth.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import { Logger } from '../../../../cli/Logger.js'; import request, { CliRequestOptions } 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'; @@ -137,10 +137,10 @@ class TeamsMeetingGetCommand extends GraphCommand { } if (options.userName) { - return aadUser.getUserIdByUpn(options.userName); + return entraUser.getUserIdByUpn(options.userName); } - return aadUser.getUserIdByEmail(options.email!); + return entraUser.getUserIdByEmail(options.email!); } } diff --git a/src/m365/teams/commands/meeting/meeting-list.spec.ts b/src/m365/teams/commands/meeting/meeting-list.spec.ts index 09e85b76360..3eb71670a26 100644 --- a/src/m365/teams/commands/meeting/meeting-list.spec.ts +++ b/src/m365/teams/commands/meeting/meeting-list.spec.ts @@ -7,7 +7,7 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.js'; -import { aadUser } from '../../../../utils/aadUser.js'; +import { entraUser } from '../../../../utils/entraUser.js'; import { accessToken } from '../../../../utils/accessToken.js'; import { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; @@ -178,7 +178,7 @@ describe(commands.MEETING_LIST, () => { accessToken.isAppOnlyAccessToken, request.get, request.post, - aadUser.getUserIdByEmail + entraUser.getUserIdByEmail ]); }); @@ -342,7 +342,7 @@ describe(commands.MEETING_LIST, () => { it('logs meetings for a user specified by email', async () => { sinonUtil.restore(accessToken.isAppOnlyAccessToken); sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true); - sinon.stub(aadUser, 'getUserIdByEmail').resolves(userId); + sinon.stub(entraUser, 'getUserIdByEmail').resolves(userId); sinon.stub(request, 'get').callsFake(async opts => { if (opts.url === `https://graph.microsoft.com/v1.0/users/${userId}/events?$filter=start/dateTime ge '${startDateTime}'&$select=onlineMeeting`) { @@ -494,7 +494,7 @@ describe(commands.MEETING_LIST, () => { it('retrieves meetings correctly when specifying email', async () => { sinonUtil.restore(accessToken.isAppOnlyAccessToken); sinon.stub(accessToken, 'isAppOnlyAccessToken').returns(true); - sinon.stub(aadUser, 'getUserIdByEmail').resolves(userId); + sinon.stub(entraUser, 'getUserIdByEmail').resolves(userId); sinon.stub(request, 'get').callsFake(async opts => { if (opts.url === `https://graph.microsoft.com/v1.0/users/${userId}/events?$filter=start/dateTime ge '${startDateTime}'&$select=onlineMeeting`) { diff --git a/src/m365/teams/commands/meeting/meeting-list.ts b/src/m365/teams/commands/meeting/meeting-list.ts index c126491501f..159cedcb9bf 100644 --- a/src/m365/teams/commands/meeting/meeting-list.ts +++ b/src/m365/teams/commands/meeting/meeting-list.ts @@ -2,7 +2,7 @@ import { Event } from '@microsoft/microsoft-graph-types'; import auth from '../../../../Auth.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import { Logger } from '../../../../cli/Logger.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'; @@ -146,7 +146,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 { diff --git a/src/m365/teams/commands/meeting/meeting-transcript-list.ts b/src/m365/teams/commands/meeting/meeting-transcript-list.ts index 1f61adcc824..6592d614dc5 100644 --- a/src/m365/teams/commands/meeting/meeting-transcript-list.ts +++ b/src/m365/teams/commands/meeting/meeting-transcript-list.ts @@ -1,7 +1,7 @@ import auth from '../../../../Auth.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import { Logger } from '../../../../cli/Logger.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'; @@ -119,7 +119,7 @@ class TeamsMeetingTranscriptListCommand extends GraphCommand { if (this.verbose) { await logger.logToStderr(`Getting user ID for user with email '${args.options.email}'.`); } - const userId: string = await aadUser.getUserIdByEmail(args.options.email!); + const userId: string = await entraUser.getUserIdByEmail(args.options.email!); requestUrl += userId; } } diff --git a/src/m365/teams/commands/tab/tab-get.ts b/src/m365/teams/commands/tab/tab-get.ts index dd83b1553a3..297d133e326 100644 --- a/src/m365/teams/commands/tab/tab-get.ts +++ b/src/m365/teams/commands/tab/tab-get.ts @@ -2,7 +2,7 @@ import { Channel, Group, TeamsTab } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -119,7 +119,7 @@ class TeamsTabGetCommand extends GraphCommand { return args.options.teamId; } - const group = await aadGroup.getGroupByDisplayName(args.options.teamName!); + const group = await entraGroup.getGroupByDisplayName(args.options.teamName!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist in the Microsoft Teams'; diff --git a/src/m365/teams/commands/team/team-add.spec.ts b/src/m365/teams/commands/team/team-add.spec.ts index b2e96d85317..da9f363da3a 100644 --- a/src/m365/teams/commands/team/team-add.spec.ts +++ b/src/m365/teams/commands/team/team-add.spec.ts @@ -7,7 +7,7 @@ import { CommandInfo } from '../../../../cli/CommandInfo.js'; import { Logger } from '../../../../cli/Logger.js'; import request from '../../../../request.js'; import { telemetry } from '../../../../telemetry.js'; -import { aadGroup } from '../../../../utils/aadGroup.js'; +import { entraGroup } from '../../../../utils/entraGroup.js'; import { pid } from '../../../../utils/pid.js'; import { session } from '../../../../utils/session.js'; import { sinonUtil } from '../../../../utils/sinonUtil.js'; @@ -51,7 +51,7 @@ describe(commands.TEAM_ADD, () => { sinonUtil.restore([ request.post, request.get, - aadGroup.getGroupById + entraGroup.getGroupById ]); }); @@ -90,7 +90,7 @@ describe(commands.TEAM_ADD, () => { } throw 'Invalid request'; }); - const aadGroupStub = sinon.stub(aadGroup, 'getGroupById').callsFake(async (groupId: string) => { + const aadGroupStub = sinon.stub(entraGroup, 'getGroupById').callsFake(async (groupId: string) => { if (firstCall) { firstCall = false; throw { diff --git a/src/m365/teams/commands/team/team-add.ts b/src/m365/teams/commands/team/team-add.ts index d407add0034..770c25ac17f 100644 --- a/src/m365/teams/commands/team/team-add.ts +++ b/src/m365/teams/commands/team/team-add.ts @@ -3,7 +3,7 @@ import { setTimeout } from 'timers/promises'; import GlobalOptions from '../../../../GlobalOptions.js'; import { Logger } from '../../../../cli/Logger.js'; import request, { CliRequestOptions } 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'; @@ -142,8 +142,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: any) { @@ -171,18 +171,18 @@ class TeamsTeamAddCommand extends GraphCommand { } } - private async getAadGroup(id: string, logger: Logger): Promise { + private async getEntraGroup(id: string, logger: Logger): Promise { let group: 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!; diff --git a/src/m365/teams/commands/team/team-archive.ts b/src/m365/teams/commands/team/team-archive.ts index 3eae02fec3b..54e4c870c8e 100644 --- a/src/m365/teams/commands/team/team-archive.ts +++ b/src/m365/teams/commands/team/team-archive.ts @@ -2,7 +2,7 @@ import { Group } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -87,7 +87,7 @@ class TeamsTeamArchiveCommand extends GraphCommand { return args.options.id; } - const group = await aadGroup.getGroupByDisplayName(args.options.name!); + const group = await entraGroup.getGroupByDisplayName(args.options.name!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist in the Microsoft Teams'; diff --git a/src/m365/teams/commands/team/team-get.ts b/src/m365/teams/commands/team/team-get.ts index 44b4dc9ad58..d2c4b1e194e 100644 --- a/src/m365/teams/commands/team/team-get.ts +++ b/src/m365/teams/commands/team/team-get.ts @@ -2,7 +2,7 @@ import { Group, Team } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.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'; @@ -80,7 +80,7 @@ class TeamsTeamGetCommand extends GraphCommand { return args.options.id; } - const group = await aadGroup.getGroupByDisplayName(args.options.name!); + const group = await entraGroup.getGroupByDisplayName(args.options.name!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist in the Microsoft Teams'; diff --git a/src/m365/teams/commands/team/team-remove.ts b/src/m365/teams/commands/team/team-remove.ts index 39d4d11307f..de2e3f661ae 100644 --- a/src/m365/teams/commands/team/team-remove.ts +++ b/src/m365/teams/commands/team/team-remove.ts @@ -3,7 +3,7 @@ import { cli } from '../../../../cli/cli.js'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -84,7 +84,7 @@ class TeamsTeamRemoveCommand extends GraphCommand { return args.options.id; } - const group = await aadGroup.getGroupByDisplayName(args.options.name!); + const group = await entraGroup.getGroupByDisplayName(args.options.name!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw `The specified team does not exist in the Microsoft Teams`; } diff --git a/src/m365/teams/commands/team/team-unarchive.ts b/src/m365/teams/commands/team/team-unarchive.ts index e470cc7f041..dccd0b4708e 100644 --- a/src/m365/teams/commands/team/team-unarchive.ts +++ b/src/m365/teams/commands/team/team-unarchive.ts @@ -2,7 +2,7 @@ import { Group } from '@microsoft/microsoft-graph-types'; import { Logger } from '../../../../cli/Logger.js'; import GlobalOptions from '../../../../GlobalOptions.js'; import request, { CliRequestOptions } 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'; @@ -70,7 +70,7 @@ class TeamsTeamUnarchiveCommand extends GraphCommand { return args.options.id; } - const group = await aadGroup.getGroupByDisplayName(args.options.name!); + const group = await entraGroup.getGroupByDisplayName(args.options.name!); if ((group as ExtendedGroup).resourceProvisioningOptions.indexOf('Team') === -1) { throw 'The specified team does not exist in the Microsoft Teams'; } diff --git a/src/utils/aadAdministrativeUnit.spec.ts b/src/utils/entraAdministrativeUnit.spec.ts similarity index 82% rename from src/utils/aadAdministrativeUnit.spec.ts rename to src/utils/entraAdministrativeUnit.spec.ts index 69e8782e5a9..97eadeffa5e 100644 --- a/src/utils/aadAdministrativeUnit.spec.ts +++ b/src/utils/entraAdministrativeUnit.spec.ts @@ -1,6 +1,6 @@ import assert from 'assert'; import sinon from 'sinon'; -import { aadAdministrativeUnit } from './aadAdministrativeUnit.js'; +import { entraAdministrativeUnit } from './entraAdministrativeUnit.js'; import { cli } from '../cli/cli.js'; import request from '../request.js'; import { sinonUtil } from './sinonUtil.js'; @@ -8,7 +8,7 @@ import { formatting } from './formatting.js'; import { settingsNames } from '../settingsNames.js'; -describe('utils/aadAdministrativeUnit', () => { +describe('utils/entraAdministrativeUnit', () => { const administrativeUnitId = 'fc33aa61-cf0e-46b6-9506-f633347202ab'; const secondAdministrativeUnitId = 'fc33aa61-cf0e-1234-9506-f633347202ab'; const displayName = 'European Division'; @@ -39,7 +39,7 @@ describe('utils/aadAdministrativeUnit', () => { return 'Invalid Request'; }); - const actual = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(displayName); + const actual = await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(displayName); assert.deepStrictEqual(actual, { id: administrativeUnitId, displayName: displayName }); }); @@ -59,7 +59,7 @@ describe('utils/aadAdministrativeUnit', () => { sinon.stub(cli, 'handleMultipleResultsFound').resolves({ id: administrativeUnitId, displayName: displayName }); - const actual = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(displayName); + const actual = await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(displayName); assert.deepStrictEqual(actual, { id: administrativeUnitId, displayName: displayName }); }); @@ -72,7 +72,7 @@ describe('utils/aadAdministrativeUnit', () => { throw 'Invalid Request'; }); - await assert.rejects(aadAdministrativeUnit.getAdministrativeUnitByDisplayName(invalidDisplayName)), Error(`The specified administrative unit '${invalidDisplayName}' does not exist.`); + await assert.rejects(entraAdministrativeUnit.getAdministrativeUnitByDisplayName(invalidDisplayName)), Error(`The specified administrative unit '${invalidDisplayName}' does not exist.`); }); it('throws error message when multiple administrative units were found using getAdministrativeUnitByDisplayName', async () => { @@ -97,6 +97,6 @@ describe('utils/aadAdministrativeUnit', () => { return 'Invalid Request'; }); - await assert.rejects(aadAdministrativeUnit.getAdministrativeUnitByDisplayName(displayName), Error(`Multiple administrative units with name '${displayName}' found. Found: ${administrativeUnitId}.`)); + await assert.rejects(entraAdministrativeUnit.getAdministrativeUnitByDisplayName(displayName), Error(`Multiple administrative units with name '${displayName}' found. Found: ${administrativeUnitId}.`)); }); }); \ No newline at end of file diff --git a/src/utils/aadAdministrativeUnit.ts b/src/utils/entraAdministrativeUnit.ts similarity index 96% rename from src/utils/aadAdministrativeUnit.ts rename to src/utils/entraAdministrativeUnit.ts index 8572dfaed6b..2d536fc564c 100644 --- a/src/utils/aadAdministrativeUnit.ts +++ b/src/utils/entraAdministrativeUnit.ts @@ -3,7 +3,7 @@ import { odata } from './odata.js'; import { formatting } from './formatting.js'; import { cli } from '../cli/cli.js'; -export const aadAdministrativeUnit = { +export const entraAdministrativeUnit = { /** * Get an administrative unit by its display name. * @param displayName Administrative unit display name. diff --git a/src/utils/aadDevice.spec.ts b/src/utils/entraDevice.spec.ts similarity index 85% rename from src/utils/aadDevice.spec.ts rename to src/utils/entraDevice.spec.ts index 4fdf999dbf9..a600be4dc6b 100644 --- a/src/utils/aadDevice.spec.ts +++ b/src/utils/entraDevice.spec.ts @@ -1,6 +1,6 @@ import assert from 'assert'; import sinon from 'sinon'; -import { aadDevice } from './aadDevice.js'; +import { entraDevice } from './entraDevice.js'; import { cli } from "../cli/cli.js"; import request from "../request.js"; import { sinonUtil } from "./sinonUtil.js"; @@ -8,7 +8,7 @@ import { formatting } from './formatting.js'; import { settingsNames } from '../settingsNames.js'; -describe('utils/aadDevice', () => { +describe('utils/entraDevice', () => { const deviceId = 'fc33aa61-cf0e-46b6-9506-f633347202ab'; const secondDeviceId = 'fc33aa61-cf0e-1234-9506-f633347202ab'; const displayName = 'AdeleVence-PC'; @@ -39,7 +39,7 @@ describe('utils/aadDevice', () => { return 'Invalid Request'; }); - const actual = await aadDevice.getDeviceByDisplayName(displayName); + const actual = await entraDevice.getDeviceByDisplayName(displayName); assert.deepStrictEqual(actual, { id: deviceId, displayName: displayName }); }); @@ -59,7 +59,7 @@ describe('utils/aadDevice', () => { sinon.stub(cli, 'handleMultipleResultsFound').resolves({ id: deviceId, displayName: displayName }); - const actual = await aadDevice.getDeviceByDisplayName(displayName); + const actual = await entraDevice.getDeviceByDisplayName(displayName); assert.deepStrictEqual(actual, { id: deviceId, displayName: displayName }); }); @@ -75,7 +75,7 @@ describe('utils/aadDevice', () => { sinonUtil.restore(cli.promptForConfirmation); sinon.stub(cli, 'promptForConfirmation').resolves(true); - await assert.rejects(aadDevice.getDeviceByDisplayName(invalidDisplayName)), Error(`The specified device '${invalidDisplayName}' does not exist.`); + await assert.rejects(entraDevice.getDeviceByDisplayName(invalidDisplayName)), Error(`The specified device '${invalidDisplayName}' does not exist.`); }); it('throws error message when multiple devices were found using getDeviceByDisplayName', async () => { @@ -100,6 +100,6 @@ describe('utils/aadDevice', () => { return 'Invalid Request'; }); - await assert.rejects(aadDevice.getDeviceByDisplayName(displayName), Error(`Multiple devices with name '${displayName}' found. Found: ${deviceId}.`)); + await assert.rejects(entraDevice.getDeviceByDisplayName(displayName), Error(`Multiple devices with name '${displayName}' found. Found: ${deviceId}.`)); }); }); \ No newline at end of file diff --git a/src/utils/aadDevice.ts b/src/utils/entraDevice.ts similarity index 97% rename from src/utils/aadDevice.ts rename to src/utils/entraDevice.ts index 808ed956a3f..accc33d1476 100644 --- a/src/utils/aadDevice.ts +++ b/src/utils/entraDevice.ts @@ -5,7 +5,7 @@ import { cli } from "../cli/cli.js"; const graphResource = 'https://graph.microsoft.com'; -export const aadDevice = { +export const entraDevice = { /** * Get a device by its display name. * @param displayName Device display name. diff --git a/src/utils/aadGroup.spec.ts b/src/utils/entraGroup.spec.ts similarity index 85% rename from src/utils/aadGroup.spec.ts rename to src/utils/entraGroup.spec.ts index 4ecf7859e0e..97d60fc8f2f 100644 --- a/src/utils/aadGroup.spec.ts +++ b/src/utils/entraGroup.spec.ts @@ -1,7 +1,7 @@ import assert from 'assert'; import sinon from 'sinon'; import request from "../request.js"; -import { aadGroup } from './aadGroup.js'; +import { entraGroup } from './entraGroup.js'; import { formatting } from './formatting.js'; import { sinonUtil } from "./sinonUtil.js"; import { Logger } from '../cli/Logger.js'; @@ -16,7 +16,7 @@ const singleGroupResponse = { displayName: validGroupName }; -describe('utils/aadGroup', () => { +describe('utils/entraGroup', () => { let logger: Logger; let log: string[]; @@ -53,7 +53,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - const actual = await aadGroup.getGroupById(validGroupId); + const actual = await entraGroup.getGroupById(validGroupId); assert.strictEqual(actual, singleGroupResponse); }); @@ -66,7 +66,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - await assert.rejects(aadGroup.getGroupByDisplayName(validGroupName), Error(`The specified group '${validGroupName}' does not exist.`)); + await assert.rejects(entraGroup.getGroupByDisplayName(validGroupName), Error(`The specified group '${validGroupName}' does not exist.`)); }); it('throws error message when multiple groups were found using getGroupByDisplayName', async () => { @@ -91,7 +91,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - await assert.rejects(aadGroup.getGroupByDisplayName(validGroupName), Error("Multiple groups with name 'Group name' found. Found: 00000000-0000-0000-0000-000000000000.")); + await assert.rejects(entraGroup.getGroupByDisplayName(validGroupName), Error("Multiple groups with name 'Group name' found. Found: 00000000-0000-0000-0000-000000000000.")); }); it('correctly get single group by name using getGroupByDisplayName', async () => { @@ -107,7 +107,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - const actual = await aadGroup.getGroupByDisplayName(validGroupName); + const actual = await entraGroup.getGroupByDisplayName(validGroupName); assert.deepStrictEqual(actual, singleGroupResponse); }); @@ -124,7 +124,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - const actual = await aadGroup.getGroupIdByDisplayName(validGroupName); + const actual = await entraGroup.getGroupIdByDisplayName(validGroupName); assert.deepStrictEqual(actual, singleGroupResponse.id); }); @@ -137,7 +137,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - await assert.rejects(aadGroup.getGroupIdByDisplayName(validGroupName), Error(`The specified group '${validGroupName}' does not exist.`)); + await assert.rejects(entraGroup.getGroupIdByDisplayName(validGroupName), Error(`The specified group '${validGroupName}' does not exist.`)); }); it('throws error message when multiple groups were found using getGroupIdByDisplayName', async () => { @@ -162,7 +162,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - await assert.rejects(aadGroup.getGroupIdByDisplayName(validGroupName), Error(`Multiple groups with name 'Group name' found. Found: 00000000-0000-0000-0000-000000000000.`)); + await assert.rejects(entraGroup.getGroupIdByDisplayName(validGroupName), Error(`Multiple groups with name 'Group name' found. Found: 00000000-0000-0000-0000-000000000000.`)); }); it('handles selecting single result when multiple groups with the specified name found using getGroupIdByDisplayName and cli is set to prompt', async () => { @@ -181,7 +181,7 @@ describe('utils/aadGroup', () => { sinon.stub(cli, 'handleMultipleResultsFound').resolves({ id: validGroupId }); - const actual = await aadGroup.getGroupIdByDisplayName(validGroupName); + const actual = await entraGroup.getGroupIdByDisplayName(validGroupName); assert.deepStrictEqual(actual, validGroupId); }); @@ -194,7 +194,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - await aadGroup.setGroup(validGroupId, true, logger, true); + await entraGroup.setGroup(validGroupId, true, logger, true); assert(patchStub.called); }); @@ -207,7 +207,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - await aadGroup.setGroup(validGroupId, false, logger, true); + await entraGroup.setGroup(validGroupId, false, logger, true); assert(patchStub.called); }); @@ -227,7 +227,7 @@ describe('utils/aadGroup', () => { sinon.stub(cli, 'handleMultipleResultsFound').resolves({ id: validGroupId, displayName: validGroupName }); - const actual = await aadGroup.getGroupByDisplayName(validGroupName); + const actual = await entraGroup.getGroupByDisplayName(validGroupName); assert.deepStrictEqual(actual, singleGroupResponse); }); @@ -243,7 +243,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - const actual = await aadGroup.isUnifiedGroup(validGroupId); + const actual = await entraGroup.isUnifiedGroup(validGroupId); assert.deepStrictEqual(actual, true); }); @@ -257,7 +257,7 @@ describe('utils/aadGroup', () => { return 'Invalid Request'; }); - const actual = await aadGroup.isUnifiedGroup(validGroupId); + const actual = await entraGroup.isUnifiedGroup(validGroupId); assert.deepStrictEqual(actual, false); }); }); \ No newline at end of file diff --git a/src/utils/aadGroup.ts b/src/utils/entraGroup.ts similarity index 99% rename from src/utils/aadGroup.ts rename to src/utils/entraGroup.ts index 43dd3018359..fb516e48f39 100644 --- a/src/utils/aadGroup.ts +++ b/src/utils/entraGroup.ts @@ -7,7 +7,7 @@ import { cli } from '../cli/cli.js'; const graphResource = 'https://graph.microsoft.com'; -export const aadGroup = { +export const entraGroup = { /** * Retrieve a single group. * @param id Group ID. diff --git a/src/utils/aadUser.spec.ts b/src/utils/entraUser.spec.ts similarity index 81% rename from src/utils/aadUser.spec.ts rename to src/utils/entraUser.spec.ts index 26d19d33069..d4be2b082ee 100644 --- a/src/utils/aadUser.spec.ts +++ b/src/utils/entraUser.spec.ts @@ -1,7 +1,7 @@ import assert from 'assert'; import sinon from 'sinon'; import request from '../request.js'; -import { aadUser } from './aadUser.js'; +import { entraUser } from './entraUser.js'; import { formatting } from './formatting.js'; import { sinonUtil } from './sinonUtil.js'; @@ -10,7 +10,7 @@ const validUserId = '2056d2f6-3257-4253-8cfc-b73393e414e5'; const userResponse = { value: [{ id: validUserId }] }; const userPrincipalNameResponse = { userPrincipalName: validUserName }; -describe('utils/aadUser', () => { +describe('utils/entraUser', () => { afterEach(() => { sinonUtil.restore([ request.get @@ -26,7 +26,7 @@ describe('utils/aadUser', () => { return 'Invalid Request'; }); - const actual = await aadUser.getUserIdByUpn(validUserName); + const actual = await entraUser.getUserIdByUpn(validUserName); assert.strictEqual(actual, validUserId); }); @@ -39,7 +39,7 @@ describe('utils/aadUser', () => { return 'Invalid Request'; }); - const actual = await aadUser.getUserIdByEmail(validUserName); + const actual = await entraUser.getUserIdByEmail(validUserName); assert.strictEqual(actual, validUserId); }); @@ -52,7 +52,7 @@ describe('utils/aadUser', () => { throw 'Invalid request'; }); - await assert.rejects(aadUser.getUserIdByUpn(validUserName), Error(`The specified user with user name ${validUserName} does not exist.`)); + await assert.rejects(entraUser.getUserIdByUpn(validUserName), Error(`The specified user with user name ${validUserName} does not exist.`)); }); it('throws error message when no user was found with a specific mail', async () => { @@ -64,7 +64,7 @@ describe('utils/aadUser', () => { throw `Invalid request`; }); - await assert.rejects(aadUser.getUserIdByEmail(validUserName), Error(`The specified user with email ${validUserName} does not exist`)); + await assert.rejects(entraUser.getUserIdByEmail(validUserName), Error(`The specified user with email ${validUserName} does not exist`)); }); it('correctly get upn by user id', async () => { @@ -76,7 +76,7 @@ describe('utils/aadUser', () => { return 'Invalid Request'; }); - const actual = await aadUser.getUpnByUserId(validUserId); + const actual = await entraUser.getUpnByUserId(validUserId); assert.strictEqual(actual, validUserName); }); }); diff --git a/src/utils/aadUser.ts b/src/utils/entraUser.ts similarity index 98% rename from src/utils/aadUser.ts rename to src/utils/entraUser.ts index 2d0054da867..0d16bcbc2b9 100644 --- a/src/utils/aadUser.ts +++ b/src/utils/entraUser.ts @@ -3,7 +3,7 @@ import { formatting } from "./formatting.js"; const graphResource = 'https://graph.microsoft.com'; -export const aadUser = { +export const entraUser = { /** * Retrieve the id of a user by its UPN. * @param upn User UPN. diff --git a/src/utils/spo.spec.ts b/src/utils/spo.spec.ts index 90a6fc9f09b..8e27decf088 100644 --- a/src/utils/spo.spec.ts +++ b/src/utils/spo.spec.ts @@ -7,7 +7,7 @@ import { RoleDefinition } from '../m365/spo/commands/roledefinition/RoleDefiniti import request from '../request.js'; import { sinonUtil } from '../utils/sinonUtil.js'; import { FormDigestInfo, spo } from '../utils/spo.js'; -import { aadGroup } from './aadGroup.js'; +import { entraGroup } from './entraGroup.js'; import { formatting } from './formatting.js'; const stubPostResponses: any = ( @@ -1746,7 +1746,7 @@ describe('utils/spo', () => { FormDigestExpiresAt: new Date(), WebFullUrl: 'https://contoso.sharepoint.com' }); - sinon.stub(aadGroup, 'setGroup').resolves(); + sinon.stub(entraGroup, 'setGroup').resolves(); sinon.stub(spo, 'setGroupifiedSiteOwners').resolves(); sinon.stub(spo, 'applySiteDesign').resolves(); diff --git a/src/utils/spo.ts b/src/utils/spo.ts index 712f17b3cdf..6f7e6130167 100644 --- a/src/utils/spo.ts +++ b/src/utils/spo.ts @@ -14,7 +14,7 @@ import { RoleDefinition } from '../m365/spo/commands/roledefinition/RoleDefiniti import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js'; import { DeletedSiteProperties } from '../m365/spo/commands/site/DeletedSiteProperties.js'; import { SiteProperties } from '../m365/spo/commands/site/SiteProperties.js'; -import { aadGroup } from './aadGroup.js'; +import { entraGroup } from './entraGroup.js'; import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js'; import { WebProperties } from '../m365/spo/commands/web/WebProperties.js'; @@ -1213,7 +1213,7 @@ export const spo = { } if (typeof isPublic !== 'undefined') { - promises.push(aadGroup.setGroup(groupId as string, (isPublic === false), logger, verbose)); + promises.push(entraGroup.setGroup(groupId as string, (isPublic === false), logger, verbose)); } if (typeof owners !== 'undefined') { promises.push(spo.setGroupifiedSiteOwners(spoAdminUrl, groupId, owners, logger, verbose));