@pnp/cli-microsoft365 10.6.0-beta.3facb8f → 10.6.0-beta.7205e34

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/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() {

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

@@ -10,6 +10,7 @@ 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() {
         return commands.APP_ROLE_LIST;
@@ -45,27 +46,29 @@ class EntraAppRoleListCommand 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;
     }
 }
 _EntraAppRoleListCommand_instances = new WeakSet(), _EntraAppRoleListCommand_initTelemetry = function _EntraAppRoleListCommand_initTelemetry() {

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

@@ -10,6 +10,7 @@ import { formatting } from "../../../../utils/formatting.js";
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { entraApp } from "../../../../utils/entraApp.js";
 class EntraAppRoleRemoveCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_REMOVE;
@@ -46,15 +47,15 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
     }
     async processAppRoleDelete(logger, args) {
         const appObjectId = await this.getAppObjectId(args, logger);
-        const aadApp = await this.getAadApp(appObjectId, logger);
+        const app = await this.getEntraApp(appObjectId, logger);
         const appRoleDeleteIdentifierNameValue = args.options.name ? `name '${args.options.name}'` : (args.options.claim ? `claim '${args.options.claim}'` : `id '${args.options.id}'`);
         if (this.verbose) {
-            await logger.logToStderr(`Deleting role with ${appRoleDeleteIdentifierNameValue} from Microsoft Entra app ${aadApp.id}...`);
+            await logger.logToStderr(`Deleting role with ${appRoleDeleteIdentifierNameValue} from Microsoft Entra app ${app.id}...`);
         }
         // Find the role search criteria provided by the user.
         const appRoleDeleteIdentifierProperty = args.options.name ? `displayName` : (args.options.claim ? `value` : `id`);
         const appRoleDeleteIdentifierValue = args.options.name ? args.options.name : (args.options.claim ? args.options.claim : args.options.id);
-        const appRoleToDelete = aadApp.appRoles.filter((role) => role[appRoleDeleteIdentifierProperty] === appRoleDeleteIdentifierValue);
+        const appRoleToDelete = app.appRoles.filter((role) => role[appRoleDeleteIdentifierProperty] === appRoleDeleteIdentifierValue);
         if (args.options.name &&
             appRoleToDelete !== undefined &&
             appRoleToDelete.length > 1) {
@@ -66,38 +67,38 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         }
         const roleToDelete = appRoleToDelete[0];
         if (roleToDelete.isEnabled) {
-            await this.disableAppRole(logger, aadApp, roleToDelete.id);
-            await this.deleteAppRole(logger, aadApp, roleToDelete.id);
+            await this.disableAppRole(logger, app, roleToDelete.id);
+            await this.deleteAppRole(logger, app, roleToDelete.id);
         }
         else {
-            await this.deleteAppRole(logger, aadApp, roleToDelete.id);
+            await this.deleteAppRole(logger, app, roleToDelete.id);
         }
     }
-    async disableAppRole(logger, aadApp, roleId) {
-        const roleIndex = aadApp.appRoles.findIndex((role) => role.id === roleId);
+    async disableAppRole(logger, app, roleId) {
+        const roleIndex = app.appRoles.findIndex((role) => role.id === roleId);
         if (this.verbose) {
             await logger.logToStderr(`Disabling the app role`);
         }
-        aadApp.appRoles[roleIndex].isEnabled = false;
+        app.appRoles[roleIndex].isEnabled = false;
         const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${aadApp.id}`,
+            url: `${this.resource}/v1.0/myorganization/applications/${app.id}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json',
             data: {
-                appRoles: aadApp.appRoles
+                appRoles: app.appRoles
             }
         };
         return request.patch(requestOptions);
     }
-    async deleteAppRole(logger, aadApp, roleId) {
+    async deleteAppRole(logger, app, roleId) {
         if (this.verbose) {
             await logger.logToStderr(`Deleting the app role.`);
         }
-        const updatedAppRoles = aadApp.appRoles.filter((role) => role.id !== roleId);
+        const updatedAppRoles = app.appRoles.filter((role) => role.id !== roleId);
         const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${aadApp.id}`,
+            url: `${this.resource}/v1.0/myorganization/applications/${app.id}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -108,12 +109,12 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         };
         return request.patch(requestOptions);
     }
-    async getAadApp(appId, logger) {
+    async getEntraApp(appObjectId, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving app roles information for the Microsoft Entra app ${appId}...`);
+            await logger.logToStderr(`Retrieving app roles information for the Microsoft Entra app ${appObjectId}...`);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appId}?$select=id,appRoles`,
+            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}?$select=id,appRoles`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -129,27 +130,29 @@ class EntraAppRoleRemoveCommand 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;
     }
 }
 _EntraAppRoleRemoveCommand_instances = new WeakSet(), _EntraAppRoleRemoveCommand_initTelemetry = function _EntraAppRoleRemoveCommand_initTelemetry() {

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

@@ -11,6 +11,7 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
 import { optionsUtils } from '../../../../utils/optionsUtils.js';
+import { entraApp } from '../../../../utils/entraApp.js';
 class EntraAppSetCommand extends GraphCommand {
     get name() {
         return commands.APP_SET;
@@ -51,27 +52,29 @@ class EntraAppSetCommand 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;
     }
     async updateUnknownOptions(args, objectId) {
         const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);

package/dist/m365/pp/commands/card/card-clone.js

@@ -4,13 +4,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PpCardCloneCommand_instances, _PpCardCloneCommand_initTelemetry, _PpCardCloneCommand_initOptions, _PpCardCloneCommand_initOptionSets, _PpCardCloneCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppCardGetCommand from './card-get.js';
 class PpCardCloneCommand extends PowerPlatformCommand {
     get name() {
         return commands.CARD_CLONE;
@@ -30,28 +28,20 @@ class PpCardCloneCommand extends PowerPlatformCommand {
         if (this.verbose) {
             await logger.logToStderr(`Cloning a card from '${args.options.id || args.options.name}'...`);
         }
-        const res = await this.cloneCard(args);
+        const res = await this.cloneCard(args, logger);
         await logger.log(res);
     }
-    async getCardId(args) {
+    async getCardId(args, dynamicsApiUrl, logger) {
         if (args.options.id) {
             return args.options.id;
         }
-        const options = {
-            environmentName: args.options.environmentName,
-            name: args.options.name,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(ppCardGetCommand, { options: { ...options, _: [] } });
-        const getCardOutput = JSON.parse(output.stdout);
-        return getCardOutput.cardid;
+        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name, logger, this.verbose);
+        return card.cardid;
     }
-    async cloneCard(args) {
+    async cloneCard(args, logger) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const cardId = await this.getCardId(args);
+            const cardId = await this.getCardId(args, dynamicsApiUrl, logger);
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/CardCreateClone`,
                 headers: {