@pnp/cli-microsoft365 9.0.0-beta.f2c5f82 → 9.1.0-beta.4ee36d4

package/dist/m365/viva/commands/engage/engage-user-get.js

@@ -8,6 +8,7 @@ import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
+import yammerCommands from './yammerCommands.js';
 class VivaEngageUserGetCommand extends VivaEngageCommand {
     get name() {
         return commands.ENGAGE_USER_GET;
@@ -15,6 +16,9 @@ class VivaEngageUserGetCommand extends VivaEngageCommand {
     get description() {
         return 'Retrieves the current user or searches for a user by ID or e-mail';
     }
+    alias() {
+        return [yammerCommands.USER_GET];
+    }
     defaultProperties() {
         return ['id', 'full_name', 'email', 'job_title', 'state', 'url'];
     }
@@ -26,6 +30,7 @@ class VivaEngageUserGetCommand extends VivaEngageCommand {
         __classPrivateFieldGet(this, _VivaEngageUserGetCommand_instances, "m", _VivaEngageUserGetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
         let endPoint = `${this.resource}/v1/users/current.json`;
         if (args.options.id) {
             endPoint = `${this.resource}/v1/users/${args.options.id}.json`;

package/dist/m365/viva/commands/engage/engage-user-list.js

@@ -7,6 +7,7 @@ var _VivaEngageUserListCommand_instances, _VivaEngageUserListCommand_initTelemet
 import request from '../../../../request.js';
 import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
+import yammerCommands from './yammerCommands.js';
 class VivaEngageUserListCommand extends VivaEngageCommand {
     get name() {
         return commands.ENGAGE_USER_LIST;
@@ -14,6 +15,9 @@ class VivaEngageUserListCommand extends VivaEngageCommand {
     get description() {
         return 'Returns users from the current network';
     }
+    alias() {
+        return [yammerCommands.USER_LIST];
+    }
     defaultProperties() {
         return ['id', 'full_name', 'email'];
     }
@@ -88,6 +92,7 @@ class VivaEngageUserListCommand extends VivaEngageCommand {
         });
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
         this.items = []; // this will reset the items array in interactive mode
         try {
             await this.getAllItems(logger, args, 1);

package/dist/m365/viva/commands/engage/yammerCommands.js

@@ -0,0 +1,25 @@
+const prefix = 'yammer';
+export default {
+    GROUP_LIST: `${prefix} group list`,
+    GROUP_USER_ADD: `${prefix} group user add`,
+    GROUP_USER_REMOVE: `${prefix} group user remove`,
+    MESSAGE_ADD: `${prefix} message add`,
+    MESSAGE_GET: `${prefix} message get`,
+    MESSAGE_LIKE_SET: `${prefix} message like set`,
+    MESSAGE_LIST: `${prefix} message list`,
+    MESSAGE_REMOVE: `${prefix} message remove`,
+    NETWORK_LIST: `${prefix} network list`,
+    REPORT_ACTIVITYCOUNTS: `${prefix} report activitycounts`,
+    REPORT_ACTIVITYUSERCOUNTS: `${prefix} report activityusercounts`,
+    REPORT_ACTIVITYUSERDETAIL: `${prefix} report activityuserdetail`,
+    REPORT_DEVICEUSAGEDISTRIBUTIONUSERCOUNTS: `${prefix} report deviceusagedistributionusercounts`,
+    REPORT_DEVICEUSAGEUSERCOUNTS: `${prefix} report deviceusageusercounts`,
+    REPORT_DEVICEUSAGEUSERDETAIL: `${prefix} report deviceusageuserdetail`,
+    REPORT_GROUPSACTIVITYCOUNTS: `${prefix} report groupsactivitycounts`,
+    REPORT_GROUPSACTIVITYDETAIL: `${prefix} report groupsactivitydetail`,
+    REPORT_GROUPSACTIVITYGROUPCOUNTS: `${prefix} report groupsactivitygroupcounts`,
+    SEARCH: `${prefix} search`,
+    USER_GET: `${prefix} user get`,
+    USER_LIST: `${prefix} user list`
+};
+//# sourceMappingURL=yammerCommands.js.map

package/dist/settingsNames.js

@@ -1,6 +1,11 @@
 const settingsNames = {
     authType: 'authType',
     autoOpenLinksInBrowser: 'autoOpenLinksInBrowser',
+    clientId: 'clientId',
+    clientSecret: 'clientSecret',
+    clientCertificateFile: 'clientCertificateFile',
+    clientCertificateBase64Encoded: 'clientCertificateBase64Encoded',
+    clientCertificatePassword: 'clientCertificatePassword',
     copyDeviceCodeToClipboard: 'copyDeviceCodeToClipboard',
     csvEscape: 'csvEscape',
     csvHeader: 'csvHeader',
@@ -16,7 +21,8 @@ const settingsNames = {
     prompt: 'prompt',
     promptListPageSize: 'promptListPageSize',
     showHelpOnFailure: 'showHelpOnFailure',
-    showSpinner: 'showSpinner'
+    showSpinner: 'showSpinner',
+    tenantId: 'tenantId'
 };
 export { settingsNames };
 //# sourceMappingURL=settingsNames.js.map

package/dist/utils/entraApp.js

@@ -0,0 +1,283 @@
+import fs from 'fs';
+import request from '../request.js';
+import { odata } from './odata.js';
+async function getCertificateBase64Encoded({ options, logger, debug }) {
+    if (options.certificateBase64Encoded) {
+        return options.certificateBase64Encoded;
+    }
+    if (debug) {
+        await logger.logToStderr(`Reading existing ${options.certificateFile}...`);
+    }
+    try {
+        return fs.readFileSync(options.certificateFile, { encoding: 'base64' });
+    }
+    catch (e) {
+        throw new Error(`Error reading certificate file: ${e}. Please add the certificate using base64 option '--certificateBase64Encoded'.`);
+    }
+}
+async function createServicePrincipal(appId) {
+    const requestOptions = {
+        url: `https://graph.microsoft.com/v1.0/myorganization/servicePrincipals`,
+        headers: {
+            'content-type': 'application/json'
+        },
+        data: {
+            appId: appId
+        },
+        responseType: 'json'
+    };
+    return request.post(requestOptions);
+}
+async function grantOAuth2Permission({ appId, resourceId, scopeName }) {
+    const grantAdminConsentApplicationRequestOptions = {
+        url: `https://graph.microsoft.com/v1.0/myorganization/oauth2PermissionGrants`,
+        headers: {
+            accept: 'application/json;odata.metadata=none'
+        },
+        responseType: 'json',
+        data: {
+            clientId: appId,
+            consentType: "AllPrincipals",
+            principalId: null,
+            resourceId: resourceId,
+            scope: scopeName
+        }
+    };
+    return request.post(grantAdminConsentApplicationRequestOptions);
+}
+async function addRoleToServicePrincipal({ objectId, resourceId, appRoleId }) {
+    const requestOptions = {
+        url: `https://graph.microsoft.com/v1.0/myorganization/servicePrincipals/${objectId}/appRoleAssignments`,
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        responseType: 'json',
+        data: {
+            appRoleId: appRoleId,
+            principalId: objectId,
+            resourceId: resourceId
+        }
+    };
+    return request.post(requestOptions);
+}
+async function getRequiredResourceAccessForApis({ servicePrincipals, apis, scopeType, logger, debug }) {
+    if (!apis) {
+        return [];
+    }
+    const resolvedApis = [];
+    const requestedApis = apis.split(',').map(a => a.trim());
+    for (const api of requestedApis) {
+        const pos = api.lastIndexOf('/');
+        const permissionName = api.substring(pos + 1);
+        const servicePrincipalName = api.substring(0, pos);
+        if (debug) {
+            await logger.logToStderr(`Resolving ${api}...`);
+            await logger.logToStderr(`Permission name: ${permissionName}`);
+            await logger.logToStderr(`Service principal name: ${servicePrincipalName}`);
+        }
+        const servicePrincipal = servicePrincipals.find(sp => (sp.servicePrincipalNames.indexOf(servicePrincipalName) > -1 ||
+            sp.servicePrincipalNames.indexOf(`${servicePrincipalName}/`) > -1));
+        if (!servicePrincipal) {
+            throw `Service principal ${servicePrincipalName} not found`;
+        }
+        const scopesOfType = scopeType === 'Scope' ? servicePrincipal.oauth2PermissionScopes : servicePrincipal.appRoles;
+        const permission = scopesOfType.find(scope => scope.value === permissionName);
+        if (!permission) {
+            throw `Permission ${permissionName} for service principal ${servicePrincipalName} not found`;
+        }
+        let resolvedApi = resolvedApis.find(a => a.resourceAppId === servicePrincipal.appId);
+        if (!resolvedApi) {
+            resolvedApi = {
+                resourceAppId: servicePrincipal.appId,
+                resourceAccess: []
+            };
+            resolvedApis.push(resolvedApi);
+        }
+        const resourceAccessPermission = {
+            id: permission.id,
+            type: scopeType
+        };
+        resolvedApi.resourceAccess.push(resourceAccessPermission);
+        updateAppPermissions({
+            spId: servicePrincipal.id,
+            resourceAccessPermission,
+            oAuth2PermissionValue: permission.value
+        });
+    }
+    return resolvedApis;
+}
+function updateAppPermissions({ spId, resourceAccessPermission, oAuth2PermissionValue }) {
+    // During API resolution, we store globally both app role assignments and oauth2permissions
+    // So that we'll be able to parse them during the admin consent process
+    let existingPermission = entraApp.appPermissions.find(oauth => oauth.resourceId === spId);
+    if (!existingPermission) {
+        existingPermission = {
+            resourceId: spId,
+            resourceAccess: [],
+            scope: []
+        };
+        entraApp.appPermissions.push(existingPermission);
+    }
+    if (resourceAccessPermission.type === 'Scope' && oAuth2PermissionValue && !existingPermission.scope.find(scp => scp === oAuth2PermissionValue)) {
+        existingPermission.scope.push(oAuth2PermissionValue);
+    }
+    if (!existingPermission.resourceAccess.find(res => res.id === resourceAccessPermission.id)) {
+        existingPermission.resourceAccess.push(resourceAccessPermission);
+    }
+}
+export const entraApp = {
+    appPermissions: [],
+    createAppRegistration: async ({ options, apis, logger, verbose, debug }) => {
+        const applicationInfo = {
+            displayName: options.name,
+            signInAudience: options.multitenant ? 'AzureADMultipleOrgs' : 'AzureADMyOrg'
+        };
+        if (apis.length > 0) {
+            applicationInfo.requiredResourceAccess = apis;
+        }
+        if (options.redirectUris) {
+            applicationInfo[options.platform] = {
+                redirectUris: options.redirectUris.split(',').map(u => u.trim())
+            };
+        }
+        if (options.implicitFlow) {
+            if (!applicationInfo.web) {
+                applicationInfo.web = {};
+            }
+            applicationInfo.web.implicitGrantSettings = {
+                enableAccessTokenIssuance: true,
+                enableIdTokenIssuance: true
+            };
+        }
+        if (options.certificateFile || options.certificateBase64Encoded) {
+            const certificateBase64Encoded = await getCertificateBase64Encoded({ options, logger, debug });
+            const newKeyCredential = {
+                type: 'AsymmetricX509Cert',
+                usage: 'Verify',
+                displayName: options.certificateDisplayName,
+                key: certificateBase64Encoded
+            };
+            applicationInfo.keyCredentials = [newKeyCredential];
+        }
+        if (options.allowPublicClientFlows) {
+            applicationInfo.isFallbackPublicClient = true;
+        }
+        if (verbose) {
+            await logger.logToStderr(`Creating Microsoft Entra app registration...`);
+        }
+        const createApplicationRequestOptions = {
+            url: `https://graph.microsoft.com/v1.0/myorganization/applications`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: applicationInfo
+        };
+        return request.post(createApplicationRequestOptions);
+    },
+    grantAdminConsent: async ({ appInfo, appPermissions, adminConsent, logger, debug }) => {
+        if (!adminConsent || appPermissions.length === 0) {
+            return appInfo;
+        }
+        const sp = await createServicePrincipal(appInfo.appId);
+        if (debug) {
+            await logger.logToStderr("Service principal created, returned object id: " + sp.id);
+        }
+        const tasks = [];
+        appPermissions.forEach(async (permission) => {
+            if (permission.scope.length > 0) {
+                tasks.push(grantOAuth2Permission({
+                    appId: sp.id,
+                    resourceId: permission.resourceId,
+                    scopeName: permission.scope.join(' ')
+                }));
+                if (debug) {
+                    await logger.logToStderr(`Admin consent granted for following resource ${permission.resourceId}, with delegated permissions: ${permission.scope.join(',')}`);
+                }
+            }
+            permission.resourceAccess.filter(access => access.type === "Role").forEach(async (access) => {
+                tasks.push(addRoleToServicePrincipal({
+                    objectId: sp.id,
+                    resourceId: permission.resourceId,
+                    appRoleId: access.id
+                }));
+                if (debug) {
+                    await logger.logToStderr(`Admin consent granted for following resource ${permission.resourceId}, with application permission: ${access.id}`);
+                }
+            });
+        });
+        await Promise.all(tasks);
+        return appInfo;
+    },
+    resolveApis: async ({ options, manifest, logger, verbose, debug }) => {
+        if (!options.apisDelegated && !options.apisApplication
+            && (typeof manifest?.requiredResourceAccess === 'undefined' || manifest.requiredResourceAccess.length === 0)) {
+            return [];
+        }
+        if (verbose) {
+            await logger.logToStderr('Resolving requested APIs...');
+        }
+        const servicePrincipals = await odata.getAllItems(`https://graph.microsoft.com/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
+        let resolvedApis = [];
+        if (options.apisDelegated || options.apisApplication) {
+            resolvedApis = await getRequiredResourceAccessForApis({
+                servicePrincipals,
+                apis: options.apisDelegated,
+                scopeType: 'Scope',
+                logger,
+                debug
+            });
+            if (verbose) {
+                await logger.logToStderr(`Resolved delegated permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
+            }
+            const resolvedApplicationApis = await getRequiredResourceAccessForApis({
+                servicePrincipals,
+                apis: options.apisApplication,
+                scopeType: 'Role',
+                logger,
+                debug
+            });
+            if (verbose) {
+                await logger.logToStderr(`Resolved application permissions: ${JSON.stringify(resolvedApplicationApis, null, 2)}`);
+            }
+            // merge resolved application APIs onto resolved delegated APIs
+            resolvedApplicationApis.forEach(resolvedRequiredResource => {
+                const requiredResource = resolvedApis.find(api => api.resourceAppId === resolvedRequiredResource.resourceAppId);
+                if (requiredResource) {
+                    requiredResource.resourceAccess.push(...resolvedRequiredResource.resourceAccess);
+                }
+                else {
+                    resolvedApis.push(resolvedRequiredResource);
+                }
+            });
+        }
+        else {
+            const manifestApis = manifest.requiredResourceAccess;
+            manifestApis.forEach(manifestApi => {
+                resolvedApis.push(manifestApi);
+                const app = servicePrincipals.find(servicePrincipals => servicePrincipals.appId === manifestApi.resourceAppId);
+                if (app) {
+                    manifestApi.resourceAccess.forEach((res => {
+                        const resourceAccessPermission = {
+                            id: res.id,
+                            type: res.type
+                        };
+                        const oAuthValue = app.oauth2PermissionScopes.find(scp => scp.id === res.id)?.value;
+                        updateAppPermissions({
+                            spId: app.id,
+                            resourceAccessPermission,
+                            oAuth2PermissionValue: oAuthValue
+                        });
+                    }));
+                }
+            });
+        }
+        if (verbose) {
+            await logger.logToStderr(`Merged delegated and application permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
+            await logger.logToStderr(`App role assignments: ${JSON.stringify(entraApp.appPermissions.flatMap(permission => permission.resourceAccess.filter(access => access.type === "Role")), null, 2)}`);
+            await logger.logToStderr(`OAuth2 permissions: ${JSON.stringify(entraApp.appPermissions.flatMap(permission => permission.scope), null, 2)}`);
+        }
+        return resolvedApis;
+    }
+};
+//# sourceMappingURL=entraApp.js.map

package/dist/utils/spo.js

@@ -12,16 +12,6 @@ import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js';
 import { entraGroup } from './entraGroup.js';
 import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js';
 import { setTimeout } from 'timers/promises';
-export var CreateCopyJobsNameConflictBehavior;
-(function (CreateCopyJobsNameConflictBehavior) {
-    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Fail"] = 0] = "Fail";
-    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Replace"] = 1] = "Replace";
-    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Rename"] = 2] = "Rename";
-})(CreateCopyJobsNameConflictBehavior || (CreateCopyJobsNameConflictBehavior = {}));
-// Wrapping this into a settings object so we can alter the values in tests
-export const settings = {
-    pollingInterval: 3000
-};
 export const spo = {
     async getRequestDigest(siteUrl) {
         const requestOptions = {
@@ -1526,70 +1516,6 @@ export const spo = {
         };
         const itemsResponse = await request.get(requestOptionsItems);
         return (itemsResponse);
-    },
-    /**
-     * Create a SharePoint copy job to copy a file/folder to another location.
-     * @param webUrl Absolute web URL where the source file/folder is located.
-     * @param sourceUrl Absolute URL of the source file/folder.
-     * @param destinationUrl Absolute URL of the destination folder.
-     * @param options Options for the copy job.
-     * @returns Copy job information. Use {@link spo.getCopyJobResult} to get the result of the copy job.
-     */
-    async createCopyJob(webUrl, sourceUrl, destinationUrl, options) {
-        const requestOptions = {
-            url: `${webUrl}/_api/Site/CreateCopyJobs`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: {
-                destinationUri: destinationUrl,
-                exportObjectUris: [sourceUrl],
-                options: {
-                    NameConflictBehavior: options?.nameConflictBehavior ?? CreateCopyJobsNameConflictBehavior.Fail,
-                    AllowSchemaMismatch: true,
-                    BypassSharedLock: !!options?.bypassSharedLock,
-                    IgnoreVersionHistory: !!options?.ignoreVersionHistory,
-                    CustomizedItemName: options?.newName ? [options.newName] : undefined,
-                    SameWebCopyMoveOptimization: true
-                }
-            }
-        };
-        const response = await request.post(requestOptions);
-        return response.value[0];
-    },
-    /**
-     * Poll until the copy job is finished and return the result.
-     * @param webUrl Absolute web URL where the copy job was created.
-     * @param copyJobInfo Information about the copy job.
-     * @throws Error if the copy job has failed.
-     * @returns Information about the destination object.
-     */
-    async getCopyJobResult(webUrl, copyJobInfo) {
-        const requestOptions = {
-            url: `${webUrl}/_api/Site/GetCopyJobProgress`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: {
-                copyJobInfo: copyJobInfo
-            }
-        };
-        let progress = await request.post(requestOptions);
-        while (progress.JobState !== 0) {
-            await setTimeout(settings.pollingInterval);
-            progress = await request.post(requestOptions);
-        }
-        const logs = progress.Logs.map(l => JSON.parse(l));
-        // Check if the job has failed
-        const errorLog = logs.find(l => l.Event === 'JobError');
-        if (errorLog) {
-            throw new Error(errorLog.Message);
-        }
-        // Get the destination object information
-        const objectInfo = logs.find(l => l.Event === 'JobFinishedObjectInfo');
-        return objectInfo;
     }
 };
 //# sourceMappingURL=spo.js.map

package/docs/docs/_clisettings.mdx

@@ -2,6 +2,11 @@ Setting name|Definition|Default value
 ------------|----------|-------------
 `authType`|Default login method to use when running `m365 login` without the `--authType` option.|`deviceCode`
 `autoOpenLinksInBrowser`|Automatically open the browser for all commands which return a url and expect the user to copy paste this to the browser. For example when logging in, using `m365 login` in device code mode.|`false`
+`clientId`|ID of the default Entra ID app use by the CLI to authenticate|``
+`clientSecret`|Secret of the default Entra ID app use by the CLI to authenticate|``
+`clientCertificateFile`|Path to the file containing the client certificate to use for authentication|``
+`clientCertificateBase64Encoded`|Base64-encoded client certificate contents|``
+`clientCertificatePassword`|Password to the client certificate file|``
 `copyDeviceCodeToClipboard`|Automatically copy the device code to the clipboard when running `m365 login` command in device code mode|`false`
 `csvEscape`|Single character used for escaping; only apply to characters matching the quote and the escape options|`"`
 `csvHeader`|Display the column names on the first line|`true`
@@ -18,3 +23,4 @@ Setting name|Definition|Default value
 `promptListPageSize`|By default, lists of choices longer than 7 will be paginated. Use this option to control how many choices will appear on the screen at once.|7
 `showHelpOnFailure`|Automatically display help when executing a command failed|`true`
 `showSpinner`|Display spinner when executing commands|`true`
+`tenantId`|ID of the default tenant to use when authenticating with|``

package/docs/docs/cmd/app/permission/permission-add.mdx

@@ -16,10 +16,10 @@ m365 app permission add [options]
 `--appId [appId]`
 : Client ID of the Microsoft Entra app registered in the .m365rc.json file to retrieve API permissions for.
 
-`--applicationPermissions [applicationPermissions]`
+`--applicationPermission [applicationPermission]`
 : Space-separated list of application permissions to add.
 
-`--delegatedPermissions [delegatedPermissions]`
+`--delegatedPermission [delegatedPermission]`
 : Space-separated list of delegated permissions to add.
 
 `--grantAdminConsent`
@@ -37,19 +37,19 @@ If you have multiple apps registered in your .m365rc.json file, you can specify
 Adds the specified application permissions to the default app registered in the _.m365rc.json_ file while granting admin consent.
 
 ```sh
-m365 app permission add --applicationPermissions 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --grantAdminConsent
+m365 app permission add --applicationPermission 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --grantAdminConsent
 ```
 
 Adds the specified delegated permissions to the default app registered in the _.m365rc.json_ file without granting admin consent.
 
 ```sh
-m365 app permission add --delegatedPermissions 'https://graph.microsoft.com/offline_access'
+m365 app permission add --delegatedPermission 'https://graph.microsoft.com/offline_access'
 ```
 
 Adds the specified application and delegated permissions to a specific app registered in the _.m365rc.json_ file while granting admin consent.
 
 ```sh
-m365 app permission add --appId '1663767b-4172-4519-bfd1-28e6ff19055b' --applicationPermissions 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --delegatedPermissions 'https://graph.microsoft.com/offline_access' --grantAdminConsent
+m365 app permission add --appId '1663767b-4172-4519-bfd1-28e6ff19055b' --applicationPermission 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --delegatedPermission 'https://graph.microsoft.com/offline_access' --grantAdminConsent
 ```
 
 ## Response

package/docs/docs/cmd/cli/cli-consent.mdx

@@ -16,7 +16,7 @@ m365 cli consent [options]
 
 ```md definition-list
 `-s, --service <service>`
-: Service for which to consent permissions. Allowed values: `VivaEngage`.
+: Service for which to consent permissions. Allowed values: `VivaEngage`, (deprecated)`yammer`.
 ```
 
 <Global />

package/docs/docs/cmd/entra/enterpriseapp/enterpriseapp-add.mdx

@@ -22,39 +22,39 @@ m365 entra sp add [options]
 ## Options
 
 ```md definition-list
-`-i, --id [id]`
-: ID of the app for which the enterprise application should be created.
+`--appId [appId]`
+: ID of the app for which the enterprise application should be created
 
-`-n, --displayName [displayName]`
-: Display name of the app for which the enterprise application should be created.
+`--appName [appName]`
+: Display name of the app for which the enterprise application should be created
 
 `--objectId [objectId]`
-: ObjectId of the app for which the enterprise application should be created.
+: ObjectId of the app for which the enterprise application should be created
 ```
 
 <Global />
 
 ## Remarks
 
-Specify either the `id`, `displayName` or `objectId`. If you specify more than one option value, the command will fail with an error.
+Specify either the `appId`, `appName` or `objectId`. If you specify more than one option value, the command will fail with an error.
 
 If you register an application in the portal, an application object as well as an enterprise application object are automatically created in your home tenant. If you register an application using CLI for Microsoft 365 or the Microsoft Graph, you'll need to create the enterprise application separately. To register/create an application using the CLI for Microsoft 365, use the [m365 entra app add](../app/app-add.mdx) command.
 
 ## Examples
 
-Creates an enterprise application for a registered Entra app with the specified id.
+Creates an enterprise application for a registered Entra app with appId _b2307a39-e878-458b-bc90-03bc578531d6_.
 
 ```sh
-m365 entra enterpriseapp add --id b2307a39-e878-458b-bc90-03bc578531d6
+m365 entra enterpriseapp add --appId b2307a39-e878-458b-bc90-03bc578531d6
 ```
 
-Creates an enterprise application for a registered Entra app with the specified displayName.
+Creates an enterprise application for a registered Entra app with appName _Microsoft Graph_.
 
 ```sh
-m365 entra enterpriseapp add --displayName "Microsoft Graph"
+m365 entra enterpriseapp add --appName "Microsoft Graph"
 ```
 
-Creates an enterprise application for a registered Entra app with the specified objectId.
+Creates an enterprise application for a registered Entra app with objectId _b2307a39-e878-458b-bc90-03bc578531d6_.
 
 ```sh
 m365 entra enterpriseapp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
@@ -172,7 +172,7 @@ m365 entra enterpriseapp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
   <TabItem value="Markdown">
 
   ```md
-  # entra enterpriseapp add --id "8da75b6a-4272-4b17-8ee1-20ba66e2b06f"
+  # entra enterpriseapp add --appId "8da75b6a-4272-4b17-8ee1-20ba66e2b06f"
 
   Date: 2023-06-02
 

package/docs/docs/cmd/entra/enterpriseapp/enterpriseapp-get.mdx

@@ -22,40 +22,40 @@ m365 entra sp get [options]
 ## Options
 
 ```md definition-list
-`-i, --id [id]`
-: ID of the application for which the enterprise application should be retrieved.
+`-i, --appId [appId]`
+: ID of the application for which the enterprise application should be retrieved
 
-`-n, --displayName [displayName]`
-: Display name of the application for which the enterprise application should be retrieved.
+`-n, --appDisplayName [appDisplayName]`
+: Display name of the application for which the enterprise application should be retrieved
 
-`--objectId [objectId]`
-: ObjectId of the application for which the enterprise application should be retrieved.
+`--appObjectId [appObjectId]`
+: ObjectId of the application for which the enterprise application should be retrieved
 ```
 
 <Global />
 
 ## Remarks
 
-Specify either the `id`, `objectId` or `displayName`. If you specify more than one option value, the command will fail with an error.
+Specify either the `appId`, `appObjectId` or `appDisplayName`. If you specify more than one option value, the command will fail with an error.
 
 ## Examples
 
-Return details about the enterprise application with the specified id.
+Return details about the enterprise application with appId _b2307a39-e878-458b-bc90-03bc578531d6_.
 
 ```sh
-m365 entra enterpriseapp get --id b2307a39-e878-458b-bc90-03bc578531d6
+m365 entra enterpriseapp get --appId b2307a39-e878-458b-bc90-03bc578531d6
 ```
 
-Return details about the enterprise application with the specified displayName.
+Return details about the _Microsoft Graph_ enterprise application.
 
 ```sh
-m365 entra enterpriseapp get --displayName "Microsoft Graph"
+m365 entra enterpriseapp get --appDisplayName "Microsoft Graph"
 ```
 
-Return details about the enterprise application with the specified ObjectId.
+Return details about the enterprise application with ObjectId _b2307a39-e878-458b-bc90-03bc578531dd_.
 
 ```sh
-m365 entra enterpriseapp get --objectId b2307a39-e878-458b-bc90-03bc578531dd
+m365 entra enterpriseapp get --appObjectId b2307a39-e878-458b-bc90-03bc578531dd
 ```
 
 ## Response
@@ -198,7 +198,7 @@ m365 entra enterpriseapp get --objectId b2307a39-e878-458b-bc90-03bc578531dd
   <TabItem value="Markdown">
 
   ```md
-  # entra enterpriseapp get --id "ac7c9b4b-83b0-4a5e-ace2-a3530162c8f8"
+  # entra enterpriseapp get --appId "ac7c9b4b-83b0-4a5e-ace2-a3530162c8f8"
 
   Date: 2023-06-02