@pnp/cli-microsoft365 7.5.0 → 7.6.0-beta.480812d

package/dist/Auth.js

@@ -24,7 +24,7 @@ export class Connection {
         this.certificateType = CertificateType.Unknown;
         this.cloudType = CloudType.Public;
         this.accessTokens = {};
-        this.appId = config.cliAadAppId;
+        this.appId = config.cliEntraAppId;
         this.tenant = config.tenant;
         this.cloudType = CloudType.Public;
     }
@@ -44,7 +44,7 @@ export class Connection {
         this.thumbprint = undefined;
         this.spoUrl = undefined;
         this.spoTenantId = undefined;
-        this.appId = config.cliAadAppId;
+        this.appId = config.cliEntraAppId;
         this.tenant = config.tenant;
     }
 }
@@ -144,7 +144,7 @@ export class Auth {
         else {
             if (debug) {
                 if (!accessToken) {
-                    await logger.logToStderr(`No token found for resource ${resource}`);
+                    await logger.logToStderr(`No token found for resource ${resource}.`);
                 }
                 else {
                     await logger.logToStderr(`Access token expired. Token: ${accessToken.accessToken}, ExpiresAt: ${accessToken.expiresOn}`);
@@ -193,9 +193,9 @@ export class Auth {
         const response = await getTokenPromise(resource, logger, debug, fetchNew);
         if (!response) {
             if (debug) {
-                await logger.logToStderr(`getTokenPromise authentication result is null`);
+                await logger.logToStderr('getTokenPromise authentication result is null.');
             }
-            throw `Failed to retrieve an access token. Please try again`;
+            throw 'Failed to retrieve an access token. Please try again.';
         }
         else {
             if (debug) {
@@ -387,7 +387,7 @@ export class Auth {
             scopes: [`${resource}/.default`]
         });
     }
-    async ensureAccessTokenWithCertificate(resource, logger, debug) {
+    async ensureAccessTokenWithCertificate(resource, logger, debug, fetchNew) {
         const nodeForge = (await import('node-forge')).default;
         const { pem, pki, asn1, pkcs12 } = nodeForge;
         if (debug) {
@@ -442,7 +442,8 @@ export class Auth {
         }
         this.clientApplication = await this.getConfidentialClient(logger, debug, this.connection.thumbprint, cert);
         return this.clientApplication.acquireTokenByClientCredential({
-            scopes: [`${resource}/.default`]
+            scopes: [`${resource}/.default`],
+            skipCache: fetchNew
         });
     }
     async ensureAccessTokenWithIdentity(resource, logger, debug) {
@@ -562,10 +563,11 @@ export class Auth {
             }
         }
     }
-    async ensureAccessTokenWithSecret(resource, logger, debug) {
+    async ensureAccessTokenWithSecret(resource, logger, debug, fetchNew) {
         this.clientApplication = await this.getConfidentialClient(logger, debug, undefined, undefined, this.connection.secret);
         return this.clientApplication.acquireTokenByClientCredential({
-            scopes: [`${resource}/.default`]
+            scopes: [`${resource}/.default`],
+            skipCache: fetchNew
         });
     }
     async calculateThumbprint(certificate) {
@@ -579,7 +581,7 @@ export class Auth {
         let resource = url;
         const pos = resource.indexOf('/', 8);
         if (pos > -1) {
-            resource = resource.substr(0, pos);
+            resource = resource.substring(0, pos);
         }
         if (resource === 'https://api.bap.microsoft.com' ||
             resource === 'https://api.powerapps.com' ||

package/dist/AuthServer.js

@@ -54,7 +54,7 @@ export class AuthServer {
                     error: queryString.error,
                     errorDescription: queryString.error_description
                 };
-                body = "<p>Oops! Azure Active Directory replied with an error message.</p>";
+                body = "<p>Oops! Microsoft Entra ID replied with an error message.</p>";
                 body += `<p>${errorMessage.error}</p>`;
                 if (errorMessage.errorDescription !== undefined) {
                     body += `<p>${errorMessage.errorDescription}</p>`;

package/dist/cli/cli.js

@@ -98,7 +98,7 @@ async function execute(rawArgs) {
         if (parsedArgs.output !== 'none') {
             printHelp(await getHelpMode(parsedArgs));
         }
-        return Promise.resolve();
+        return;
     }
     delete cli.optionsFromArgs.options._;
     delete cli.optionsFromArgs.options['--'];

package/dist/config.js

@@ -1,9 +1,9 @@
 import { app } from "./utils/app.js";
-const cliAadAppId = '31359c7f-bd7e-475c-86db-fdb8c937548e';
+const cliEntraAppId = '31359c7f-bd7e-475c-86db-fdb8c937548e';
 export default {
     applicationName: `CLI for Microsoft 365 v${app.packageJson().version}`,
     delimiter: 'm365\$',
-    cliAadAppId: process.env.CLIMICROSOFT365_AADAPPID || cliAadAppId,
+    cliEntraAppId: process.env.CLIMICROSOFT365_ENTRAAPPID || process.env.CLIMICROSOFT365_AADAPPID || cliEntraAppId,
     tenant: process.env.CLIMICROSOFT365_TENANT || 'common',
     configstoreName: 'cli-m365-config'
 };

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

@@ -7,7 +7,7 @@ class AppGetCommand extends AppCommand {
         return commands.GET;
     }
     get description() {
-        return 'Retrieves information about the current Azure AD app';
+        return 'Retrieves information about the current Microsoft Entra app';
     }
     async commandAction(logger, args) {
         const options = {

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

@@ -14,7 +14,7 @@ class AppOpenCommand extends AppCommand {
         return commands.OPEN;
     }
     get description() {
-        return 'Opens Azure AD app in the Azure AD portal';
+        return 'Opens Microsoft Entra app in the Microsoft Entra ID portal';
     }
     constructor() {
         super();

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

@@ -19,7 +19,7 @@ class AppPermissionAddCommand extends AppCommand {
         return commands.PERMISSION_ADD;
     }
     get description() {
-        return 'Adds the specified application and/or delegated permissions to the current AAD app API permissions';
+        return 'Adds the specified application and/or delegated permissions to the current Microsoft Entra app API permissions';
     }
     constructor() {
         super();
@@ -64,7 +64,7 @@ class AppPermissionAddCommand extends AppCommand {
     async getAppObject() {
         const apps = await odata.getAllItems(`${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${formatting.encodeQueryParameter(this.appId)}'&$select=id,requiredResourceAccess`);
         if (apps.length === 0) {
-            throw `App with id ${this.appId} not found in Azure Active Directory`;
+            throw `App with id ${this.appId} not found in Microsoft Entra ID.`;
         }
         return apps[0];
     }

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

@@ -13,7 +13,7 @@ class AppPermissionListCommand extends AppCommand {
         return commands.PERMISSION_LIST;
     }
     get description() {
-        return 'Lists API permissions for the current AAD app';
+        return 'Lists API permissions for the current Microsoft Entra app';
     }
     async commandAction(logger) {
         try {
@@ -178,7 +178,7 @@ class AppPermissionListCommand extends AppCommand {
     }
     async getAppRegistration(appId, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving Azure AD application registration ${appId}`);
+            await logger.logToStderr(`Retrieving Microsoft Entra application registration ${appId}`);
         }
         const options = {
             appId: appId,

package/dist/m365/cli/commands/cli-consent.js

@@ -12,7 +12,7 @@ class CliConsentCommand extends AnonymousCommand {
         return commands.CONSENT;
     }
     get description() {
-        return 'Consent additional permissions for the Azure AD application used by the CLI for Microsoft 365';
+        return 'Consent additional permissions for the Microsoft Entra application used by the CLI for Microsoft 365';
     }
     constructor() {
         super();
@@ -30,7 +30,7 @@ class CliConsentCommand extends AnonymousCommand {
                 scope = 'https://api.yammer.com/user_impersonation';
                 break;
         }
-        await logger.log(`To consent permissions for executing ${args.options.service} commands, navigate in your web browser to https://login.microsoftonline.com/${config.tenant}/oauth2/v2.0/authorize?client_id=${config.cliAadAppId}&response_type=code&scope=${encodeURIComponent(scope)}`);
+        await logger.log(`To consent permissions for executing ${args.options.service} commands, navigate in your web browser to https://login.microsoftonline.com/${config.tenant}/oauth2/v2.0/authorize?client_id=${config.cliEntraAppId}&response_type=code&scope=${encodeURIComponent(scope)}`);
     }
     async action(logger, args) {
         this.initAction(args, logger);

package/dist/m365/cli/commands/cli-reconsent.js

@@ -9,12 +9,12 @@ class CliReconsentCommand extends AnonymousCommand {
         return commands.RECONSENT;
     }
     get description() {
-        return 'Returns Azure AD URL to open in the browser to re-consent CLI for Microsoft 365 permissions';
+        return 'Returns URL to open in the browser to re-consent CLI for Microsoft 365 Microsoft Entra permissions';
     }
     async commandAction(logger) {
-        const url = `https://login.microsoftonline.com/${config.tenant}/oauth2/authorize?client_id=${config.cliAadAppId}&response_type=code&prompt=admin_consent`;
+        const url = `https://login.microsoftonline.com/${config.tenant}/oauth2/authorize?client_id=${config.cliEntraAppId}&response_type=code&prompt=admin_consent`;
         if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
-            await logger.log(`To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to ${url}`);
+            await logger.log(`To re-consent the PnP Microsoft 365 Management Shell Microsoft Entra application navigate in your web browser to ${url}`);
             return;
         }
         await logger.log(`Opening the following page in your browser: ${url}`);

package/dist/m365/commands/login.js

@@ -37,7 +37,7 @@ class LoginCommand extends Command {
                 await logger.logToStderr(`Signing in to Microsoft 365...`);
             }
             const authType = args.options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
-            auth.connection.appId = args.options.appId || config.cliAadAppId;
+            auth.connection.appId = args.options.appId || config.cliEntraAppId;
             auth.connection.tenant = args.options.tenant || config.tenant;
             auth.connection.name = args.options.connectionName;
             switch (authType) {

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

@@ -25,6 +25,7 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAdministrativeUnitAddCommand_instances, "m", _EntraAdministrativeUnitAddCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.ADMINISTRATIVEUNIT_ADD, commands.ADMINISTRATIVEUNIT_ADD);
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/administrativeUnits`,
             headers: {

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

@@ -30,6 +30,7 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAdministrativeUnitGetCommand_instances, "m", _EntraAdministrativeUnitGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.ADMINISTRATIVEUNIT_GET, commands.ADMINISTRATIVEUNIT_GET);
         let administrativeUnit;
         try {
             if (args.options.id) {

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

@@ -16,6 +16,7 @@ class EntraAdministrativeUnitListCommand extends GraphCommand {
         return ['id', 'displayName', 'visibility'];
     }
     async commandAction(logger) {
+        await this.showDeprecationWarning(logger, aadCommands.ADMINISTRATIVEUNIT_LIST, commands.ADMINISTRATIVEUNIT_LIST);
         try {
             const results = await odata.getAllItems(`${this.resource}/v1.0/directory/administrativeUnits`);
             await logger.log(results);

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

@@ -32,6 +32,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberAddCommand_instances, "m", _EntraAdministrativeUnitMemberAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.ADMINISTRATIVEUNIT_MEMBER_ADD, commands.ADMINISTRATIVEUNIT_MEMBER_ADD);
         let administrativeUnitId = args.options.administrativeUnitId;
         let memberType;
         let memberId;

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-get.js

@@ -29,6 +29,7 @@ class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberGetCommand_instances, "m", _EntraAdministrativeUnitMemberGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.ADMINISTRATIVEUNIT_MEMBER_GET, commands.ADMINISTRATIVEUNIT_MEMBER_GET);
         let administrativeUnitId = args.options.administrativeUnitId;
         try {
             if (args.options.administrativeUnitName) {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-list.js

@@ -32,6 +32,7 @@ class EntraAdministrativeUnitMemberListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAdministrativeUnitMemberListCommand_instances, "m", _EntraAdministrativeUnitMemberListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.ADMINISTRATIVEUNIT_MEMBER_LIST, commands.ADMINISTRATIVEUNIT_MEMBER_LIST);
         let administrativeUnitId = args.options.administrativeUnitId;
         try {
             if (args.options.administrativeUnitName) {

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

@@ -31,6 +31,7 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAdministrativeUnitRemoveCommand_instances, "m", _EntraAdministrativeUnitRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.ADMINISTRATIVEUNIT_REMOVE, commands.ADMINISTRATIVEUNIT_REMOVE);
         const removeAdministrativeUnit = async () => {
             try {
                 let administrativeUnitId = args.options.id;

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

@@ -34,12 +34,13 @@ class EntraAppAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.APP_ADD, commands.APP_ADD);
         try {
             const apis = await this.resolveApis(args, logger);
             let appInfo = await this.createAppRegistration(args, apis, logger);
-            // based on the assumption that we're adding AAD app to the current
+            // based on the assumption that we're adding Microsoft Entra app to the current
             // directory. If we in the future extend the command with allowing
-            // users to create AAD app in a different directory, we'll need to
+            // users to create Microsoft Entra app in a different directory, we'll need to
             // adjust this
             appInfo.tenantId = accessToken.getTenantIdFromAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken);
             appInfo = await this.updateAppFromManifest(args, appInfo);
@@ -98,7 +99,7 @@ class EntraAppAddCommand extends GraphCommand {
             applicationInfo.keyCredentials = [newKeyCredential];
         }
         if (this.verbose) {
-            await logger.logToStderr(`Creating Azure AD app registration...`);
+            await logger.logToStderr(`Creating Microsoft Entra app registration...`);
         }
         const createApplicationRequestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications`,
@@ -390,7 +391,7 @@ class EntraAppAddCommand extends GraphCommand {
             return appInfo;
         }
         if (this.verbose) {
-            await logger.logToStderr(`Configuring Azure AD application ID URI...`);
+            await logger.logToStderr(`Configuring Microsoft Entra application ID URI...`);
         }
         const applicationInfo = {};
         if (args.options.uri) {
@@ -544,7 +545,7 @@ class EntraAppAddCommand extends GraphCommand {
             return appInfo;
         }
         if (this.verbose) {
-            await logger.logToStderr(`Configure Azure AD app secret...`);
+            await logger.logToStderr(`Configure Microsoft Entra app secret...`);
         }
         const secret = await this.createSecret({ appObjectId: appInfo.id });
         if (!appInfo.secrets) {
@@ -599,7 +600,7 @@ class EntraAppAddCommand extends GraphCommand {
         }
         const filePath = '.m365rc.json';
         if (this.verbose) {
-            await logger.logToStderr(`Saving Azure AD app registration information to the ${filePath} file...`);
+            await logger.logToStderr(`Saving Microsoft Entra app registration information to the ${filePath} file...`);
         }
         let m365rc = {};
         if (fs.existsSync(filePath)) {

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

@@ -31,6 +31,7 @@ class EntraAppGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAppGetCommand_instances, "m", _EntraAppGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.APP_GET, commands.APP_GET);
         try {
             const appObjectId = await this.getAppObjectId(args);
             const appInfo = await this.getAppInfo(appObjectId);
@@ -62,10 +63,10 @@ class EntraAppGetCommand extends GraphCommand {
         }
         if (res.value.length === 0) {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
-            throw `No Azure AD application registration with ${applicationIdentifier} found`;
+            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
     async getAppInfo(appObjectId) {
@@ -84,7 +85,7 @@ class EntraAppGetCommand extends GraphCommand {
         }
         const filePath = '.m365rc.json';
         if (this.verbose) {
-            await logger.logToStderr(`Saving Azure AD app registration information to the ${filePath} file...`);
+            await logger.logToStderr(`Saving Microsoft Entra app registration information to the ${filePath} file...`);
         }
         let m365rc = {};
         if (fs.existsSync(filePath)) {

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

@@ -16,6 +16,7 @@ class EntraAppListCommand extends GraphCommand {
         return ['appId', 'id', 'displayName', "signInAudience"];
     }
     async commandAction(logger) {
+        await this.showDeprecationWarning(logger, aadCommands.APP_LIST, commands.APP_LIST);
         try {
             const results = await odata.getAllItems(`${this.resource}/v1.0/applications`);
             await logger.log(results);

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

@@ -20,7 +20,7 @@ class EntraAppPermissionAddCommand extends GraphCommand {
         return commands.APP_PERMISSION_ADD;
     }
     get description() {
-        return 'Adds the specified application and/or delegated permissions to a specified Entra ID (Azure AD) app';
+        return 'Adds the specified application and/or delegated permissions to a specified Microsoft Entra app';
     }
     alias() {
         return [aadCommands.APP_PERMISSION_ADD, commands.APPREGISTRATION_PERMISSION_ADD];
@@ -34,6 +34,7 @@ class EntraAppPermissionAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAppPermissionAddCommand_instances, "m", _EntraAppPermissionAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.APP_PERMISSION_ADD, commands.APP_PERMISSION_ADD);
         try {
             const appObject = await this.getAppObject(args.options);
             const servicePrincipals = await this.getServicePrincipals();
@@ -71,7 +72,7 @@ class EntraAppPermissionAddCommand extends GraphCommand {
             ? await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=id eq '${options.appObjectId}'&$select=id,appId,requiredResourceAccess`)
             : await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=appId eq '${options.appId}'&$select=id,appId,requiredResourceAccess`);
         if (apps.length === 0) {
-            throw `App with ${options.appObjectId ? 'object id' : 'client id'} ${options.appObjectId ? options.appObjectId : options.appId} not found in Entra ID (Azure AD)`;
+            throw `App with ${options.appObjectId ? 'object id' : 'client id'} ${options.appObjectId ? options.appObjectId : options.appId} not found in Microsoft Entra ID`;
         }
         return apps[0];
     }

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

@@ -49,7 +49,7 @@ class EntraAppPermissionListCommand extends GraphCommand {
         };
         const res = await request.get(requestOptions);
         if (res.value.length === 0) {
-            throw `No Azure AD application registration with ID ${options.appId} found`;
+            throw `No Microsoft Entra application registration with ID ${options.appId} found`;
         }
         return res.value[0].id;
     }

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

@@ -30,11 +30,12 @@ class EntraAppRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAppRemoveCommand_instances, "m", _EntraAppRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.APP_REMOVE, commands.APP_REMOVE);
         const deleteApp = async () => {
             try {
                 const objectId = await this.getObjectId(args, logger);
                 if (this.verbose) {
-                    await logger.logToStderr(`Deleting Azure AD app ${objectId}...`);
+                    await logger.logToStderr(`Deleting Microsoft Entra app ${objectId}...`);
                 }
                 const requestOptions = {
                     url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
@@ -65,7 +66,7 @@ class EntraAppRemoveCommand extends GraphCommand {
         }
         const { appId, name } = args.options;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : name}...`);
         }
         const filter = appId ?
             `appId eq '${formatting.encodeQueryParameter(appId)}'` :
@@ -83,10 +84,10 @@ class EntraAppRemoveCommand extends GraphCommand {
         }
         if (res.value.length === 0) {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
-            throw `No Azure AD application registration with ${applicationIdentifier} found`;
+            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registration with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
 }

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

@@ -30,11 +30,12 @@ class EntraAppRoleAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAppRoleAddCommand_instances, "m", _EntraAppRoleAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.APP_ROLE_ADD, commands.APP_ROLE_ADD);
         try {
             const appId = await this.getAppObjectId(args, logger);
             const appInfo = await this.getAppInfo(appId, logger);
             if (this.verbose) {
-                await logger.logToStderr(`Adding role ${args.options.name} to Azure AD app ${appInfo.id}...`);
+                await logger.logToStderr(`Adding role ${args.options.name} to Microsoft Entra app ${appInfo.id}...`);
             }
             const requestOptions = {
                 url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
@@ -60,7 +61,7 @@ class EntraAppRoleAddCommand extends GraphCommand {
     }
     async getAppInfo(appId, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about roles for Azure AD app ${appId}...`);
+            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`,
@@ -89,7 +90,7 @@ class EntraAppRoleAddCommand extends GraphCommand {
         }
         const { appId, appName } = args.options;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : appName}...`);
         }
         const filter = appId ?
             `appId eq '${formatting.encodeQueryParameter(appId)}'` :
@@ -107,10 +108,10 @@ class EntraAppRoleAddCommand extends GraphCommand {
         }
         if (res.value.length === 0) {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
-            throw `No Azure AD application registration with ${applicationIdentifier} found`;
+            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
         return result.id;
     }
 }

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

@@ -32,6 +32,7 @@ class EntraAppRoleListCommand extends GraphCommand {
         return ['displayName', 'description', 'id'];
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.APP_ROLE_LIST, commands.APP_ROLE_LIST);
         try {
             const objectId = await this.getAppObjectId(args, logger);
             const appRoles = await odata.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`);
@@ -47,7 +48,7 @@ class EntraAppRoleListCommand extends GraphCommand {
         }
         const { appId, appName } = args.options;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : appName}...`);
         }
         const filter = appId ?
             `appId eq '${formatting.encodeQueryParameter(appId)}'` :
@@ -65,10 +66,10 @@ class EntraAppRoleListCommand extends GraphCommand {
         }
         if (res.value.length === 0) {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
-            throw `No Azure AD application registration with ${applicationIdentifier} found`;
+            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
         return result.id;
     }
 }

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

@@ -30,6 +30,7 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAppRoleRemoveCommand_instances, "m", _EntraAppRoleRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, aadCommands.APP_ROLE_REMOVE, commands.APP_ROLE_REMOVE);
         const deleteAppRole = async () => {
             try {
                 await this.processAppRoleDelete(logger, args);
@@ -53,7 +54,7 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         const aadApp = await this.getAadApp(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 Azure AD app ${aadApp.id}...`);
+            await logger.logToStderr(`Deleting role with ${appRoleDeleteIdentifierNameValue} from Microsoft Entra app ${aadApp.id}...`);
         }
         // Find the role search criteria provided by the user.
         const appRoleDeleteIdentifierProperty = args.options.name ? `displayName` : (args.options.claim ? `value` : `id`);
@@ -114,7 +115,7 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
     }
     async getAadApp(appId, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving app roles information for the Azure AD app ${appId}...`);
+            await logger.logToStderr(`Retrieving app roles information for the Microsoft Entra app ${appId}...`);
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications/${appId}?$select=id,appRoles`,
@@ -131,7 +132,7 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         }
         const { appId, appName } = args.options;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : appName}...`);
         }
         const filter = appId ?
             `appId eq '${formatting.encodeQueryParameter(appId)}'` :
@@ -149,10 +150,10 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         }
         if (res.value.length === 0) {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
-            throw `No Azure AD application registration with ${applicationIdentifier} found`;
+            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = (await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair));
+        const result = (await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair));
         return result.id;
     }
 }