@pnp/cli-microsoft365 7.5.0-beta.d4d820f → 7.6.0-beta.443bfd8

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/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();
@@ -41,7 +41,7 @@ class EntraAppAddCommand extends GraphCommand {
             // directory. If we in the future extend the command with allowing
             // users to create AAD app in a different directory, we'll need to
             // adjust this
-            appInfo.tenantId = accessToken.getTenantIdFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken);
+            appInfo.tenantId = accessToken.getTenantIdFromAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken);
             appInfo = await this.updateAppFromManifest(args, appInfo);
             appInfo = await this.grantAdminConsent(appInfo, args.options.grantAdminConsent, logger);
             appInfo = await this.configureUri(args, appInfo, logger);

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();

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

@@ -0,0 +1,182 @@
+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 _EntraAppPermissionListCommand_instances, _EntraAppPermissionListCommand_initTelemetry, _EntraAppPermissionListCommand_initOptions, _EntraAppPermissionListCommand_initValidators, _EntraAppPermissionListCommand_initOptionSets;
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+import request from "../../../../request.js";
+import { validation } from "../../../../utils/validation.js";
+import { formatting } from "../../../../utils/formatting.js";
+class EntraAppPermissionListCommand extends GraphCommand {
+    get name() {
+        return commands.APP_PERMISSION_LIST;
+    }
+    get description() {
+        return 'Lists the application and delegated permissions for a specified Entra Application Registration';
+    }
+    constructor() {
+        super();
+        _EntraAppPermissionListCommand_instances.add(this);
+        this.allowedTypes = ['delegated', 'application', 'all'];
+        __classPrivateFieldGet(this, _EntraAppPermissionListCommand_instances, "m", _EntraAppPermissionListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAppPermissionListCommand_instances, "m", _EntraAppPermissionListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAppPermissionListCommand_instances, "m", _EntraAppPermissionListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAppPermissionListCommand_instances, "m", _EntraAppPermissionListCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const appObjectId = await this.getAppObjectId(args.options);
+            const type = args.options.type ?? 'all';
+            const permissions = await this.getAppRegPermissions(appObjectId, type, logger);
+            await logger.log(permissions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getAppObjectId(options) {
+        if (options.appObjectId) {
+            return options.appObjectId;
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${formatting.encodeQueryParameter(options.appId)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        if (res.value.length === 0) {
+            throw `No Azure AD application registration with ID ${options.appId} found`;
+        }
+        return res.value[0].id;
+    }
+    async getAppRegPermissions(appObjectId, permissionType, logger) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const application = await request.get(requestOptions);
+        const requiredResourceAccess = application.requiredResourceAccess;
+        if (requiredResourceAccess.length === 0) {
+            return [];
+        }
+        const servicePrincipalsToResolve = requiredResourceAccess.map(resourceAccess => {
+            return {
+                appId: resourceAccess.resourceAppId
+            };
+        });
+        const servicePrincipals = await Promise
+            .all(servicePrincipalsToResolve.map(servicePrincipalInfo => this.getServicePrincipal(servicePrincipalInfo, permissionType, logger)));
+        const apiPermissions = [];
+        requiredResourceAccess.forEach(requiredResourceAccess => {
+            const servicePrincipal = servicePrincipals
+                .find(servicePrincipal => servicePrincipal?.appId === requiredResourceAccess.resourceAppId);
+            const resourceName = servicePrincipal?.displayName ?? requiredResourceAccess.resourceAppId;
+            requiredResourceAccess.resourceAccess.forEach(permission => {
+                if (permissionType === 'application' && permission.type === 'Scope') {
+                    return;
+                }
+                if (permissionType === 'delegated' && permission.type === 'Role') {
+                    return;
+                }
+                apiPermissions.push({
+                    resource: resourceName,
+                    resourceId: requiredResourceAccess.resourceAppId,
+                    permission: this.getPermissionName(permission.id, permission.type, servicePrincipal),
+                    type: permission.type === 'Role' ? 'Application' : 'Delegated'
+                });
+            });
+        });
+        return apiPermissions;
+    }
+    getPermissionName(permissionId, permissionType, servicePrincipal) {
+        if (!servicePrincipal) {
+            return permissionId;
+        }
+        if (permissionType === 'Role') {
+            return servicePrincipal.appRoles
+                .find(appRole => appRole.id === permissionId)?.value ?? permissionId;
+        }
+        // permissionType === 'Scope'
+        return servicePrincipal.oauth2PermissionScopes
+            .find(permissionScope => permissionScope.id === permissionId)?.value ?? permissionId;
+    }
+    async getServicePrincipal(servicePrincipalInfo, permissionType, logger) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving service principal ${servicePrincipalInfo.appId}`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/servicePrincipals?$filter=appId eq '${servicePrincipalInfo.appId}'&$select=appId,id,displayName`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (servicePrincipalInfo.appId && response.value.length === 0) {
+            return null;
+        }
+        const servicePrincipal = response.value[0];
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving permissions for service principal ${servicePrincipal.id}...`);
+        }
+        const oauth2PermissionScopesRequestOptions = {
+            url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/oauth2PermissionScopes`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const appRolesRequestOptions = {
+            url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/appRoles`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        let permissions;
+        if (permissionType === 'all' || permissionType === 'delegated') {
+            permissions = await request.get(oauth2PermissionScopesRequestOptions);
+            servicePrincipal.oauth2PermissionScopes = permissions.value;
+        }
+        if (permissionType === 'all' || permissionType === 'application') {
+            permissions = await request.get(appRolesRequestOptions);
+            servicePrincipal.appRoles = permissions.value;
+        }
+        return servicePrincipal;
+    }
+}
+_EntraAppPermissionListCommand_instances = new WeakSet(), _EntraAppPermissionListCommand_initTelemetry = function _EntraAppPermissionListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            type: typeof args.options.type !== 'undefined'
+        });
+    });
+}, _EntraAppPermissionListCommand_initOptions = function _EntraAppPermissionListCommand_initOptions() {
+    this.options.unshift({ option: '-i, --appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--type [type]', autocomplete: this.allowedTypes });
+}, _EntraAppPermissionListCommand_initValidators = function _EntraAppPermissionListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid GUID`;
+        }
+        if (args.options.type && this.allowedTypes.indexOf(args.options.type.toLowerCase()) === -1) {
+            return `${args.options.type} is not a valid type. Allowed types are ${this.allowedTypes.join(', ')}`;
+        }
+        return true;
+    });
+}, _EntraAppPermissionListCommand_initOptionSets = function _EntraAppPermissionListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['appId', 'appObjectId'] });
+};
+export default new EntraAppPermissionListCommand();
+//# sourceMappingURL=app-permission-list.js.map

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

@@ -19,7 +19,7 @@ class EntraAppRemoveCommand extends GraphCommand {
         return 'Removes an Entra app registration';
     }
     alias() {
-        return [aadCommands.APP_REMOVE];
+        return [aadCommands.APP_REMOVE, commands.APPREGISTRATION_REMOVE];
     }
     constructor() {
         super();

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

@@ -19,7 +19,7 @@ class EntraAppRoleAddCommand extends GraphCommand {
         return 'Adds role to the specified Entra app registration';
     }
     alias() {
-        return [aadCommands.APP_ROLE_ADD];
+        return [aadCommands.APP_ROLE_ADD, commands.APPREGISTRATION_ROLE_ADD];
     }
     constructor() {
         super();

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

@@ -19,7 +19,7 @@ class EntraAppRoleListCommand extends GraphCommand {
         return 'Gets Entra app registration roles';
     }
     alias() {
-        return [aadCommands.APP_ROLE_LIST];
+        return [aadCommands.APP_ROLE_LIST, commands.APPREGISTRATION_ROLE_LIST];
     }
     constructor() {
         super();

package/dist/m365/entra/commands/app/app-role-remove.js

@@ -19,7 +19,7 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         return 'Removes role from the specified Entra app registration';
     }
     alias() {
-        return [aadCommands.APP_ROLE_REMOVE];
+        return [aadCommands.APP_ROLE_REMOVE, commands.APPREGISTRATION_ROLE_REMOVE];
     }
     constructor() {
         super();

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

@@ -19,7 +19,7 @@ class EntraAppSetCommand extends GraphCommand {
         return 'Updates Entra app registration';
     }
     alias() {
-        return [aadCommands.APP_SET];
+        return [aadCommands.APP_SET, commands.APPREGISTRATION_SET];
     }
     constructor() {
         super();

package/dist/m365/entra/commands/{sp/sp-add.js → enterpriseapp/enterpriseapp-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 _EntraSpAddCommand_instances, _EntraSpAddCommand_initTelemetry, _EntraSpAddCommand_initOptions, _EntraSpAddCommand_initValidators, _EntraSpAddCommand_initOptionSets;
+var _EntraEnterpriseAppAddCommand_instances, _EntraEnterpriseAppAddCommand_initTelemetry, _EntraEnterpriseAppAddCommand_initOptions, _EntraEnterpriseAppAddCommand_initValidators, _EntraEnterpriseAppAddCommand_initOptionSets;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -11,23 +11,23 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
 import aadCommands from '../../aadCommands.js';
-class EntraSpAddCommand extends GraphCommand {
+class EntraEnterpriseAppAddCommand extends GraphCommand {
     get name() {
-        return commands.SP_ADD;
+        return commands.ENTERPRISEAPP_ADD;
     }
     get description() {
-        return 'Adds a service principal to a registered Entra app';
+        return 'Creates an enterprise application (or service principal) for a registered Entra app';
     }
     alias() {
-        return [aadCommands.SP_ADD];
+        return [aadCommands.SP_ADD, commands.SP_ADD];
     }
     constructor() {
         super();
-        _EntraSpAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraSpAddCommand_instances, "m", _EntraSpAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraSpAddCommand_instances, "m", _EntraSpAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraSpAddCommand_instances, "m", _EntraSpAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraSpAddCommand_instances, "m", _EntraSpAddCommand_initOptionSets).call(this);
+        _EntraEnterpriseAppAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initOptionSets).call(this);
     }
     async getAppId(args) {
         if (args.options.appId) {
@@ -50,11 +50,11 @@ class EntraSpAddCommand extends GraphCommand {
         const response = await request.get(appIdRequestOptions);
         const spItem = response.value[0];
         if (!spItem) {
-            throw `The specified Azure AD app doesn't exist`;
+            throw `The specified Entra app doesn't exist`;
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.appName}' found.`, resultAsKeyValuePair);
             return result.appId;
         }
         return spItem.appId;
@@ -81,7 +81,7 @@ class EntraSpAddCommand extends GraphCommand {
         }
     }
 }
-_EntraSpAddCommand_instances = new WeakSet(), _EntraSpAddCommand_initTelemetry = function _EntraSpAddCommand_initTelemetry() {
+_EntraEnterpriseAppAddCommand_instances = new WeakSet(), _EntraEnterpriseAppAddCommand_initTelemetry = function _EntraEnterpriseAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: (!(!args.options.appId)).toString(),
@@ -89,7 +89,7 @@ _EntraSpAddCommand_instances = new WeakSet(), _EntraSpAddCommand_initTelemetry =
             objectId: (!(!args.options.objectId)).toString()
         });
     });
-}, _EntraSpAddCommand_initOptions = function _EntraSpAddCommand_initOptions() {
+}, _EntraEnterpriseAppAddCommand_initOptions = function _EntraEnterpriseAppAddCommand_initOptions() {
     this.options.unshift({
         option: '--appId [appId]'
     }, {
@@ -97,7 +97,7 @@ _EntraSpAddCommand_instances = new WeakSet(), _EntraSpAddCommand_initTelemetry =
     }, {
         option: '--objectId [objectId]'
     });
-}, _EntraSpAddCommand_initValidators = function _EntraSpAddCommand_initValidators() {
+}, _EntraEnterpriseAppAddCommand_initValidators = function _EntraEnterpriseAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
@@ -107,8 +107,8 @@ _EntraSpAddCommand_instances = new WeakSet(), _EntraSpAddCommand_initTelemetry =
         }
         return true;
     });
-}, _EntraSpAddCommand_initOptionSets = function _EntraSpAddCommand_initOptionSets() {
+}, _EntraEnterpriseAppAddCommand_initOptionSets = function _EntraEnterpriseAppAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['appId', 'appName', 'objectId'] });
 };
-export default new EntraSpAddCommand();
-//# sourceMappingURL=sp-add.js.map
+export default new EntraEnterpriseAppAddCommand();
+//# sourceMappingURL=enterpriseapp-add.js.map

package/dist/m365/entra/commands/{sp/sp-get.js → enterpriseapp/enterpriseapp-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 _EntraSpGetCommand_instances, _EntraSpGetCommand_initTelemetry, _EntraSpGetCommand_initOptions, _EntraSpGetCommand_initValidators, _EntraSpGetCommand_initOptionSets;
+var _EntraEnterpriseAppGetCommand_instances, _EntraEnterpriseAppGetCommand_initTelemetry, _EntraEnterpriseAppGetCommand_initOptions, _EntraEnterpriseAppGetCommand_initValidators, _EntraEnterpriseAppGetCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,23 +11,23 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
-class EntraSpGetCommand extends GraphCommand {
+class EntraEnterpriseAppGetCommand extends GraphCommand {
     get name() {
-        return commands.SP_GET;
+        return commands.ENTERPRISEAPP_GET;
     }
     get description() {
-        return 'Gets information about the specific service principal';
+        return 'Gets information about an Enterprise Application';
     }
     alias() {
-        return [aadCommands.SP_GET];
+        return [aadCommands.SP_GET, commands.SP_GET];
     }
     constructor() {
         super();
-        _EntraSpGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraSpGetCommand_instances, "m", _EntraSpGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraSpGetCommand_instances, "m", _EntraSpGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraSpGetCommand_instances, "m", _EntraSpGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraSpGetCommand_instances, "m", _EntraSpGetCommand_initOptionSets).call(this);
+        _EntraEnterpriseAppGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initOptionSets).call(this);
     }
     async getSpId(args) {
         if (args.options.appObjectId) {
@@ -50,18 +50,18 @@ class EntraSpGetCommand extends GraphCommand {
         const response = await request.get(idRequestOptions);
         const spItem = response.value[0];
         if (!spItem) {
-            throw `The specified Azure AD app does not exist`;
+            throw `The specified Entra app does not exist`;
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return spItem.id;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving service principal information...`);
+            await logger.logToStderr(`Retrieving enterprise application information...`);
         }
         try {
             const id = await this.getSpId(args);
@@ -81,7 +81,7 @@ class EntraSpGetCommand extends GraphCommand {
         }
     }
 }
-_EntraSpGetCommand_instances = new WeakSet(), _EntraSpGetCommand_initTelemetry = function _EntraSpGetCommand_initTelemetry() {
+_EntraEnterpriseAppGetCommand_instances = new WeakSet(), _EntraEnterpriseAppGetCommand_initTelemetry = function _EntraEnterpriseAppGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: (!(!args.options.appId)).toString(),
@@ -89,7 +89,7 @@ _EntraSpGetCommand_instances = new WeakSet(), _EntraSpGetCommand_initTelemetry =
             appObjectId: (!(!args.options.appObjectId)).toString()
         });
     });
-}, _EntraSpGetCommand_initOptions = function _EntraSpGetCommand_initOptions() {
+}, _EntraEnterpriseAppGetCommand_initOptions = function _EntraEnterpriseAppGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
@@ -97,7 +97,7 @@ _EntraSpGetCommand_instances = new WeakSet(), _EntraSpGetCommand_initTelemetry =
     }, {
         option: '--appObjectId [appObjectId]'
     });
-}, _EntraSpGetCommand_initValidators = function _EntraSpGetCommand_initValidators() {
+}, _EntraEnterpriseAppGetCommand_initValidators = function _EntraEnterpriseAppGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
@@ -107,8 +107,8 @@ _EntraSpGetCommand_instances = new WeakSet(), _EntraSpGetCommand_initTelemetry =
         }
         return true;
     });
-}, _EntraSpGetCommand_initOptionSets = function _EntraSpGetCommand_initOptionSets() {
+}, _EntraEnterpriseAppGetCommand_initOptionSets = function _EntraEnterpriseAppGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['appId', 'appDisplayName', 'appObjectId'] });
 };
-export default new EntraSpGetCommand();
-//# sourceMappingURL=sp-get.js.map
+export default new EntraEnterpriseAppGetCommand();
+//# sourceMappingURL=enterpriseapp-get.js.map