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

package/dist/Command.js

@@ -379,7 +379,7 @@ class Command {
         if (cli.currentCommandName &&
             cli.currentCommandName.indexOf(deprecated) === 0) {
             const chalk = (await import('chalk')).default;
-            await logger.logToStderr(chalk.yellow(`Command '${deprecated}' is deprecated. Please use '${recommended}' instead`));
+            await logger.logToStderr(chalk.yellow(`Command '${deprecated}' is deprecated. Please use '${recommended}' instead.`));
         }
     }
     async warn(logger, warning) {

package/dist/m365/app/commands/app-get.js

@@ -1,5 +1,5 @@
 import { cli } from '../../../cli/cli.js';
-import aadAppGetCommand from '../../entra/commands/app/app-get.js';
+import entraAppGetCommand from '../../entra/commands/app/app-get.js';
 import AppCommand from '../../base/AppCommand.js';
 import commands from '../commands.js';
 class AppGetCommand extends AppCommand {
@@ -17,7 +17,7 @@ class AppGetCommand extends AppCommand {
             verbose: args.options.verbose
         };
         try {
-            const appGetOutput = await cli.executeCommandWithOutput(aadAppGetCommand, { options: { ...options, _: [] } });
+            const appGetOutput = await cli.executeCommandWithOutput(entraAppGetCommand, { options: { ...options, _: [] } });
             if (this.verbose) {
                 await logger.logToStderr(appGetOutput.stderr);
             }

package/dist/m365/base/AppCommand.js

@@ -39,7 +39,7 @@ class AppCommand extends Command {
         }
         if (!this.m365rcJson.apps ||
             this.m365rcJson.apps.length === 0) {
-            throw new CommandError(`No Azure AD apps found in ${m365rcJsonPath}`);
+            throw new CommandError(`No Entra apps found in ${m365rcJsonPath}`);
         }
         if (args.options.appId) {
             if (!this.m365rcJson.apps.some(app => app.appId === args.options.appId)) {
@@ -54,7 +54,7 @@ class AppCommand extends Command {
         }
         if (this.m365rcJson.apps.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('appIdIndex', this.m365rcJson.apps);
-            const result = await cli.handleMultipleResultsFound(`Multiple Azure AD apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
             this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
             await super.action(logger, args);
         }

package/dist/m365/base/{YammerCommand.js → VivaEngageCommand.js}

@@ -1,5 +1,5 @@
 import Command, { CommandError } from "../../Command.js";
-export default class YammerCommand extends Command {
+export default class VivaEngageCommand extends Command {
     get resource() {
         return 'https://www.yammer.com/api';
     }
@@ -15,4 +15,4 @@ export default class YammerCommand extends Command {
         }
     }
 }
-//# sourceMappingURL=YammerCommand.js.map
+//# sourceMappingURL=VivaEngageCommand.js.map

package/dist/m365/cli/commands/cli-consent.js

@@ -25,6 +25,8 @@ class CliConsentCommand extends AnonymousCommand {
         let scope = '';
         switch (args.options.service) {
             case 'yammer':
+                await this.warn(logger, 'The yammer service is deprecated. Please use the VivaEngage service instead.');
+            case 'VivaEngage':
                 scope = 'https://api.yammer.com/user_impersonation';
                 break;
         }
@@ -44,12 +46,12 @@ _CliConsentCommand_instances = new WeakSet(), _CliConsentCommand_initTelemetry =
 }, _CliConsentCommand_initOptions = function _CliConsentCommand_initOptions() {
     this.options.unshift({
         option: '-s, --service <service>',
-        autocomplete: ['yammer']
+        autocomplete: ['VivaEngage']
     });
 }, _CliConsentCommand_initValidators = function _CliConsentCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.service !== 'yammer') {
-            return `${args.options.service} is not a valid value for the service option. Allowed values: yammer`;
+        if (args.options.service !== 'VivaEngage' && args.options.service !== 'yammer') {
+            return `${args.options.service} is not a valid value for the service option. Allowed values: VivaEngage`;
         }
         return true;
     });

package/dist/m365/entra/aadCommands.js

@@ -7,6 +7,7 @@ export default {
     ADMINISTRATIVEUNIT_MEMBER_ADD: `${prefix} administrativeunit member add`,
     ADMINISTRATIVEUNIT_MEMBER_GET: `${prefix} administrativeunit member get`,
     ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
+    ADMINISTRATIVEUNIT_MEMBER_REMOVE: `${prefix} administrativeunit member remove`,
     ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD: `${prefix} administrativeunit roleassignment add`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
@@ -20,6 +21,7 @@ export default {
     APPROLEASSIGNMENT_ADD: `${prefix} approleassignment add`,
     APPROLEASSIGNMENT_LIST: `${prefix} approleassignment list`,
     APPROLEASSIGNMENT_REMOVE: `${prefix} approleassignment remove`,
+    GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
@@ -78,6 +80,7 @@ export default {
     USER_RECYCLEBINITEM_CLEAR: `${prefix} user recyclebinitem clear`,
     USER_RECYCLEBINITEM_LIST: `${prefix} user recyclebinitem list`,
     USER_RECYCLEBINITEM_REMOVE: `${prefix} user recyclebinitem remove`,
+    USER_REGISTRATIONDETAILS_LIST: `${prefix} user registrationdetails list`,
     USER_REMOVE: `${prefix} user remove`,
     USER_RECYCLEBINITEM_RESTORE: `${prefix} user recyclebinitem restore`,
     USER_SET: `${prefix} user set`,

package/dist/m365/entra/commands/administrativeunit/administrativeunit-get.js

@@ -8,7 +8,7 @@ import { validation } from "../../../../utils/validation.js";
 import request 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";
 class EntraAdministrativeUnitGetCommand extends GraphCommand {
     get name() {
@@ -36,7 +36,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);
         }

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

@@ -4,14 +4,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraAdministrativeUnitMemberAddCommand_instances, _EntraAdministrativeUnitMemberAddCommand_initTelemetry, _EntraAdministrativeUnitMemberAddCommand_initOptions, _EntraAdministrativeUnitMemberAddCommand_initValidators, _EntraAdministrativeUnitMemberAddCommand_initOptionSets;
-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 from "../../../../request.js";
-import { aadDevice } from "../../../../utils/aadDevice.js";
+import { entraDevice } from "../../../../utils/entraDevice.js";
 import aadCommands from "../../aadCommands.js";
 class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
     get name() {
@@ -40,7 +40,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
                 if (this.verbose) {
                     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) {
                 memberType = 'users';
@@ -49,7 +49,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
                     if (this.verbose) {
                         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) {
@@ -59,7 +59,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
                     if (this.verbose) {
                         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) {
@@ -69,7 +69,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
                     if (this.verbose) {
                         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;
                 }
             }
             const requestOptions = {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-get.js

@@ -7,7 +7,7 @@ var _EntraAdministrativeUnitMemberGetCommand_instances, _EntraAdministrativeUnit
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import request from '../../../../request.js';
 import aadCommands from '../../aadCommands.js';
 class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
@@ -35,7 +35,7 @@ class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
                 if (this.verbose) {
                     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);
             const requestOptions = {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-list.js

@@ -7,7 +7,7 @@ var _EntraAdministrativeUnitMemberListCommand_instances, _EntraAdministrativeUni
 import { odata } from '../../../../utils/odata.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 { validation } from '../../../../utils/validation.js';
 import aadCommands from '../../aadCommands.js';
 class EntraAdministrativeUnitMemberListCommand extends GraphCommand {
@@ -35,7 +35,7 @@ class EntraAdministrativeUnitMemberListCommand extends GraphCommand {
         let administrativeUnitId = args.options.administrativeUnitId;
         try {
             if (args.options.administrativeUnitName) {
-                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+                administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
             }
             let results;
             const endpoint = this.getRequestUrl(administrativeUnitId, args.options);

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-remove.js

@@ -0,0 +1,153 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _EntraAdministrativeUnitMemberRemoveCommand_instances, _EntraAdministrativeUnitMemberRemoveCommand_initTelemetry, _EntraAdministrativeUnitMemberRemoveCommand_initOptions, _EntraAdministrativeUnitMemberRemoveCommand_initValidators, _EntraAdministrativeUnitMemberRemoveCommand_initOptionSets;
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
+import { entraDevice } from '../../../../utils/entraDevice.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 from '../../../../request.js';
+import { cli } from '../../../../cli/cli.js';
+class EntraAdministrativeUnitMemberRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_MEMBER_REMOVE;
+    }
+    get description() {
+        return 'Remove a specific member (user, group, or device) from an administrative unit';
+    }
+    constructor() {
+        super();
+        _EntraAdministrativeUnitMemberRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberRemoveCommand_instances, "m", _EntraAdministrativeUnitMemberRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberRemoveCommand_instances, "m", _EntraAdministrativeUnitMemberRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberRemoveCommand_instances, "m", _EntraAdministrativeUnitMemberRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberRemoveCommand_instances, "m", _EntraAdministrativeUnitMemberRemoveCommand_initTelemetry).call(this);
+    }
+    async commandAction(logger, args) {
+        const removeAdministrativeUnitMember = async () => {
+            let administrativeUnitId = args.options.administrativeUnitId;
+            let memberId = args.options.id;
+            try {
+                if (args.options.administrativeUnitName) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving Administrative Unit Id...`);
+                    }
+                    administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+                }
+                if (args.options.userId || args.options.userName) {
+                    memberId = args.options.userId;
+                    if (args.options.userName) {
+                        if (this.verbose) {
+                            await logger.logToStderr(`Retrieving User Id...`);
+                        }
+                        memberId = await entraUser.getUserIdByUpn(args.options.userName);
+                    }
+                }
+                else if (args.options.groupId || args.options.groupName) {
+                    memberId = args.options.groupId;
+                    if (args.options.groupName) {
+                        if (this.verbose) {
+                            await logger.logToStderr(`Retrieving Group Id...`);
+                        }
+                        memberId = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
+                    }
+                }
+                else if (args.options.deviceId || args.options.deviceName) {
+                    memberId = args.options.deviceId;
+                    if (args.options.deviceName) {
+                        if (this.verbose) {
+                            await logger.logToStderr(`Retrieving Device Id`);
+                        }
+                        memberId = (await entraDevice.getDeviceByDisplayName(args.options.deviceName)).id;
+                    }
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/${memberId}/$ref`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeAdministrativeUnitMember();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove member '${args.options.id || args.options.userName || args.options.groupName || args.options.deviceName}' from administrative unit '${args.options.administrativeUnitId || args.options.administrativeUnitName}'?` });
+            if (result) {
+                await removeAdministrativeUnitMember();
+            }
+        }
+    }
+}
+_EntraAdministrativeUnitMemberRemoveCommand_instances = new WeakSet(), _EntraAdministrativeUnitMemberRemoveCommand_initTelemetry = function _EntraAdministrativeUnitMemberRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            deviceId: typeof args.options.deviceId !== 'undefined',
+            deviceName: typeof args.options.deviceName !== 'undefined',
+            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
+            administrativeUnitName: typeof args.options.administrativeUnitName !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _EntraAdministrativeUnitMemberRemoveCommand_initOptions = function _EntraAdministrativeUnitMemberRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: "--userId [userId]"
+    }, {
+        option: "--userName [userName]"
+    }, {
+        option: "--groupId [groupId]"
+    }, {
+        option: "--groupName [groupName]"
+    }, {
+        option: "--deviceId [deviceId]"
+    }, {
+        option: "--deviceName [deviceName]"
+    }, {
+        option: '--administrativeUnitId [administrativeUnitId]'
+    }, {
+        option: '--administrativeUnitName [administrativeUnitName]'
+    }, {
+        option: '-f, --force'
+    });
+}, _EntraAdministrativeUnitMemberRemoveCommand_initValidators = function _EntraAdministrativeUnitMemberRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.deviceId && !validation.isValidGuid(args.options.deviceId)) {
+            return `${args.options.deviceId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _EntraAdministrativeUnitMemberRemoveCommand_initOptionSets = function _EntraAdministrativeUnitMemberRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
+    this.optionSets.push({ options: ['id', 'userId', 'userName', 'groupId', 'groupName', 'deviceId', 'deviceName'] });
+};
+export default new EntraAdministrativeUnitMemberRemoveCommand();
+//# sourceMappingURL=administrativeunit-member-remove.js.map

package/dist/m365/entra/commands/administrativeunit/administrativeunit-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraAdministrativeUnitRemoveCommand_instances, _EntraAdministrativeUnitRemoveCommand_initTelemetry, _EntraAdministrativeUnitRemoveCommand_initOptions, _EntraAdministrativeUnitRemoveCommand_initOptionSets, _EntraAdministrativeUnitRemoveCommand_initValidators, _EntraAdministrativeUnitRemoveCommand_initTypes;
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import { validation } from "../../../../utils/validation.js";
 import request from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
@@ -35,7 +35,7 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
             try {
                 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;
                 }
                 const requestOptions = {

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

@@ -4,8 +4,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets;
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { 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';
@@ -33,7 +33,7 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
                 if (this.verbose) {
                     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) {
                 if (this.verbose) {
@@ -45,7 +45,7 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
                 if (this.verbose) {
                     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);
             await logger.log(unifiedRoleAssignment);

package/dist/m365/entra/commands/app/app-add.js

@@ -21,7 +21,7 @@ class EntraAppAddCommand extends GraphCommand {
         return 'Creates new Entra app registration';
     }
     alias() {
-        return [aadCommands.APP_ADD];
+        return [aadCommands.APP_ADD, commands.APPREGISTRATION_ADD];
     }
     constructor() {
         super();

package/dist/m365/entra/commands/app/app-get.js

@@ -20,7 +20,7 @@ class EntraAppGetCommand extends GraphCommand {
         return 'Gets an Entra app registration';
     }
     alias() {
-        return [aadCommands.APP_GET];
+        return [aadCommands.APP_GET, commands.APPREGISTRATION_GET];
     }
     constructor() {
         super();

package/dist/m365/entra/commands/app/app-list.js

@@ -10,7 +10,7 @@ class EntraAppListCommand extends GraphCommand {
         return 'Retrieves a list of Entra app registrations';
     }
     alias() {
-        return [aadCommands.APP_LIST];
+        return [aadCommands.APP_LIST, commands.APPREGISTRATION_LIST];
     }
     defaultProperties() {
         return ['appId', 'id', 'displayName', "signInAudience"];

package/dist/m365/entra/commands/app/app-permission-add.js

@@ -23,7 +23,7 @@ class EntraAppPermissionAddCommand extends GraphCommand {
         return 'Adds the specified application and/or delegated permissions to a specified Entra ID (Azure AD) app';
     }
     alias() {
-        return [aadCommands.APP_PERMISSION_ADD];
+        return [aadCommands.APP_PERMISSION_ADD, commands.APPREGISTRATION_PERMISSION_ADD];
     }
     constructor() {
         super();
@@ -67,13 +67,9 @@ class EntraAppPermissionAddCommand extends GraphCommand {
         }
     }
     async getAppObject(options) {
-        let apps;
-        if (options.appObjectId) {
-            apps = await odata.getAllItems(`${this.resource}/v1.0/applications/${options.appObjectId}?$select=id,appId,requiredResourceAccess`);
-        }
-        else {
-            apps = await odata.getAllItems(`${this.resource}/v1.0/applications(appId='${options.appId}')?$select=id,appId,requiredResourceAccess`);
-        }
+        const apps = options.appObjectId
+            ? await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=id eq '${options.appObjectId}'&$select=id,appId,requiredResourceAccess`)
+            : await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=appId eq '${options.appId}'&$select=id,appId,requiredResourceAccess`);
         if (apps.length === 0) {
             throw `App with ${options.appObjectId ? 'object id' : 'client id'} ${options.appObjectId ? options.appObjectId : options.appId} not found in Entra ID (Azure AD)`;
         }