@pnp/cli-microsoft365 10.11.0-beta.5e075e5 → 10.11.0-beta.b1eeb91

package/dist/m365/base/GraphApplicationCommand.js

@@ -0,0 +1,17 @@
+import auth from '../../Auth.js';
+import { accessToken } from '../../utils/accessToken.js';
+import GraphCommand from './GraphCommand.js';
+/**
+ * This command class is for application-only Graph commands.
+ */
+export default class GraphApplicationCommand extends GraphCommand {
+    async initAction(args, logger) {
+        await super.initAction(args, logger);
+        if (!auth.connection.active) {
+            // we fail no login in the base command command class
+            return;
+        }
+        accessToken.assertAccessTokenType('application');
+    }
+}
+//# sourceMappingURL=GraphApplicationCommand.js.map

package/dist/m365/base/{DelegatedGraphCommand.js → GraphDelegatedCommand.js}

@@ -2,16 +2,16 @@ import auth from '../../Auth.js';
 import { accessToken } from '../../utils/accessToken.js';
 import GraphCommand from './GraphCommand.js';
 /**
- * This command class is for delegated-only Graph commands.
+ * This command class is for delegated Graph commands.
  */
-export default class DelegatedGraphCommand extends GraphCommand {
+export default class GraphDelegatedCommand extends GraphCommand {
     async initAction(args, logger) {
         await super.initAction(args, logger);
         if (!auth.connection.active) {
             // we fail no login in the base command command class
             return;
         }
-        accessToken.assertDelegatedAccessToken();
+        accessToken.assertAccessTokenType('delegated');
     }
 }
-//# sourceMappingURL=DelegatedGraphCommand.js.map
+//# sourceMappingURL=GraphDelegatedCommand.js.map

package/dist/m365/base/PowerAppsCommand.js

@@ -14,7 +14,7 @@ export default class PowerAppsCommand extends Command {
         if (auth.connection.cloudType !== CloudType.Public) {
             throw new CommandError(`Power Apps commands only support the public cloud at the moment. We'll add support for other clouds in the future. Sorry for the inconvenience.`);
         }
-        accessToken.assertDelegatedAccessToken();
+        accessToken.assertAccessTokenType('delegated');
     }
 }
 //# sourceMappingURL=PowerAppsCommand.js.map

package/dist/m365/base/PowerAutomateCommand.js

@@ -14,7 +14,7 @@ export default class PowerAutomateCommand extends Command {
         if (auth.connection.cloudType !== CloudType.Public) {
             throw new CommandError(`Power Automate commands only support the public cloud at the moment. We'll add support for other clouds in the future. Sorry for the inconvenience.`);
         }
-        accessToken.assertDelegatedAccessToken();
+        accessToken.assertAccessTokenType('delegated');
     }
 }
 //# sourceMappingURL=PowerAutomateCommand.js.map

package/dist/m365/base/PowerBICommand.js

@@ -11,7 +11,7 @@ export default class PowerBICommand extends Command {
             // we fail no login in the base command command class
             return;
         }
-        accessToken.assertDelegatedAccessToken();
+        accessToken.assertAccessTokenType('delegated');
     }
 }
 //# sourceMappingURL=PowerBICommand.js.map

package/dist/m365/base/PowerPlatformCommand.js

@@ -14,7 +14,7 @@ export default class PowerPlatformCommand extends Command {
         if (auth.connection.cloudType !== CloudType.Public) {
             throw new CommandError(`Power Platform commands only support the public cloud at the moment. We'll add support for other clouds in the future. Sorry for the inconvenience.`);
         }
-        accessToken.assertDelegatedAccessToken();
+        accessToken.assertAccessTokenType('delegated');
     }
 }
 //# sourceMappingURL=PowerPlatformCommand.js.map

package/dist/m365/base/VivaEngageCommand.js

@@ -11,7 +11,7 @@ export default class VivaEngageCommand extends Command {
             // we fail no login in the base command command class
             return;
         }
-        accessToken.assertDelegatedAccessToken();
+        accessToken.assertAccessTokenType('delegated');
     }
     handleRejectedODataJsonPromise(response) {
         if (response.statusCode === 404) {

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

@@ -5,12 +5,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 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';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 class EntraAppGetCommand extends GraphCommand {
     get name() {
@@ -29,8 +26,7 @@ class EntraAppGetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const appObjectId = await this.getAppObjectId(args, logger);
-            const appInfo = await this.getAppInfo(appObjectId, args.options.properties);
+            const appInfo = await this.getAppInfo(args, logger);
             const res = await this.saveAppInfo(args, appInfo, logger);
             await logger.log(res);
         }
@@ -38,58 +34,21 @@ class EntraAppGetCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getAppObjectId(args, logger) {
-        if (args.options.objectId) {
-            return args.options.objectId;
-        }
-        const { appId, name } = args.options;
+    async getAppInfo(args, logger) {
+        const { objectId, appId, name } = args.options;
+        const properties = args.options.properties?.split(',');
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : name}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${objectId ? objectId : (appId ? appId : name)}...`);
         }
-        if (appId) {
-            const app = await entraApp.getAppRegistrationByAppId(appId, ["id"]);
-            return app.id;
+        if (objectId) {
+            return await entraApp.getAppRegistrationByObjectId(objectId, properties);
         }
-        else {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting.encodeQueryParameter(name)}'&$select=id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value.length === 1) {
-                return res.value[0].id;
-            }
-            if (res.value.length === 0) {
-                throw `No Microsoft Entra application registration with name ${name} found`;
-            }
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${name}' found.`, resultAsKeyValuePair);
-            return result.id;
+        else if (appId) {
+            return await entraApp.getAppRegistrationByAppId(appId, properties);
         }
-    }
-    async getAppInfo(appObjectId, properties) {
-        const queryParameters = [];
-        if (properties) {
-            const allProperties = properties.split(',');
-            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
-            if (selectProperties.length > 0) {
-                queryParameters.push(`$select=${selectProperties}`);
-            }
+        else {
+            return await entraApp.getAppRegistrationByAppName(name, properties);
         }
-        const queryString = queryParameters.length > 0
-            ? `?${queryParameters.join('&')}`
-            : '';
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}${queryString}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request.get(requestOptions);
     }
     async saveAppInfo(args, appInfo, logger) {
         if (!args.options.save) {

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

@@ -9,8 +9,7 @@ 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";
-import { cli } from "../../../../cli/cli.js";
+import { entraApp } from "../../../../utils/entraApp.js";
 import { entraServicePrincipal } from "../../../../utils/entraServicePrincipal.js";
 var ScopeType;
 (function (ScopeType) {
@@ -34,35 +33,35 @@ class EntraAppPermissionAddCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const appObject = await this.getAppObject(args.options);
+            const entraApp = await this.getEntraApp(args.options, logger);
             const servicePrincipals = await this.getServicePrincipals();
             const appPermissions = [];
             if (args.options.delegatedPermissions) {
                 const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermissions, ScopeType.Scope, appPermissions, logger);
-                this.addPermissionsToResourceArray(delegatedPermissions, appObject.requiredResourceAccess);
+                this.addPermissionsToResourceArray(delegatedPermissions, entraApp.requiredResourceAccess);
             }
             if (args.options.applicationPermissions) {
                 const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermissions, ScopeType.Role, appPermissions, logger);
-                this.addPermissionsToResourceArray(applicationPermissions, appObject.requiredResourceAccess);
+                this.addPermissionsToResourceArray(applicationPermissions, entraApp.requiredResourceAccess);
             }
             const addPermissionsRequestOptions = {
-                url: `${this.resource}/v1.0/applications/${appObject.id}`,
+                url: `${this.resource}/v1.0/applications/${entraApp.id}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
                 responseType: 'json',
                 data: {
-                    requiredResourceAccess: appObject.requiredResourceAccess
+                    requiredResourceAccess: entraApp.requiredResourceAccess
                 }
             };
             await request.patch(addPermissionsRequestOptions);
             if (args.options.grantAdminConsent) {
-                let appServicePrincipal = servicePrincipals.find(sp => sp.appId === appObject.appId);
+                let appServicePrincipal = servicePrincipals.find(sp => sp.appId === entraApp.appId);
                 if (!appServicePrincipal) {
                     if (this.verbose) {
-                        await logger.logToStderr(`Creating service principal for app ${appObject.appId}...`);
+                        await logger.logToStderr(`Creating service principal for app ${entraApp.appId}...`);
                     }
-                    appServicePrincipal = await entraServicePrincipal.createServicePrincipal(appObject.appId);
+                    appServicePrincipal = await entraServicePrincipal.createServicePrincipal(entraApp.appId);
                 }
                 await this.grantAdminConsent(appServicePrincipal, appPermissions, logger);
             }
@@ -71,30 +70,20 @@ class EntraAppPermissionAddCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getAppObject(options) {
-        let appNotFoundMessage = '';
-        let apps = [];
-        if (options.appId) {
-            apps = await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=appId eq '${options.appId}'&$select=id,appId,requiredResourceAccess`);
-            appNotFoundMessage = `client id ${options.appId}`;
+    async getEntraApp(options, logger) {
+        const { appObjectId, appId, appName } = options;
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appObjectId ? appObjectId : (appId ? appId : appName)}...`);
         }
-        else if (options.appName) {
-            apps = await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=displayName eq '${formatting.encodeQueryParameter(options.appName)}'&$select=id,appId,requiredResourceAccess`);
-            appNotFoundMessage = `name ${options.appName}`;
-            if (apps.length > 1) {
-                const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', apps);
-                const result = await cli.handleMultipleResultsFound(`Multiple Entra application registrations with name '${options.appName}' found.`, resultAsKeyValuePair);
-                return result;
-            }
+        if (appObjectId) {
+            return await entraApp.getAppRegistrationByObjectId(appObjectId, ['id', 'appId', 'requiredResourceAccess']);
         }
-        else if (options.appObjectId) {
-            apps = await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=id eq '${options.appObjectId}'&$select=id,appId,requiredResourceAccess`);
-            appNotFoundMessage = `object id ${options.appObjectId}`;
+        else if (appId) {
+            return await entraApp.getAppRegistrationByAppId(appId, ['id', 'appId', 'requiredResourceAccess']);
         }
-        if (apps.length === 0) {
-            throw `App with ${appNotFoundMessage} not found in Microsoft Entra ID`;
+        else {
+            return await entraApp.getAppRegistrationByAppName(appName, ['id', 'appId', 'requiredResourceAccess']);
         }
-        return apps[0];
     }
     async getServicePrincipals() {
         return await odata.getAllItems(`${this.resource}/v1.0/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);

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

@@ -8,8 +8,6 @@ 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";
-import { cli } from "../../../../cli/cli.js";
 import { entraApp } from "../../../../utils/entraApp.js";
 class EntraAppPermissionListCommand extends GraphCommand {
     get name() {
@@ -51,23 +49,8 @@ class EntraAppPermissionListCommand extends GraphCommand {
             return app.id;
         }
         else {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting.encodeQueryParameter(appName)}'&$select=id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value.length === 1) {
-                return res.value[0].id;
-            }
-            if (res.value.length === 0) {
-                throw `No Microsoft Entra application registration with name ${appName} found`;
-            }
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
-            return result.id;
+            const app = await entraApp.getAppRegistrationByAppName(appName, ["id"]);
+            return app.id;
         }
     }
     async getAppRegPermissions(appObjectId, permissionType, logger) {

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

@@ -10,7 +10,7 @@ import commands from "../../commands.js";
 import request from "../../../../request.js";
 import { validation } from "../../../../utils/validation.js";
 import { cli } from "../../../../cli/cli.js";
-import { formatting } from "../../../../utils/formatting.js";
+import { entraApp } from "../../../../utils/entraApp.js";
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -38,41 +38,41 @@ class EntraAppPermissionRemoveCommand extends GraphCommand {
                 if (this.verbose) {
                     await logger.logToStderr(`Removing permissions from application ${args.options.appId || args.options.appObjectId || args.options.appName}...`);
                 }
-                const appObject = await this.getAppObject(args.options);
+                const entraApp = await this.getEntraApp(args.options, logger);
                 const servicePrincipals = await odata.getAllItems(`${this.resource}/v1.0/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
                 const appPermissions = [];
                 if (args.options.delegatedPermissions) {
                     const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermissions, ScopeType.Scope, appPermissions, logger);
-                    this.removePermissionsFromResourceArray(delegatedPermissions, appObject.requiredResourceAccess);
+                    this.removePermissionsFromResourceArray(delegatedPermissions, entraApp.requiredResourceAccess);
                 }
                 if (args.options.applicationPermissions) {
                     const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermissions, ScopeType.Role, appPermissions, logger);
-                    this.removePermissionsFromResourceArray(applicationPermissions, appObject.requiredResourceAccess);
+                    this.removePermissionsFromResourceArray(applicationPermissions, entraApp.requiredResourceAccess);
                 }
-                for (let i = 0; i < appObject.requiredResourceAccess.length; i++) {
-                    if (appObject.requiredResourceAccess[i].resourceAccess?.length === 0) {
-                        appObject.requiredResourceAccess.splice(i, 1);
+                for (let i = 0; i < entraApp.requiredResourceAccess.length; i++) {
+                    if (entraApp.requiredResourceAccess[i].resourceAccess?.length === 0) {
+                        entraApp.requiredResourceAccess.splice(i, 1);
                     }
                 }
                 const removePermissionRequestOptions = {
-                    url: `${this.resource}/v1.0/applications/${appObject.id}`,
+                    url: `${this.resource}/v1.0/applications/${entraApp.id}`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
                     responseType: 'json',
                     data: {
-                        requiredResourceAccess: appObject.requiredResourceAccess
+                        requiredResourceAccess: entraApp.requiredResourceAccess
                     }
                 };
                 await request.patch(removePermissionRequestOptions);
                 if (args.options.revokeAdminConsent) {
-                    const appServicePrincipal = servicePrincipals.find(sp => sp.appId === appObject.appId);
+                    const appServicePrincipal = servicePrincipals.find(sp => sp.appId === entraApp.appId);
                     if (appServicePrincipal) {
                         await this.revokeAdminConsent(appServicePrincipal, appPermissions, logger);
                     }
                     else {
                         if (this.debug) {
-                            await logger.logToStderr(`No service principal found for the appId: ${appObject.appId}. Skipping revoking admin consent.`);
+                            await logger.logToStderr(`No service principal found for the appId: ${entraApp.appId}. Skipping revoking admin consent.`);
                         }
                     }
                 }
@@ -91,29 +91,20 @@ class EntraAppPermissionRemoveCommand extends GraphCommand {
             }
         }
     }
-    async getAppObject(options) {
-        const selectProperties = '$select=id,appId,requiredResourceAccess';
-        if (options.appObjectId) {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/applications/${options.appObjectId}?${selectProperties}`,
-                headers: {
-                    'content-type': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request.get(requestOptions);
+    async getEntraApp(options, logger) {
+        const { appObjectId, appId, appName } = options;
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appObjectId ? appObjectId : (appId ? appId : appName)}...`);
+        }
+        if (appObjectId) {
+            return await entraApp.getAppRegistrationByObjectId(appObjectId, ['id', 'appId', 'requiredResourceAccess']);
         }
-        const apps = options.appId
-            ? await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=appId eq '${options.appId}'&${selectProperties}`)
-            : await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=displayName eq '${options.appName}'&${selectProperties}`);
-        if (apps.length === 0) {
-            throw `App with ${options.appId ? 'id' : 'name'} ${options.appId || options.appName} not found in Microsoft Entra ID`;
+        else if (appId) {
+            return await entraApp.getAppRegistrationByAppId(appId, ['id', 'appId', 'requiredResourceAccess']);
         }
-        if (apps.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', apps);
-            return cli.handleMultipleResultsFound(`Multiple apps with name '${options.appName}' found.`, resultAsKeyValuePair);
+        else {
+            return await entraApp.getAppRegistrationByAppName(appName, ['id', 'appId', 'requiredResourceAccess']);
         }
-        return apps[0];
     }
     async revokeAdminConsent(servicePrincipal, appPermissions, logger) {
         // Check if contains app permissions

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

@@ -7,7 +7,6 @@ var _EntraAppRemoveCommand_instances, _EntraAppRemoveCommand_initTelemetry, _Ent
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { entraApp } from '../../../../utils/entraApp.js';
-import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -69,23 +68,8 @@ class EntraAppRemoveCommand extends GraphCommand {
             return app.id;
         }
         else {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting.encodeQueryParameter(name)}'&$select=id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value.length === 1) {
-                return res.value[0].id;
-            }
-            if (res.value.length === 0) {
-                throw `No Microsoft Entra application registration with name ${name} found`;
-            }
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registration with name '${name}' found.`, resultAsKeyValuePair);
-            return result.id;
+            const app = await entraApp.getAppRegistrationByAppName(name, ['id']);
+            return app.id;
         }
     }
 }

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

@@ -6,10 +6,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraAppRoleAddCommand_instances, _a, _EntraAppRoleAddCommand_initTelemetry, _EntraAppRoleAddCommand_initOptions, _EntraAppRoleAddCommand_initValidators, _EntraAppRoleAddCommand_initOptionSets;
 import { v4 } from 'uuid';
 import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 class EntraAppRoleAddCommand extends GraphCommand {
     get name() {
@@ -28,8 +26,7 @@ class EntraAppRoleAddCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const appId = await this.getAppObjectId(args, logger);
-            const appInfo = await this.getAppInfo(appId, logger);
+            const appInfo = await this.getAppInfo(args, logger);
             if (this.verbose) {
                 await logger.logToStderr(`Adding role ${args.options.name} to Microsoft Entra app ${appInfo.id}...`);
             }
@@ -55,19 +52,6 @@ class EntraAppRoleAddCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getAppInfo(appId, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about roles for Microsoft Entra app ${appId}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appId}?$select=id,appRoles`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request.get(requestOptions);
-    }
     getAllowedMemberTypes(args) {
         switch (args.options.allowedMembers) {
             case 'usersGroups':
@@ -80,36 +64,19 @@ class EntraAppRoleAddCommand extends GraphCommand {
                 return [];
         }
     }
-    async getAppObjectId(args, logger) {
-        if (args.options.appObjectId) {
-            return args.options.appObjectId;
-        }
-        const { appId, appName } = args.options;
+    async getAppInfo(args, logger) {
+        const { appObjectId, appId, appName } = args.options;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : appName}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appObjectId ? appObjectId : (appId ? appId : appName)}...`);
+        }
+        if (appObjectId) {
+            return await entraApp.getAppRegistrationByObjectId(appObjectId, ['id', 'appRoles']);
         }
-        if (appId) {
-            const app = await entraApp.getAppRegistrationByAppId(appId, ['id']);
-            return app.id;
+        else if (appId) {
+            return await entraApp.getAppRegistrationByAppId(appId, ['id', 'appRoles']);
         }
         else {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting.encodeQueryParameter(appName)}'&$select=id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value.length === 1) {
-                return res.value[0].id;
-            }
-            if (res.value.length === 0) {
-                throw `No Microsoft Entra application registration with name ${appName} found`;
-            }
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
-            return result.id;
+            return await entraApp.getAppRegistrationByAppName(appName, ['id', 'appRoles']);
         }
     }
 }

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

@@ -4,12 +4,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraAppRoleListCommand_instances, _EntraAppRoleListCommand_initTelemetry, _EntraAppRoleListCommand_initOptions, _EntraAppRoleListCommand_initOptionSets;
-import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 class EntraAppRoleListCommand extends GraphCommand {
     get name() {
@@ -51,23 +48,8 @@ class EntraAppRoleListCommand extends GraphCommand {
             return app.id;
         }
         else {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting.encodeQueryParameter(appName)}'&$select=id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value.length === 1) {
-                return res.value[0].id;
-            }
-            if (res.value.length === 0) {
-                throw `No Microsoft Entra application registration with name ${appName} found`;
-            }
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
-            return result.id;
+            const app = await entraApp.getAppRegistrationByAppName(appName, ["id"]);
+            return app.id;
         }
     }
 }