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

package/dist/m365/{aad → entra}/commands/administrativeunit/administrativeunit-remove.js

@@ -3,35 +3,39 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadAdministrativeUnitRemoveCommand_instances, _AadAdministrativeUnitRemoveCommand_initTelemetry, _AadAdministrativeUnitRemoveCommand_initOptions, _AadAdministrativeUnitRemoveCommand_initOptionSets, _AadAdministrativeUnitRemoveCommand_initValidators, _AadAdministrativeUnitRemoveCommand_initTypes;
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+var _EntraAdministrativeUnitRemoveCommand_instances, _EntraAdministrativeUnitRemoveCommand_initTelemetry, _EntraAdministrativeUnitRemoveCommand_initOptions, _EntraAdministrativeUnitRemoveCommand_initOptionSets, _EntraAdministrativeUnitRemoveCommand_initValidators, _EntraAdministrativeUnitRemoveCommand_initTypes;
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import { validation } from "../../../../utils/validation.js";
 import request from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
 import { cli } from "../../../../cli/cli.js";
-class AadAdministrativeUnitRemoveCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_REMOVE;
     }
     get description() {
         return 'Removes an administrative unit';
     }
+    alias() {
+        return [aadCommands.ADMINISTRATIVEUNIT_REMOVE];
+    }
     constructor() {
         super();
-        _AadAdministrativeUnitRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initTypes).call(this);
+        _EntraAdministrativeUnitRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeAdministrativeUnit = async () => {
             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 = {
@@ -57,7 +61,7 @@ class AadAdministrativeUnitRemoveCommand extends GraphCommand {
         }
     }
 }
-_AadAdministrativeUnitRemoveCommand_instances = new WeakSet(), _AadAdministrativeUnitRemoveCommand_initTelemetry = function _AadAdministrativeUnitRemoveCommand_initTelemetry() {
+_EntraAdministrativeUnitRemoveCommand_instances = new WeakSet(), _EntraAdministrativeUnitRemoveCommand_initTelemetry = function _EntraAdministrativeUnitRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: args.options.id !== 'undefined',
@@ -65,7 +69,7 @@ _AadAdministrativeUnitRemoveCommand_instances = new WeakSet(), _AadAdministrativ
             force: !!args.options.force
         });
     });
-}, _AadAdministrativeUnitRemoveCommand_initOptions = function _AadAdministrativeUnitRemoveCommand_initOptions() {
+}, _EntraAdministrativeUnitRemoveCommand_initOptions = function _EntraAdministrativeUnitRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
@@ -73,19 +77,19 @@ _AadAdministrativeUnitRemoveCommand_instances = new WeakSet(), _AadAdministrativ
     }, {
         option: '-f, --force'
     });
-}, _AadAdministrativeUnitRemoveCommand_initOptionSets = function _AadAdministrativeUnitRemoveCommand_initOptionSets() {
+}, _EntraAdministrativeUnitRemoveCommand_initOptionSets = function _EntraAdministrativeUnitRemoveCommand_initOptionSets() {
     this.optionSets.push({
         options: ['id', 'displayName']
     });
-}, _AadAdministrativeUnitRemoveCommand_initValidators = function _AadAdministrativeUnitRemoveCommand_initValidators() {
+}, _EntraAdministrativeUnitRemoveCommand_initValidators = function _EntraAdministrativeUnitRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID for option id.`;
         }
         return true;
     });
-}, _AadAdministrativeUnitRemoveCommand_initTypes = function _AadAdministrativeUnitRemoveCommand_initTypes() {
+}, _EntraAdministrativeUnitRemoveCommand_initTypes = function _EntraAdministrativeUnitRemoveCommand_initTypes() {
     this.types.string.push('id', 'displayName');
 };
-export default new AadAdministrativeUnitRemoveCommand();
+export default new EntraAdministrativeUnitRemoveCommand();
 //# sourceMappingURL=administrativeunit-remove.js.map

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

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

package/dist/m365/{aad → entra}/commands/app/app-add.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadAppAddCommand_instances, _a, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators, _AadAppAddCommand_initOptionSets;
+var _EntraAppAddCommand_instances, _a, _EntraAppAddCommand_initTelemetry, _EntraAppAddCommand_initOptions, _EntraAppAddCommand_initValidators, _EntraAppAddCommand_initOptionSets;
 import fs from 'fs';
 import { v4 } from 'uuid';
 import auth from '../../../../Auth.js';
@@ -12,22 +12,26 @@ import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadAppAddCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraAppAddCommand extends GraphCommand {
     get name() {
         return commands.APP_ADD;
     }
     get description() {
-        return 'Creates new Azure AD app registration';
+        return 'Creates new Entra app registration';
+    }
+    alias() {
+        return [aadCommands.APP_ADD];
     }
     constructor() {
         super();
-        _AadAppAddCommand_instances.add(this);
+        _EntraAppAddCommand_instances.add(this);
         this.appName = '';
         this.appPermissions = [];
-        __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -635,7 +639,7 @@ class AadAppAddCommand extends GraphCommand {
         return platform.charAt(0).toUpperCase() + platform.substring(1);
     }
 }
-_a = AadAppAddCommand, _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = function _AadAppAddCommand_initTelemetry() {
+_a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAppAddCommand_initTelemetry = function _EntraAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             apis: typeof args.options.apisDelegated !== 'undefined',
@@ -655,7 +659,7 @@ _a = AadAppAddCommand, _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCo
             grantAdminConsent: typeof args.options.grantAdminConsent !== 'undefined'
         });
     });
-}, _AadAppAddCommand_initOptions = function _AadAppAddCommand_initOptions() {
+}, _EntraAppAddCommand_initOptions = function _EntraAppAddCommand_initOptions() {
     this.options.unshift({
         option: '-n, --name [name]'
     }, {
@@ -664,7 +668,7 @@ _a = AadAppAddCommand, _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCo
         option: '-r, --redirectUris [redirectUris]'
     }, {
         option: '-p, --platform [platform]',
-        autocomplete: _a.aadApplicationPlatform
+        autocomplete: _a.entraApplicationPlatform
     }, {
         option: '--implicitFlow'
     }, {
@@ -679,7 +683,7 @@ _a = AadAppAddCommand, _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCo
         option: '--scopeName [scopeName]'
     }, {
         option: '--scopeConsentBy [scopeConsentBy]',
-        autocomplete: _a.aadAppScopeConsentBy
+        autocomplete: _a.entraAppScopeConsentBy
     }, {
         option: '--scopeAdminConsentDisplayName [scopeAdminConsentDisplayName]'
     }, {
@@ -697,11 +701,11 @@ _a = AadAppAddCommand, _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCo
     }, {
         option: '--grantAdminConsent'
     });
-}, _AadAppAddCommand_initValidators = function _AadAppAddCommand_initValidators() {
+}, _EntraAppAddCommand_initValidators = function _EntraAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.platform &&
-            _a.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
-            return `${args.options.platform} is not a valid value for platform. Allowed values are ${_a.aadApplicationPlatform.join(', ')}`;
+            _a.entraApplicationPlatform.indexOf(args.options.platform) < 0) {
+            return `${args.options.platform} is not a valid value for platform. Allowed values are ${_a.entraApplicationPlatform.join(', ')}`;
         }
         if (args.options.redirectUris && !args.options.platform) {
             return `When you specify redirectUris you also need to specify platform`;
@@ -727,8 +731,8 @@ _a = AadAppAddCommand, _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCo
             }
         }
         if (args.options.scopeConsentBy &&
-            _a.aadAppScopeConsentBy.indexOf(args.options.scopeConsentBy) < 0) {
-            return `${args.options.scopeConsentBy} is not a valid value for scopeConsentBy. Allowed values are ${_a.aadAppScopeConsentBy.join(', ')}`;
+            _a.entraAppScopeConsentBy.indexOf(args.options.scopeConsentBy) < 0) {
+            return `${args.options.scopeConsentBy} is not a valid value for scopeConsentBy. Allowed values are ${_a.entraAppScopeConsentBy.join(', ')}`;
         }
         if (args.options.manifest) {
             try {
@@ -743,10 +747,10 @@ _a = AadAppAddCommand, _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCo
         }
         return true;
     });
-}, _AadAppAddCommand_initOptionSets = function _AadAppAddCommand_initOptionSets() {
+}, _EntraAppAddCommand_initOptionSets = function _EntraAppAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['name', 'manifest'] });
 };
-AadAppAddCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
-AadAppAddCommand.aadAppScopeConsentBy = ['admins', 'adminsAndUsers'];
-export default new AadAppAddCommand();
+EntraAppAddCommand.entraApplicationPlatform = ['spa', 'web', 'publicClient'];
+EntraAppAddCommand.entraAppScopeConsentBy = ['admins', 'adminsAndUsers'];
+export default new EntraAppAddCommand();
 //# sourceMappingURL=app-add.js.map

package/dist/m365/{aad → entra}/commands/app/app-get.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadAppGetCommand_instances, _AadAppGetCommand_initTelemetry, _AadAppGetCommand_initOptions, _AadAppGetCommand_initValidators, _AadAppGetCommand_initOptionSets;
+var _EntraAppGetCommand_instances, _EntraAppGetCommand_initTelemetry, _EntraAppGetCommand_initOptions, _EntraAppGetCommand_initValidators, _EntraAppGetCommand_initOptionSets;
 import fs from 'fs';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,20 +11,24 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
-class AadAppGetCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraAppGetCommand extends GraphCommand {
     get name() {
         return commands.APP_GET;
     }
     get description() {
-        return 'Gets an Azure AD app registration';
+        return 'Gets an Entra app registration';
+    }
+    alias() {
+        return [aadCommands.APP_GET];
     }
     constructor() {
         super();
-        _AadAppGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadAppGetCommand_instances, "m", _AadAppGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadAppGetCommand_instances, "m", _AadAppGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadAppGetCommand_instances, "m", _AadAppGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadAppGetCommand_instances, "m", _AadAppGetCommand_initOptionSets).call(this);
+        _EntraAppGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAppGetCommand_instances, "m", _EntraAppGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAppGetCommand_instances, "m", _EntraAppGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAppGetCommand_instances, "m", _EntraAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAppGetCommand_instances, "m", _EntraAppGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -116,7 +120,7 @@ class AadAppGetCommand extends GraphCommand {
         return appInfo;
     }
 }
-_AadAppGetCommand_instances = new WeakSet(), _AadAppGetCommand_initTelemetry = function _AadAppGetCommand_initTelemetry() {
+_EntraAppGetCommand_instances = new WeakSet(), _EntraAppGetCommand_initTelemetry = function _EntraAppGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
@@ -124,9 +128,9 @@ _AadAppGetCommand_instances = new WeakSet(), _AadAppGetCommand_initTelemetry = f
             name: typeof args.options.name !== 'undefined'
         });
     });
-}, _AadAppGetCommand_initOptions = function _AadAppGetCommand_initOptions() {
+}, _EntraAppGetCommand_initOptions = function _EntraAppGetCommand_initOptions() {
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--save' });
-}, _AadAppGetCommand_initValidators = function _AadAppGetCommand_initValidators() {
+}, _EntraAppGetCommand_initValidators = function _EntraAppGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
@@ -136,8 +140,8 @@ _AadAppGetCommand_instances = new WeakSet(), _AadAppGetCommand_initTelemetry = f
         }
         return true;
     });
-}, _AadAppGetCommand_initOptionSets = function _AadAppGetCommand_initOptionSets() {
+}, _EntraAppGetCommand_initOptionSets = function _EntraAppGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
 };
-export default new AadAppGetCommand();
+export default new EntraAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/{aad → entra}/commands/app/app-list.js

@@ -1,12 +1,16 @@
 import { odata } from "../../../../utils/odata.js";
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadAppListCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraAppListCommand extends GraphCommand {
     get name() {
         return commands.APP_LIST;
     }
     get description() {
-        return 'Retrieves a list of Azure AD app registrations';
+        return 'Retrieves a list of Entra app registrations';
+    }
+    alias() {
+        return [aadCommands.APP_LIST];
     }
     defaultProperties() {
         return ['appId', 'id', 'displayName', "signInAudience"];
@@ -21,5 +25,5 @@ class AadAppListCommand extends GraphCommand {
         }
     }
 }
-export default new AadAppListCommand();
+export default new EntraAppListCommand();
 //# sourceMappingURL=app-list.js.map

package/dist/m365/{aad → entra}/commands/app/app-permission-add.js

@@ -3,31 +3,35 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadAppPermissionAddCommand_instances, _AadAppPermissionAddCommand_initTelemetry, _AadAppPermissionAddCommand_initOptions, _AadAppPermissionAddCommand_initValidators, _AadAppPermissionAddCommand_initOptionSets;
+var _EntraAppPermissionAddCommand_instances, _EntraAppPermissionAddCommand_initTelemetry, _EntraAppPermissionAddCommand_initOptions, _EntraAppPermissionAddCommand_initValidators, _EntraAppPermissionAddCommand_initOptionSets;
 import { odata } from "../../../../utils/odata.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
 import request from "../../../../request.js";
 import { validation } from "../../../../utils/validation.js";
+import aadCommands from "../../aadCommands.js";
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
     ScopeType["Scope"] = "Scope";
 })(ScopeType || (ScopeType = {}));
-class AadAppPermissionAddCommand extends GraphCommand {
+class EntraAppPermissionAddCommand extends GraphCommand {
     get name() {
         return commands.APP_PERMISSION_ADD;
     }
     get description() {
         return 'Adds the specified application and/or delegated permissions to a specified Entra ID (Azure AD) app';
     }
+    alias() {
+        return [aadCommands.APP_PERMISSION_ADD];
+    }
     constructor() {
         super();
-        _AadAppPermissionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initOptionSets).call(this);
+        _EntraAppPermissionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAppPermissionAddCommand_instances, "m", _EntraAppPermissionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAppPermissionAddCommand_instances, "m", _EntraAppPermissionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAppPermissionAddCommand_instances, "m", _EntraAppPermissionAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAppPermissionAddCommand_instances, "m", _EntraAppPermissionAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -63,13 +67,9 @@ class AadAppPermissionAddCommand 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)`;
         }
@@ -204,7 +204,7 @@ class AadAppPermissionAddCommand extends GraphCommand {
         });
     }
 }
-_AadAppPermissionAddCommand_instances = new WeakSet(), _AadAppPermissionAddCommand_initTelemetry = function _AadAppPermissionAddCommand_initTelemetry() {
+_EntraAppPermissionAddCommand_instances = new WeakSet(), _EntraAppPermissionAddCommand_initTelemetry = function _EntraAppPermissionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
@@ -214,9 +214,9 @@ _AadAppPermissionAddCommand_instances = new WeakSet(), _AadAppPermissionAddComma
             grantAdminConsent: !!args.options.grantAdminConsent
         });
     });
-}, _AadAppPermissionAddCommand_initOptions = function _AadAppPermissionAddCommand_initOptions() {
+}, _EntraAppPermissionAddCommand_initOptions = function _EntraAppPermissionAddCommand_initOptions() {
     this.options.unshift({ option: '-i, --appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '-a, --applicationPermissions [applicationPermissions]' }, { option: '-d, --delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
-}, _AadAppPermissionAddCommand_initValidators = function _AadAppPermissionAddCommand_initValidators() {
+}, _EntraAppPermissionAddCommand_initValidators = function _EntraAppPermissionAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
@@ -226,12 +226,12 @@ _AadAppPermissionAddCommand_instances = new WeakSet(), _AadAppPermissionAddComma
         }
         return true;
     });
-}, _AadAppPermissionAddCommand_initOptionSets = function _AadAppPermissionAddCommand_initOptionSets() {
+}, _EntraAppPermissionAddCommand_initOptionSets = function _EntraAppPermissionAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['appId', 'appObjectId'] });
     this.optionSets.push({
         options: ['applicationPermissions', 'delegatedPermissions'],
         runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
     });
 };
-export default new AadAppPermissionAddCommand();
+export default new EntraAppPermissionAddCommand();
 //# sourceMappingURL=app-permission-add.js.map

package/dist/m365/{aad → entra}/commands/app/app-remove.js

@@ -3,27 +3,31 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadAppRemoveCommand_instances, _AadAppRemoveCommand_initTelemetry, _AadAppRemoveCommand_initOptions, _AadAppRemoveCommand_initValidators, _AadAppRemoveCommand_initOptionSets;
+var _EntraAppRemoveCommand_instances, _EntraAppRemoveCommand_initTelemetry, _EntraAppRemoveCommand_initOptions, _EntraAppRemoveCommand_initValidators, _EntraAppRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
+import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
-class AadAppRemoveCommand extends GraphCommand {
+class EntraAppRemoveCommand extends GraphCommand {
     get name() {
         return commands.APP_REMOVE;
     }
     get description() {
-        return 'Removes an Azure AD app registration';
+        return 'Removes an Entra app registration';
+    }
+    alias() {
+        return [aadCommands.APP_REMOVE];
     }
     constructor() {
         super();
-        _AadAppRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadAppRemoveCommand_instances, "m", _AadAppRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadAppRemoveCommand_instances, "m", _AadAppRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadAppRemoveCommand_instances, "m", _AadAppRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadAppRemoveCommand_instances, "m", _AadAppRemoveCommand_initOptionSets).call(this);
+        _EntraAppRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAppRemoveCommand_instances, "m", _EntraAppRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAppRemoveCommand_instances, "m", _EntraAppRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAppRemoveCommand_instances, "m", _EntraAppRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAppRemoveCommand_instances, "m", _EntraAppRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const deleteApp = async () => {
@@ -86,7 +90,7 @@ class AadAppRemoveCommand extends GraphCommand {
         return result.id;
     }
 }
-_AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemetry = function _AadAppRemoveCommand_initTelemetry() {
+_EntraAppRemoveCommand_instances = new WeakSet(), _EntraAppRemoveCommand_initTelemetry = function _EntraAppRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
@@ -95,9 +99,9 @@ _AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemet
             force: (!(!args.options.force)).toString()
         });
     });
-}, _AadAppRemoveCommand_initOptions = function _AadAppRemoveCommand_initOptions() {
+}, _EntraAppRemoveCommand_initOptions = function _EntraAppRemoveCommand_initOptions() {
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '-f, --force' });
-}, _AadAppRemoveCommand_initValidators = function _AadAppRemoveCommand_initValidators() {
+}, _EntraAppRemoveCommand_initValidators = function _EntraAppRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
@@ -107,8 +111,8 @@ _AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemet
         }
         return true;
     });
-}, _AadAppRemoveCommand_initOptionSets = function _AadAppRemoveCommand_initOptionSets() {
+}, _EntraAppRemoveCommand_initOptionSets = function _EntraAppRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
 };
-export default new AadAppRemoveCommand();
+export default new EntraAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map