@pnp/cli-microsoft365 10.6.0-beta.36bb898 → 10.6.0-beta.38233e7

package/dist/Auth.js

@@ -2,6 +2,7 @@ import { AzureCloudInstance } from '@azure/msal-common';
 import assert from 'assert';
 import { CommandError } from './Command.js';
 import { FileTokenStorage } from './auth/FileTokenStorage.js';
+import { MsalNetworkClient } from './auth/MsalNetworkClient.js';
 import { msalCachePlugin } from './auth/msalCachePlugin.js';
 import { cli } from './cli/cli.js';
 import request from './request.js';
@@ -274,7 +275,7 @@ export class Auth {
                     piiLoggingEnabled: false,
                     logLevel: debug ? LogLevel.Verbose : LogLevel.Error
                 },
-                proxyUrl: process.env.HTTP_PROXY || process.env.HTTPS_PROXY
+                networkClient: new MsalNetworkClient()
             }
         };
     }

package/dist/Command.js

@@ -15,6 +15,7 @@ import { accessToken } from './utils/accessToken.js';
 import { md } from './utils/md.js';
 import { prompt } from './utils/prompt.js';
 import { zod } from './utils/zod.js';
+import { optionsUtils } from './utils/optionsUtils.js';
 export class CommandError {
     constructor(message, code) {
         this.message = message;
@@ -337,39 +338,16 @@ class Command {
         }
         await telemetry.trackEvent(this.getUsedCommandName(), this.getTelemetryProperties(args));
     }
-    getUnknownOptions(options) {
-        const unknownOptions = JSON.parse(JSON.stringify(options));
-        // remove minimist catch-all option
-        delete unknownOptions._;
-        const knownOptions = this.options;
-        const longOptionRegex = /--([^\s]+)/;
-        const shortOptionRegex = /-([a-z])\b/;
-        knownOptions.forEach(o => {
-            const longOptionName = longOptionRegex.exec(o.option)[1];
-            delete unknownOptions[longOptionName];
-            // short names are optional so we need to check if the current command has
-            // one before continuing
-            const shortOptionMatch = shortOptionRegex.exec(o.option);
-            if (shortOptionMatch) {
-                const shortOptionName = shortOptionMatch[1];
-                delete unknownOptions[shortOptionName];
-            }
-        });
-        return unknownOptions;
-    }
     trackUnknownOptions(telemetryProps, options) {
-        const unknownOptions = this.getUnknownOptions(options);
+        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
         const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
         unknownOptionsNames.forEach(o => {
             telemetryProps[o] = true;
         });
     }
     addUnknownOptionsToPayload(payload, options) {
-        const unknownOptions = this.getUnknownOptions(options);
-        const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
-        unknownOptionsNames.forEach(o => {
-            payload[o] = unknownOptions[o];
-        });
+        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
+        optionsUtils.addUnknownOptionsToPayload(payload, unknownOptions);
     }
     loadValuesFromAccessToken(args) {
         if (!auth.connection.accessTokens[auth.defaultResource]) {

package/dist/auth/MsalNetworkClient.js

@@ -0,0 +1,32 @@
+import request from '../request.js';
+export class MsalNetworkClient {
+    sendGetRequestAsync(url, options) {
+        return this.sendRequestAsync(url, 'GET', options);
+    }
+    sendPostRequestAsync(url, options) {
+        return this.sendRequestAsync(url, 'POST', options);
+    }
+    async sendRequestAsync(url, method, options = {}) {
+        const requestOptions = {
+            url: url,
+            method: method,
+            headers: {
+                'x-anonymous': true,
+                ...options.headers
+            },
+            data: options.body,
+            fullResponse: true
+        };
+        const res = await request.execute(requestOptions);
+        const headersObj = {};
+        for (const [key, value] of Object.entries(res.headers)) {
+            headersObj[key] = typeof value === 'string' ? value : String(value);
+        }
+        return {
+            headers: headersObj,
+            body: JSON.parse(res.data),
+            status: res.status
+        };
+    }
+}
+//# sourceMappingURL=MsalNetworkClient.js.map

package/dist/config.js

@@ -29,9 +29,11 @@ export default {
         'https://graph.microsoft.com/OnlineMeetingArtifact.Read.All',
         'https://graph.microsoft.com/OnlineMeetings.ReadWrite',
         'https://graph.microsoft.com/OnlineMeetingTranscript.Read.All',
+        'https://graph.microsoft.com/Organization.ReadWrite.All',
         'https://graph.microsoft.com/PeopleSettings.ReadWrite.All',
         'https://graph.microsoft.com/Place.Read.All',
         'https://graph.microsoft.com/Policy.Read.All',
+        'https://graph.microsoft.com/Policy.Read.PermissionGrant',
         'https://graph.microsoft.com/RecordsManagement.ReadWrite.All',
         'https://graph.microsoft.com/Reports.Read.All',
         'https://graph.microsoft.com/ReportSettings.ReadWrite.All',

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -7,6 +7,7 @@ var _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry,
 import request from '../../../request.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
+import { optionsUtils } from '../../../utils/optionsUtils.js';
 class AdaptiveCardSendCommand extends AnonymousCommand {
     get name() {
         return commands.SEND;
@@ -26,7 +27,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
         return true;
     }
     async commandAction(logger, args) {
-        const unknownOptions = this.getUnknownOptions(args.options);
+        const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
         const unknownOptionNames = Object.getOwnPropertyNames(unknownOptions);
         const card = await this.getCard(args, unknownOptionNames, unknownOptions);
         const requestOptions = {

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

@@ -1,7 +1,6 @@
-import { cli } from '../../../cli/cli.js';
-import entraAppGetCommand from '../../entra/commands/app/app-get.js';
 import AppCommand from '../../base/AppCommand.js';
 import commands from '../commands.js';
+import { entraApp } from '../../../utils/entraApp.js';
 class AppGetCommand extends AppCommand {
     get name() {
         return commands.GET;
@@ -10,18 +9,9 @@ class AppGetCommand extends AppCommand {
         return 'Retrieves information about the current Microsoft Entra app';
     }
     async commandAction(logger, args) {
-        const options = {
-            appId: this.appId,
-            output: 'json',
-            debug: args.options.debug,
-            verbose: args.options.verbose
-        };
         try {
-            const appGetOutput = await cli.executeCommandWithOutput(entraAppGetCommand, { options: { ...options, _: [] } });
-            if (this.verbose) {
-                await logger.logToStderr(appGetOutput.stderr);
-            }
-            await logger.log(JSON.parse(appGetOutput.stdout));
+            const app = await entraApp.getAppRegistrationByAppId(args.options.appId);
+            await logger.log(app);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -1,8 +1,7 @@
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import appGetCommand from '../../../entra/commands/app/app-get.js';
 import AppCommand from '../../../base/AppCommand.js';
 import commands from '../../commands.js';
+import { entraApp } from '../../../../utils/entraApp.js';
 var GetServicePrincipal;
 (function (GetServicePrincipal) {
     GetServicePrincipal[GetServicePrincipal["withPermissions"] = 0] = "withPermissions";
@@ -178,19 +177,10 @@ class AppPermissionListCommand extends AppCommand {
     }
     async getAppRegistration(appId, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving Microsoft Entra application registration ${appId}`);
+            await logger.logToStderr(`Retrieving the Entra application registration with appId '${appId}'`);
         }
-        const options = {
-            appId: appId,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(appGetCommand, { options: { ...options, _: [] } });
-        if (this.debug) {
-            await logger.logToStderr(output.stderr);
-        }
-        return JSON.parse(output.stdout);
+        const app = await entraApp.getAppRegistrationByAppId(appId);
+        return app;
     }
     async getAppRegPermissions(appId, logger) {
         const application = await this.getAppRegistration(appId, logger);

package/dist/m365/base/SpoCommand.js

@@ -1,6 +1,7 @@
 import { createRequire } from 'module';
 import auth, { AuthType } from '../../Auth.js';
 import Command, { CommandError } from '../../Command.js';
+import { optionsUtils } from '../../utils/optionsUtils.js';
 const require = createRequire(import.meta.url);
 const csomDefs = require('../../../csom.json');
 export default class SpoCommand extends Command {
@@ -70,7 +71,7 @@ export default class SpoCommand extends Command {
         }
     }
     validateUnknownCsomOptions(options, csomObject, csomPropertyType) {
-        const unknownOptions = this.getUnknownOptions(options);
+        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
         const optionNames = Object.getOwnPropertyNames(unknownOptions);
         if (optionNames.length === 0) {
             return true;

package/dist/m365/commands/request.js

@@ -36,11 +36,7 @@ class RequestCommand extends Command {
             const url = this.resolveUrlTokens(args.options.url);
             const method = (args.options.method || 'get').toUpperCase();
             const headers = {};
-            const unknownOptions = this.getUnknownOptions(args.options);
-            const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
-            unknownOptionsNames.forEach(o => {
-                headers[o] = unknownOptions[o];
-            });
+            this.addUnknownOptionsToPayload(headers, args.options);
             if (!headers.accept) {
                 headers.accept = 'application/json';
             }
@@ -105,19 +101,14 @@ class RequestCommand extends Command {
 }
 _RequestCommand_instances = new WeakSet(), _RequestCommand_initTelemetry = function _RequestCommand_initTelemetry() {
     this.telemetry.push((args) => {
-        const properties = {
+        Object.assign(this.telemetryProperties, {
             method: args.options.method || 'get',
             resource: typeof args.options.resource !== 'undefined',
             accept: args.options.accept || 'application/json',
             body: typeof args.options.body !== 'undefined',
             filePath: typeof args.options.filePath !== 'undefined'
-        };
-        const unknownOptions = this.getUnknownOptions(args.options);
-        const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
-        unknownOptionsNames.forEach(o => {
-            properties[o] = typeof unknownOptions[o] !== 'undefined';
         });
-        Object.assign(this.telemetryProperties, properties);
+        this.trackUnknownOptions(this.telemetryProperties, args.options);
     });
 }, _RequestCommand_initOptions = function _RequestCommand_initOptions() {
     this.options.unshift({

package/dist/m365/commands/setup.js

@@ -18,6 +18,7 @@ import { validation } from '../../utils/validation.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
 import { interactivePreset, powerShellPreset, scriptingPreset } from './setupPresets.js';
+import { optionsUtils } from '../../utils/optionsUtils.js';
 export var CliUsageMode;
 (function (CliUsageMode) {
     CliUsageMode["Interactively"] = "interactively";
@@ -227,6 +228,7 @@ class SetupCommand extends AnonymousCommand {
         });
         const appInfo = await entraApp.createAppRegistration({
             options,
+            unknownOptions: optionsUtils.getUnknownOptions(options, this.options),
             apis,
             logger,
             verbose: this.verbose,

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

@@ -14,6 +14,9 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
     get description() {
         return 'Creates an administrative unit';
     }
+    allowUnknownOptions() {
+        return true;
+    }
     constructor() {
         super();
         _EntraAdministrativeUnitAddCommand_instances.add(this);
@@ -21,17 +24,19 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAdministrativeUnitAddCommand_instances, "m", _EntraAdministrativeUnitAddCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
+        const requestBody = {
+            description: args.options.description,
+            displayName: args.options.displayName,
+            visibility: args.options.hiddenMembership ? 'HiddenMembership' : null
+        };
+        this.addUnknownOptionsToPayload(requestBody, args.options);
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/administrativeUnits`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json',
-            data: {
-                description: args.options.description,
-                displayName: args.options.displayName,
-                visibility: args.options.hiddenMembership ? 'HiddenMembership' : null
-            }
+            data: requestBody
         };
         try {
             const administrativeUnit = await request.post(requestOptions);

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

@@ -12,6 +12,7 @@ import { accessToken } from '../../../../utils/accessToken.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
 class EntraAppAddCommand extends GraphCommand {
     get name() {
         return commands.APP_ADD;
@@ -19,6 +20,9 @@ class EntraAppAddCommand extends GraphCommand {
     get description() {
         return 'Creates new Entra app registration';
     }
+    allowUnknownOptions() {
+        return true;
+    }
     constructor() {
         super();
         _EntraAppAddCommand_instances.add(this);
@@ -43,6 +47,7 @@ class EntraAppAddCommand extends GraphCommand {
             });
             let appInfo = await entraApp.createAppRegistration({
                 options: args.options,
+                unknownOptions: optionsUtils.getUnknownOptions(args.options, this.options),
                 apis,
                 logger,
                 verbose: this.verbose,

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

@@ -11,6 +11,7 @@ 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() {
         return commands.APP_GET;
@@ -28,7 +29,7 @@ class EntraAppGetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const appObjectId = await this.getAppObjectId(args);
+            const appObjectId = await this.getAppObjectId(args, logger);
             const appInfo = await this.getAppInfo(appObjectId, args.options.properties);
             const res = await this.saveAppInfo(args, appInfo, logger);
             await logger.log(res);
@@ -37,32 +38,37 @@ class EntraAppGetCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getAppObjectId(args) {
+    async getAppObjectId(args, logger) {
         if (args.options.objectId) {
             return args.options.objectId;
         }
         const { appId, name } = args.options;
-        const filter = appId ?
-            `appId eq '${formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting.encodeQueryParameter(name)}'`;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$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 (this.verbose) {
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : name}...`);
+        }
+        if (appId) {
+            const app = await entraApp.getAppRegistrationByAppId(appId, ["id"]);
+            return app.id;
         }
-        if (res.value.length === 0) {
-            const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
-            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
+        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;
         }
-        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;
     }
     async getAppInfo(appObjectId, properties) {
         const queryParameters = [];

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

@@ -10,6 +10,7 @@ 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() {
         return commands.APP_PERMISSION_LIST;
@@ -28,7 +29,7 @@ class EntraAppPermissionListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const appObjectId = await this.getAppObjectId(args.options);
+            const appObjectId = await this.getAppObjectId(args.options, logger);
             const type = args.options.type ?? 'all';
             const permissions = await this.getAppRegPermissions(appObjectId, type, logger);
             await logger.log(permissions);
@@ -37,32 +38,37 @@ class EntraAppPermissionListCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getAppObjectId(options) {
+    async getAppObjectId(options, logger) {
         if (options.appObjectId) {
             return options.appObjectId;
         }
         const { appId, appName } = options;
-        const filter = appId ?
-            `appId eq '${formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting.encodeQueryParameter(appName)}'`;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$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) {
-            const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
-            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : appName}...`);
+        }
+        if (appId) {
+            const app = await entraApp.getAppRegistrationByAppId(appId, ["id"]);
+            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 resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await cli.handleMultipleResultsFound(`Multiple Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
-        return result.id;
     }
     async getAppRegPermissions(appObjectId, permissionType, logger) {
         const requestOptions = {

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

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraAppRemoveCommand_instances, _EntraAppRemoveCommand_initTelemetry, _EntraAppRemoveCommand_initOptions, _EntraAppRemoveCommand_initValidators, _EntraAppRemoveCommand_initOptionSets;
 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';
@@ -63,27 +64,29 @@ class EntraAppRemoveCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : name}...`);
         }
-        const filter = appId ?
-            `appId eq '${formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting.encodeQueryParameter(name)}'`;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$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 (appId) {
+            const app = await entraApp.getAppRegistrationByAppId(appId, ['id']);
+            return app.id;
         }
-        if (res.value.length === 0) {
-            const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
-            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
+        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 resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registration with name '${name}' found.`, resultAsKeyValuePair);
-        return result.id;
     }
 }
 _EntraAppRemoveCommand_instances = new WeakSet(), _EntraAppRemoveCommand_initTelemetry = function _EntraAppRemoveCommand_initTelemetry() {

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

@@ -10,6 +10,7 @@ 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() {
         return commands.APP_ROLE_ADD;
@@ -87,27 +88,29 @@ class EntraAppRoleAddCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : appName}...`);
         }
-        const filter = appId ?
-            `appId eq '${formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting.encodeQueryParameter(appName)}'`;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$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 (appId) {
+            const app = await entraApp.getAppRegistrationByAppId(appId, ['id']);
+            return app.id;
         }
-        if (res.value.length === 0) {
-            const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
-            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
+        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 resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
-        return result.id;
     }
 }
 _a = EntraAppRoleAddCommand, _EntraAppRoleAddCommand_instances = new WeakSet(), _EntraAppRoleAddCommand_initTelemetry = function _EntraAppRoleAddCommand_initTelemetry() {