@pnp/cli-microsoft365 7.5.0-beta.494c631 → 7.5.0-beta.c0c1edf

package/dist/utils/{aadUser.js → entraUser.js}

@@ -1,7 +1,7 @@
 import request from "../request.js";
 import { formatting } from "./formatting.js";
 const graphResource = 'https://graph.microsoft.com';
-export const aadUser = {
+export const entraUser = {
     /**
      * Retrieve the id of a user by its UPN.
      * @param upn User UPN.
@@ -20,6 +20,42 @@ export const aadUser = {
         }
         return res.value[0].id;
     },
+    /**
+     * Retrieve the IDs of users by their UPNs. There is no guarantee that the order of the returned IDs will match the order of the specified UPNs.
+     * @param upns Array of user UPNs.
+     * @returns Array of user IDs.
+     */
+    async getUserIdsByUpns(upns) {
+        const userIds = [];
+        for (let i = 0; i < upns.length; i += 20) {
+            const upnsChunk = upns.slice(i, i + 20);
+            const requestOptions = {
+                url: `${graphResource}/v1.0/$batch`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    requests: upnsChunk.map((upn, index) => ({
+                        id: index + 1,
+                        method: 'GET',
+                        url: `/users/${formatting.encodeQueryParameter(upn)}?$select=id`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        }
+                    }))
+                }
+            };
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 200) {
+                    throw Error(`The specified user with user name '${upnsChunk[response.id - 1]}' does not exist.`);
+                }
+                userIds.push(response.body.id);
+            }
+        }
+        return userIds;
+    },
     /**
     * Retrieve the ID of a user by its email.
     * @param mail User email.
@@ -54,4 +90,4 @@ export const aadUser = {
         return res.userPrincipalName;
     }
 };
-//# sourceMappingURL=aadUser.js.map
+//# sourceMappingURL=entraUser.js.map

package/dist/utils/spo.js

@@ -8,7 +8,7 @@ import request from "../request.js";
 import { formatting } from './formatting.js';
 import { odata } from './odata.js';
 import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js';
-import { aadGroup } from './aadGroup.js';
+import { entraGroup } from './entraGroup.js';
 import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js';
 export const spo = {
     getRequestDigest(siteUrl) {
@@ -996,7 +996,7 @@ export const spo = {
                     promises.push(request.post(requestOptions));
                 }
                 if (typeof isPublic !== 'undefined') {
-                    promises.push(aadGroup.setGroup(groupId, (isPublic === false), logger, verbose));
+                    promises.push(entraGroup.setGroup(groupId, (isPublic === false), logger, verbose));
                 }
                 if (typeof owners !== 'undefined') {
                     promises.push(spo.setGroupifiedSiteOwners(spoAdminUrl, groupId, owners, logger, verbose));
@@ -1312,6 +1312,28 @@ export const spo = {
             responseType: 'json'
         };
         await request.post(requestOptions);
+    },
+    /**
+     * Retrieves the site ID for a given web URL.
+     * @param webUrl The web URL for which to retrieve the site ID.
+     * @param logger The logger object.
+     * @param verbose Set for verbose logging
+     * @returns A promise that resolves to the site ID.
+     */
+    async getSiteId(webUrl, logger, verbose) {
+        if (verbose && logger) {
+            logger.logToStderr(`Getting site id for URL: ${webUrl}...`);
+        }
+        const url = new URL(webUrl);
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/sites/${formatting.encodeQueryParameter(url.host)}:${url.pathname}?$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const site = await request.get(requestOptions);
+        return site.id;
     }
 };
 //# sourceMappingURL=spo.js.map

package/dist/utils/urlUtil.js

@@ -166,6 +166,37 @@ export const urlUtil = {
             relativeUrl = relativeUrl.substring(0, relativeUrl.length - 1);
         }
         return `${baseUrl}/${relativeUrl}`;
+    },
+    /**
+     * Get the absolute URL from the target SharePoint URL.
+     * @param {string} webUrl - The base web URL.
+     * @param {string} url - The target SharePoint URL.
+     * @returns {string} - The target site absolute URL.
+     *
+     * Example Scenarios:
+     * - webUrl = "https://contoso.sharepoint.com" and targetUrl = "/teams/sales/Shared Documents/temp/123/234",
+     *    returns "https://contoso.sharepoint.com/teams/sales".
+     * - webUrl = "https://contoso.sharepoint.com" and targetUrl = "https://contoso-my.sharepoint.com/personal/john_contoso_onmicrosoft_com/Documents/123",
+     *    returns "https://contoso-my.sharepoint.com/personal/john_contoso_onmicrosoft_com".
+     * - webUrl = "https://contoso.sharepoint.com/teams/sales" and targetUrl = "/Shared Documents/temp",
+     *    returns "https://contoso.sharepoint.com".
+     * - webUrl = "https://contoso.sharepoint.com" and targetUrl = "/teams/sales/Shared Documents/temp",
+     *    returns "https://contoso.sharepoint.com/teams/sales".
+    */
+    getTargetSiteAbsoluteUrl(webUrl, url) {
+        const fullUrl = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        // Pattern to match SharePoint URLs
+        const urlPattern = /https:\/\/[\w\-]+\.sharepoint\.com\/(teams|sites|personal)\/([\w\-]+)/;
+        const match = fullUrl.match(urlPattern);
+        if (match) {
+            // If a match is found, return the matched URL
+            return match[0];
+        }
+        else {
+            // Extract the root URL
+            const rootUrl = new URL(fullUrl);
+            return rootUrl.origin;
+        }
     }
 };
 //# sourceMappingURL=urlUtil.js.map

package/dist/utils/validation.js

@@ -21,6 +21,10 @@ export const validation = {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+(@thread\.v2|@unq\.gbl\.spaces)$/i);
         return guidRegEx.test(guid);
     },
+    isValidUserPrincipalNameArray(upns) {
+        const invalidGuid = upns.find(upn => !this.isValidUserPrincipalName(upn));
+        return invalidGuid || true;
+    },
     isValidUserPrincipalName(upn) {
         const upnRegEx = new RegExp(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i);
         // verify if the upn is a valid upn. @meusername will be replaced in a later stage with the actual username of the logged in user
@@ -317,6 +321,10 @@ export const validation = {
             return true;
         }
         return false;
+    },
+    isValidMailNickname(mailNickname) {
+        const mailNicknameRegEx = new RegExp(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]*$/i);
+        return mailNicknameRegEx.test(mailNickname);
     }
 };
 //# sourceMappingURL=validation.js.map

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

@@ -16,25 +16,25 @@ m365 cli consent [options]
 
 ```md definition-list
 `-s, --service <service>`
-: Service for which to consent permissions. Allowed values: `yammer`
+: Service for which to consent permissions. Allowed values: `VivaEngage`, (deprecated)`yammer`.
 ```
 
 <Global />
 
 ## Remarks
 
-Using the `cli consent` command you can consent additional permissions for the Azure AD application used by the CLI for Microsoft 365. This is for example necessary to use Yammer commands, which require the Yammer API permission that isn't granted to the CLI by default.
+Using the `cli consent` command you can consent additional permissions for the Azure AD application used by the CLI for Microsoft 365. This is for example necessary to use Viva Engage commands, which require the Viva Engage API permission that isn't granted to the CLI by default.
 
 After executing the command, the CLI for Microsoft 365 will present you with a URL that you need to open in the web browser in order to consent the permissions for the selected Microsoft 365 service.
 
-To simplify things, rather than wondering which permissions you should grant for which CLI commands, this command allows you to easily grant all the necessary permissions for using commands for the specified Microsoft 365 service, like Yammer.
+To simplify things, rather than wondering which permissions you should grant for which CLI commands, this command allows you to easily grant all the necessary permissions for using commands for the specified Microsoft 365 service, like Viva Engage.
 
 ## Examples
 
-Consent permissions to the Yammer API
+Consent permissions to the Viva Engage API
 
 ```sh
-m365 cli consent --service yammer
+m365 cli consent --service VivaEngage
 ```
 
 ## Response
@@ -43,28 +43,28 @@ m365 cli consent --service yammer
   <TabItem value="JSON">
 
   ```json
-  "To consent permissions for executing yammer commands, navigate in your web browser to https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&scope=https%3A%2F%2Fapi.yammer.com%2Fuser_impersonation"
+  "To consent permissions for executing VivaEngage commands, navigate in your web browser to https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&scope=https%3A%2F%2Fapi.yammer.com%2Fuser_impersonation"
   ```
 
   </TabItem>
   <TabItem value="Text">
 
   ```text
-  To consent permissions for executing yammer commands, navigate in your web browser to https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&scope=https%3A%2F%2Fapi.yammer.com%2Fuser_impersonation
+  To consent permissions for executing VivaEngage commands, navigate in your web browser to https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&scope=https%3A%2F%2Fapi.yammer.com%2Fuser_impersonation
   ```
 
   </TabItem>
   <TabItem value="CSV">
 
   ```csv
-  To consent permissions for executing yammer commands, navigate in your web browser to https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&scope=https%3A%2F%2Fapi.yammer.com%2Fuser_impersonation
+  To consent permissions for executing VivaEngage commands, navigate in your web browser to https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&scope=https%3A%2F%2Fapi.yammer.com%2Fuser_impersonation
   ```
 
   </TabItem>
   <TabItem value="Markdown">
 
   ```md
-  To consent permissions for executing yammer commands, navigate in your web browser to https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&scope=https%3A%2F%2Fapi.yammer.com%2Fuser_impersonation
+  To consent permissions for executing VivaEngage commands, navigate in your web browser to https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&scope=https%3A%2F%2Fapi.yammer.com%2Fuser_impersonation
   ```
 
   </TabItem>

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-member-add.mdx

@@ -1,6 +1,4 @@
 import Global from '/docs/cmd/_global.mdx';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
 
 # entra administrativeunit member add
 
@@ -94,6 +92,10 @@ Add a single device specified by name to an administrative unit specified by nam
 m365 entra administrativeunit member add --administrativeUnitName 'Marketing Division' --deviceName 'JohnDoe-PC'
 ```
 
+## Response 
+
+The command won't return a response on success.
+
 ## More information
 
-- Administrative units: https://learn.microsoft.com/entra/identity/role-based-access-control/administrative-units
+- Administrative units: https://learn.microsoft.com/entra/identity/role-based-access-control/administrative-units

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-member-remove.mdx

@@ -0,0 +1,107 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# entra administrativeunit member remove
+
+Removes a member (user, group, or device) from an administrative unit
+
+## Usage
+
+```sh
+m365 entra administrativeunit member remove [options]
+```
+
+## options
+
+```md definition-list
+`-i, --id [id]`
+: The id of the member to be removed. Specify either `id`, `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--userId [userId]`
+: The id of the user to be removed. Specify either `id`, `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--userName [userName]`
+: The user principal name (UPN) of the user to be removed. Specify either `id`, `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--groupId [groupId]`
+: The id of the group to be removed. Specify either `id`, `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--groupName [groupName]`
+: The name of the group to be removed. Specify either `id`, `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--deviceId [deviceId]`
+: The id of the device to be removed. Specify either `id`, `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--deviceName [deviceName]`
+: The name of the device to be removed. Specify either `id`, `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--administrativeUnitId [administrativeUnitId]`
+: The id of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName` but not both.
+
+`--administrativeUnitName [administrativeUnitName]`
+: The name of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName` but not both.
+
+`-f, --force`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be either **Global Administrator** or **Privileged Role Administrator**.
+
+:::
+
+## Examples
+
+Remove a member specified by id from an administrative unit specified by id
+
+```sh
+m365 entra administrativeunit member remove --id 64131a70-beb9-4ccb-b590-4401e58446ec --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+```
+
+Remove a user specified by id from an administrative unit specified by id
+
+```sh
+m365 entra administrativeunit member remove --userId 64131a70-beb9-4ccb-b590-4401e58446ec --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+```
+
+Remove a group specified by id from an administrative unit specified by id
+
+```sh
+m365 entra administrativeunit member remove --groupId b2307a39-e878-458b-bc90-03bc578531d6 --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+```
+
+Remove a device specified by id from an administrative unit specified by id
+
+```sh
+m365 entra administrativeunit member remove --deviceId 810c84a8-4a9e-49e6-bf7d-12d183f40d01 --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+```
+
+Remove a user specified by UPN from an administrative unit specified by name
+
+```sh
+m365 entra administrativeunit member remove --userName john.doe@contoso.com --administrativeUnitName 'Marketing Division'
+```
+
+Remove a group specified by name from an administrative unit specified by id
+
+```sh
+m365 entra administrativeunit member remove --groupName 'Marketing Group' --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+```
+
+Remove a device specified by name from an administrative unit specified by name
+
+```sh
+m365 entra administrativeunit member remove --deviceName 'JohnDoe-PC' --administrativeUnitName 'Marketing Division'
+```
+
+## Response
+
+The command won't return a response on success
+
+## More information
+
+- [Administrative units](https://learn.microsoft.com/entra/identity/role-based-access-control/administrative-units)

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

@@ -16,6 +16,7 @@ m365 entra app add [options]
 
 ```sh
 m365 aad app add [options]
+m365 entra appregistration add [options]
 ```
 
 ## Options
@@ -109,7 +110,7 @@ After creating the Entra app registration, this command returns the app ID and o
 
 If you want to store the information about the created Entra app registration, use the `--save` option. This is useful when you build solutions connected to Microsoft 365 and want to easily manage app registrations used with your solution. When you use the `--save` option, after you create the app registration, the command will write its ID and name to the `.m365rc.json` file in the current directory. If the file already exists, it will add the information about the to it, allowing you to track multiple apps. If the file doesn't exist, the command will create it.
 
-When specifying `--grantAdminConsent` option, a service principal will be created for the app registration.
+When specifying `--grantAdminConsent` option, an enterprise application will be created for the app registration.
 
 ## Examples
 

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

@@ -16,6 +16,7 @@ m365 entra app get [options]
 
 ```sh
 m365 aad app get [options]
+m365 entra appregistration get [options]
 ```
 
 ## Options

package/docs/docs/cmd/entra/app/app-list.mdx

@@ -16,6 +16,7 @@ m365 entra app list [options]
 
 ```sh
 m365 aad app list [options]
+m365 entra appregistration list [options]
 ```
 
 ## Options

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

@@ -16,6 +16,7 @@ m365 entra app permission add [options]
 
 ```sh
 m365 aad app permission add [options]
+m365 entra appregistration permission add [options]
 ```
 
 ## Options
@@ -60,9 +61,9 @@ m365 entra app permission add --appObjectId 'e0306bb2-bf0b-4cc5-a845-a0b2cf11f69
 Grant multiple app-only permissions to an Entra (Azure AD) app specified by client id and grant admin consent
 
 ```sh
-m365 entra app permission add --appId 'f1417aa3-bf0b-4cc5-a845-a0b2cf11f690' --applicationPermissions 'https://graph.microsoft.com/Sites.FullControl.All https://microsoft.sharepoint-df.com/Sites.FullControl.All' --grandAdminConsent
+m365 entra app permission add --appId 'f1417aa3-bf0b-4cc5-a845-a0b2cf11f690' --applicationPermissions 'https://graph.microsoft.com/Sites.FullControl.All https://microsoft.sharepoint-df.com/Sites.FullControl.All' --grantAdminConsent
 ```
 
 ## Response
 
-The command won't return a response on success.
+The command won't return a response on success.

package/docs/docs/cmd/entra/app/app-permission-list.mdx

@@ -0,0 +1,105 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# entra app permission list
+
+Lists the application and delegated permissions for a specified Entra Application Registration
+
+## Usage
+
+```sh
+m365 entra app permission list [options]
+```
+
+## Alias
+
+```sh
+m365 aad app permission list [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --appId [appId]`
+: Client ID of the Application Registration to retrieve the permissions for. Specify `appId` or `appObjectId` but not both.
+
+`--appObjectId [appObjectId]`
+: Object ID of the Application Registration to retrieve the permissions for. Specify `appId` or `appObjectId` but not both.
+
+`--type [type]`
+: The type of permissions to retrieve. Allowed values: `delegated`, `application`, `all`. Defaults to `all`.
+```
+
+<Global />
+
+## Remarks
+
+For best performance use the `objectId` option to reference the Entra application registration to get. If you use `appId`, this command will first need to find the corresponding object ID for that application.
+
+## Examples
+
+Retrieves all permissions for an Entra app registration
+
+```sh
+m365 entra app permission list --appId 'f1417aa3-bf0b-4cc5-a845-a0b2cf11f690'
+```
+
+Retrieves all delegated permissions for an Entra app registration
+
+```sh
+m365 entra app permission list --appId 'f1417aa3-bf0b-4cc5-a845-a0b2cf11f690' --type delegated
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  [
+    {
+      "resource": "Microsoft Graph",
+      "resourceId": "00000003-0000-0000-c000-000000000000",
+      "permission": "User.Read",
+      "type": "Delegated"
+    }
+  ]
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  resource                      resourceId                            permission                         type
+  ----------------------------  ------------------------------------  ---------------------------------  -----------
+  Microsoft Graph               00000003-0000-0000-c000-000000000000  User.Read                          Delegated
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  resource,resourceId,permission,type
+  Microsoft Graph,00000003-0000-0000-c000-000000000000,User.Read,Delegated
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # entra app permission list --appId "2bf26ae1-9be3-425f-a393-5fe8390e3a36"
+
+  Date: 27/12/2023
+
+  Property | Value
+  ---------|-------
+  resource | Microsoft Graph
+  resourceId | 00000003-0000-0000-c000-000000000000
+  permission | User.Read
+  type | Delegated
+  ```
+
+  </TabItem>
+</Tabs>
+

package/docs/docs/cmd/entra/app/app-remove.mdx

@@ -14,6 +14,7 @@ m365 entra app remove [options]
 
 ```sh
 m365 aad app remove [options]
+m365 entra appregistration remove [options]
 ```
 
 ## Options

package/docs/docs/cmd/entra/app/app-role-add.mdx

@@ -14,6 +14,7 @@ m365 entra app role add [options]
 
 ```sh
 m365 aad app role add [options]
+m365 entra appregistration role add [options]
 ```
 
 ## Options

package/docs/docs/cmd/entra/app/app-role-list.mdx

@@ -16,6 +16,7 @@ m365 entra app role list [options]
 
 ```sh
 m365 aad app role list [options]
+m365 entra appregistration role list [options]
 ```
 
 ## Options

package/docs/docs/cmd/entra/app/app-role-remove.mdx

@@ -14,6 +14,7 @@ m365 entra app role remove [options]
 
 ```sh
 m365 aad app role remove [options]
+m365 entra appregistration role remove [options]
 ```
 
 ## Options

package/docs/docs/cmd/entra/app/app-set.mdx

@@ -14,6 +14,7 @@ m365 entra app set [options]
 
 ```sh
 m365 aad app set [options]
+m365 entra appregistration set [options]
 ```
 
 ## Options

package/docs/docs/cmd/entra/{sp/sp-add.mdx → enterpriseapp/enterpriseapp-add.mdx}

@@ -2,33 +2,34 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# entra sp add
+# entra enterpriseapp add
 
-Adds a service principal to a registered Entra app
+Creates an enterprise application (or service principal) for a registered Entra app
 
 ## Usage
 
 ```sh
-m365 entra sp add [options]
+m365 entra enterpriseapp add [options]
 ```
 
 ## Alias
 
 ```sh
 m365 aad sp add [options]
+m365 entra sp add [options]
 ```
 
 ## Options
 
 ```md definition-list
 `--appId [appId]`
-: ID of the application to which the service principal should be added
+: ID of the app for which the enterprise application should be created
 
 `--appName [appName]`
-: Display name of the application to which the service principal should be added
+: Display name of the app for which the enterprise application should be created
 
 `--objectId [objectId]`
-: ObjectId of the application to which the service principal should be added
+: ObjectId of the app for which the enterprise application should be created
 ```
 
 <Global />
@@ -37,26 +38,26 @@ m365 aad sp add [options]
 
 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 a service principal 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 service principal separately. To register/create an application using the CLI for Microsoft 365, use the [m365 entra app add](../app/app-add.mdx) command.
+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
 
-Adds a service principal to a registered Entra app with appId _b2307a39-e878-458b-bc90-03bc578531d6_.
+Creates an enterprise application for a registered Entra app with appId _b2307a39-e878-458b-bc90-03bc578531d6_.
 
 ```sh
-m365 entra sp add --appId b2307a39-e878-458b-bc90-03bc578531d6
+m365 entra enterpriseapp add --appId b2307a39-e878-458b-bc90-03bc578531d6
 ```
 
-Adds a service principal to a registered Entra app with appName _Microsoft Graph_.
+Creates an enterprise application for a registered Entra app with appName _Microsoft Graph_.
 
 ```sh
-m365 entra sp add --appName "Microsoft Graph"
+m365 entra enterpriseapp add --appName "Microsoft Graph"
 ```
 
-Adds a service principal to a registered Entra app with objectId _b2307a39-e878-458b-bc90-03bc578531d6_.
+Creates an enterprise application for a registered Entra app with objectId _b2307a39-e878-458b-bc90-03bc578531d6_.
 
 ```sh
-m365 entra sp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
+m365 entra enterpriseapp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
 ```
 
 ## Response
@@ -171,7 +172,7 @@ m365 entra sp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
   <TabItem value="Markdown">
 
   ```md
-  # entra sp add --appId "8da75b6a-4272-4b17-8ee1-20ba66e2b06f"
+  # entra enterpriseapp add --appId "8da75b6a-4272-4b17-8ee1-20ba66e2b06f"
 
   Date: 2023-06-02
 
@@ -195,5 +196,5 @@ m365 entra sp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
 
 ## More information
 
-- Application and service principal objects in Entra ID (Azure AD): [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
+- Application and enterprise application objects in Entra ID (Azure AD): [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
 - Create servicePrincipal: [https://learn.microsoft.com/graph/api/serviceprincipal-post-serviceprincipals?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/serviceprincipal-post-serviceprincipals?view=graph-rest-1.0)