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

package/dist/m365/spo/commands/user/user-remove.js

@@ -5,11 +5,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators, _SpoUserRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
+import { spo } from '../../../../utils/spo.js';
 import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+;
 class SpoUserRemoveCommand extends SpoCommand {
     get name() {
         return commands.USER_REMOVE;
@@ -40,13 +43,58 @@ class SpoUserRemoveCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Removing user from  subsite ${options.webUrl} ...`);
         }
-        let requestUrl = `${encodeURI(options.webUrl)}/_api/web/siteusers/`;
-        if (options.id) {
-            requestUrl += `removebyid(${options.id})`;
+        try {
+            let requestUrl = `${encodeURI(options.webUrl)}/_api/web/siteusers/`;
+            if (options.id) {
+                requestUrl += `removebyid(${options.id})`;
+            }
+            else if (options.loginName) {
+                requestUrl += `removeByLoginName('${formatting.encodeQueryParameter(options.loginName)}')`;
+            }
+            else if (options.email) {
+                const user = await spo.getUserByEmail(options.webUrl, options.email, logger, this.verbose);
+                requestUrl += `removebyid(${user.Id})`;
+            }
+            else if (options.userName) {
+                const user = await this.getUser(options);
+                if (!user) {
+                    throw new Error(`User not found: ${options.userName}`);
+                }
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing user ${user.Title} ...`);
+                }
+                requestUrl += `removebyid(${user.Id})`;
+            }
+            else if (options.entraGroupId || options.entraGroupName) {
+                const entraGroup = await this.getEntraGroup(options);
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing entra group ${entraGroup?.displayName} ...`);
+                }
+                //for entra groups, M365 groups have an associated email and security groups don't
+                if (entraGroup?.mail) {
+                    //M365 group is prefixed with c:0o.c|federateddirectoryclaimprovider
+                    requestUrl += `removeByLoginName('c:0o.c|federateddirectoryclaimprovider|${entraGroup.id}')`;
+                }
+                else {
+                    //security group is prefixed with c:0t.c|tenant
+                    requestUrl += `removeByLoginName('c:0t.c|tenant|${entraGroup?.id}')`;
+                }
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
         }
-        else if (options.loginName) {
-            requestUrl += `removeByLoginName('${formatting.encodeQueryParameter(options.loginName)}')`;
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
+    }
+    async getUser(options) {
+        const requestUrl = `${options.webUrl}/_api/web/siteusers?$filter=UserPrincipalName eq ('${formatting.encodeQueryParameter(options.userName)}')`;
         const requestOptions = {
             url: requestUrl,
             headers: {
@@ -54,20 +102,23 @@ class SpoUserRemoveCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        try {
-            await request.post(requestOptions);
-        }
-        catch (err) {
-            this.handleRejectedODataJsonPromise(err);
-        }
+        const userInstance = await request.get(requestOptions);
+        return userInstance.value[0];
+    }
+    async getEntraGroup(options) {
+        return options.entraGroupId ? await entraGroup.getGroupById(options.entraGroupId) : await entraGroup.getGroupByDisplayName(options.entraGroupName);
     }
 }
 _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelemetry = function _SpoUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            loginName: (!(!args.options.loginName)).toString(),
-            force: (!(!args.options.force)).toString()
+            id: typeof args.options.id !== 'undefined',
+            loginName: typeof args.options.loginName !== 'undefined',
+            email: typeof args.options.email !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
+            force: !!args.options.force
         });
     });
 }, _SpoUserRemoveCommand_initOptions = function _SpoUserRemoveCommand_initOptions() {
@@ -77,15 +128,41 @@ _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelem
         option: '-i, --id [id]'
     }, {
         option: '--loginName [loginName]'
+    }, {
+        option: '--email [email]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '-f, --force'
     });
 }, _SpoUserRemoveCommand_initValidators = function _SpoUserRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
-        return validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.id && isNaN(parseInt(args.options.id))) {
+            return `Specified id ${args.options.id} is not a number`;
+        }
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `${args.options.entraId} is not a valid GUID.`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName.`;
+        }
+        if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
+            return `${args.options.email} is not a valid email.`;
+        }
+        return true;
     });
 }, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'loginName'] });
+    this.optionSets.push({
+        options: ['id', 'loginName', 'email', 'userName', 'entraGroupId', 'entraGroupName']
+    });
 };
 export default new SpoUserRemoveCommand();
 //# sourceMappingURL=user-remove.js.map

package/dist/m365/spo/commands.js

@@ -91,6 +91,7 @@ export default {
     FOLDER_MOVE: `${prefix} folder move`,
     FOLDER_REMOVE: `${prefix} folder remove`,
     FOLDER_RENAME: `${prefix} folder rename`,
+    FOLDER_SET: `${prefix} folder set`,
     FOLDER_RETENTIONLABEL_ENSURE: `${prefix} folder retentionlabel ensure`,
     FOLDER_RETENTIONLABEL_REMOVE: `${prefix} folder retentionlabel remove`,
     FOLDER_ROLEASSIGNMENT_REMOVE: `${prefix} folder roleassignment remove`,

package/dist/m365/teams/commands/tab/tab-get.js

@@ -78,7 +78,7 @@ class TeamsTabGetCommand extends GraphCommand {
             this.teamId = await this.getTeamId(args);
             this.channelId = await this.getChannelId(args);
             const tabId = await this.getTabId(args);
-            const endpoint = `${this.resource}/v1.0/teams/${formatting.encodeQueryParameter(this.teamId)}/channels/${formatting.encodeQueryParameter(this.channelId)}/tabs/${formatting.encodeQueryParameter(tabId)}`;
+            const endpoint = `${this.resource}/v1.0/teams/${formatting.encodeQueryParameter(this.teamId)}/channels/${formatting.encodeQueryParameter(this.channelId)}/tabs/${formatting.encodeQueryParameter(tabId)}?$expand=teamsApp`;
             const requestOptions = {
                 url: endpoint,
                 headers: {

package/dist/utils/spo.js

@@ -490,7 +490,7 @@ export const spo = {
         return result.CorporateCatalogUrl;
     },
     /**
-     * Retrieves the Azure AD ID from a SP user.
+     * Retrieves the Microsoft Entra ID from a SP user.
      * @param webUrl Web url
      * @param id The Id of the user
      */

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

@@ -4,7 +4,7 @@ import TabItem from '@theme/TabItem';
 
 # app get
 
-Retrieves information about the current Azure AD app
+Retrieves information about the current Microsoft Entra app
 
 ## Usage
 
@@ -16,26 +16,26 @@ m365 app get [options]
 
 ```md definition-list
 `--appId [appId]`
-: Client ID of the Azure AD app registered in the .m365rc.json file to retrieve information for.
+: Client ID of the Microsoft Entra app registered in the .m365rc.json file to retrieve information for.
 ```
 
 <Global />
 
 ## Remarks
 
-Use this command to quickly look up information for the Azure AD application registration registered in the .m365rc.json file in your current project (folder).
+Use this command to quickly look up information for the Microsoft Entra application registration registered in the .m365rc.json file in your current project (folder).
 
 If you have multiple apps registered in your .m365rc.json file, you can specify the app for which you'd like to retrieve permissions using the `--appId` option. If you don't specify the app using the `--appId` option, you'll be prompted to select one of the applications from your .m365rc.json file.
 
 ## Examples
 
-Retrieve information about your current Azure AD app.
+Retrieve information about your current Microsoft Entra app.
 
 ```sh
 m365 app get
 ```
 
-Retrieve information about the Azure AD app with client ID specified in the _.m365rc.json_ file.
+Retrieve information about the Microsoft Entra app with client ID specified in the _.m365rc.json_ file.
 
 ```sh
 m365 app get --appId e23d235c-fcdf-45d1-ac5f-24ab2ee0695d
@@ -54,7 +54,7 @@ m365 app get --appId e23d235c-fcdf-45d1-ac5f-24ab2ee0695d
     "applicationTemplateId": null,
     "disabledByMicrosoftStatus": null,
     "createdDateTime": "2022-10-28T21:20:57Z",
-    "displayName": "My AAD app",
+    "displayName": "My Microsoft Entra app",
     "description": null,
     "groupMembershipClaims": null,
     "identifierUris": [],
@@ -167,7 +167,7 @@ m365 app get --appId e23d235c-fcdf-45d1-ac5f-24ab2ee0695d
   deletedDateTime           : null
   description               : null
   disabledByMicrosoftStatus : null
-  displayName               : My AAD app
+  displayName               : My Microsoft Entra app
   groupMembershipClaims     : null
   id                        : b3241f2a-6551-43d4-a72f-0d02ccfeb77f
   identifierUris            : []
@@ -197,7 +197,7 @@ m365 app get --appId e23d235c-fcdf-45d1-ac5f-24ab2ee0695d
 
   ```csv
   id,deletedDateTime,appId,applicationTemplateId,disabledByMicrosoftStatus,createdDateTime,displayName,description,groupMembershipClaims,identifierUris,isDeviceOnlyAuthSupported,isFallbackPublicClient,notes,publisherDomain,serviceManagementReference,signInAudience,tags,tokenEncryptionKeyId,samlMetadataUrl,defaultRedirectUri,certification,optionalClaims,addIns,api,appRoles,info,keyCredentials,parentalControlSettings,passwordCredentials,publicClient,requiredResourceAccess,verifiedPublisher,web,spa
-  b3241f2a-6551-43d4-a72f-0d02ccfeb77f,,02f9ff8c-b79e-4552-bdda-4facd74d6df1,,,2022-10-28T21:20:57Z,My AAD app,,,[],,,,contoso.onmicrosoft.com,,AzureADMyOrg,[],,,,,,[],"{""acceptMappedClaims"":null,""knownClientApplications"":[],""requestedAccessTokenVersion"":null,""oauth2PermissionScopes"":[],""preAuthorizedApplications"":[]}","[{""allowedMemberTypes"":[""User""],""description"":""Managers"",""displayName"":""Managers"",""id"":""d7c46856-8a66-485a-9047-098eba08b9a3"",""isEnabled"":true,""origin"":""Application"",""value"":""managers""}]","{""logoUrl"":null,""marketingUrl"":null,""privacyStatementUrl"":null,""supportUrl"":null,""termsOfServiceUrl"":null}",[],"{""countriesBlockedForMinors"":[],""legalAgeGroupRule"":""Allow""}",[],"{""redirectUris"":[]}","[{""resourceAppId"":""b55b276d-2b09-4ad2-8de5-f09cf24ffba9"",""resourceAccess"":[{""id"":""162b1576-a2b2-458d-b7b9-04481911b4ef"",""type"":""Role""}]},{""resourceAppId"":""00000005-0000-0ff1-ce00-000000000000"",""resourceAccess"":[{""id"":""8e5870bb-8808-44dc-8e10-c509ed919ddd"",""type"":""Scope""},{""id"":""5db81a03-0de0-432b-b31e-71d57c8d2e0b"",""type"":""Scope""}]}]","{""displayName"":null,""verifiedPublisherId"":null,""addedDateTime"":null}","{""homePageUrl"":null,""logoutUrl"":null,""redirectUris"":[],""implicitGrantSettings"":{""enableAccessTokenIssuance"":false,""enableIdTokenIssuance"":false},""redirectUriSettings"":[]}","{""redirectUris"":[]}"
+  b3241f2a-6551-43d4-a72f-0d02ccfeb77f,,02f9ff8c-b79e-4552-bdda-4facd74d6df1,,,2022-10-28T21:20:57Z,My Microsoft Entra app,,,[],,,,contoso.onmicrosoft.com,,AzureADMyOrg,[],,,,,,[],"{""acceptMappedClaims"":null,""knownClientApplications"":[],""requestedAccessTokenVersion"":null,""oauth2PermissionScopes"":[],""preAuthorizedApplications"":[]}","[{""allowedMemberTypes"":[""User""],""description"":""Managers"",""displayName"":""Managers"",""id"":""d7c46856-8a66-485a-9047-098eba08b9a3"",""isEnabled"":true,""origin"":""Application"",""value"":""managers""}]","{""logoUrl"":null,""marketingUrl"":null,""privacyStatementUrl"":null,""supportUrl"":null,""termsOfServiceUrl"":null}",[],"{""countriesBlockedForMinors"":[],""legalAgeGroupRule"":""Allow""}",[],"{""redirectUris"":[]}","[{""resourceAppId"":""b55b276d-2b09-4ad2-8de5-f09cf24ffba9"",""resourceAccess"":[{""id"":""162b1576-a2b2-458d-b7b9-04481911b4ef"",""type"":""Role""}]},{""resourceAppId"":""00000005-0000-0ff1-ce00-000000000000"",""resourceAccess"":[{""id"":""8e5870bb-8808-44dc-8e10-c509ed919ddd"",""type"":""Scope""},{""id"":""5db81a03-0de0-432b-b31e-71d57c8d2e0b"",""type"":""Scope""}]}]","{""displayName"":null,""verifiedPublisherId"":null,""addedDateTime"":null}","{""homePageUrl"":null,""logoutUrl"":null,""redirectUris"":[],""implicitGrantSettings"":{""enableAccessTokenIssuance"":false,""enableIdTokenIssuance"":false},""redirectUriSettings"":[]}","{""redirectUris"":[]}"
   ```
 
   </TabItem>
@@ -208,14 +208,14 @@ m365 app get --appId e23d235c-fcdf-45d1-ac5f-24ab2ee0695d
 
   Date: 5/29/2023
 
-  ## My AAD app (b3241f2a-6551-43d4-a72f-0d02ccfeb77f)
+  ## My Microsoft Entra app (b3241f2a-6551-43d4-a72f-0d02ccfeb77f)
 
   Property | Value
   ---------|-------
   id | b3241f2a-6551-43d4-a72f-0d02ccfeb77f
   appId | 02f9ff8c-b79e-4552-bdda-4facd74d6df1
   createdDateTime | 2022-10-28T21:20:57Z
-  displayName | My AAD app
+  displayName | My Microsoft Entra app
   publisherDomain | contoso.onmicrosoft.com
   signInAudience | AzureADMyOrg
   ```

package/docs/docs/cmd/app/app-open.mdx

@@ -4,7 +4,7 @@ import TabItem from '@theme/TabItem';
 
 # app open
 
-Returns deep link of the current AD app to open the Azure portal on the Azure AD app registration management page.
+Opens Microsoft Entra app in the Microsoft Entra ID portal
 
 ## Usage
 
@@ -16,10 +16,10 @@ m365 app open [options]
 
 ```md definition-list
 `--appId [appId]`
-: Optional Application (client) ID of the Azure AD application registration to open. Uses the app from the `.m365rc.json` file corresponding to the `appId`. If multiple apps are available, this will evade the prompt to choose an app. If the `appId` is not available in the list of apps, an error is thrown.
+: Optional Application (client) ID of the Microsoft Entra application registration to open. Uses the app from the `.m365rc.json` file corresponding to the `appId`. If multiple apps are available, this will evade the prompt to choose an app. If the `appId` is not available in the list of apps, an error is thrown.
 
 `--preview`
-: Use to open the url of the Azure AD preview portal.
+: Use to open the url of the Microsoft Entra ID preview portal.
 ```
 
 <Global />
@@ -32,19 +32,19 @@ Gets the app from the `.m365rc.json` file in the current directory. If the `--ap
 
 ## Examples
 
-Prints the URL to the Azure AD application registration management page on the Azure Portal. 
+Prints the URL to the Microsoft Entra application registration management page on the Azure Portal. 
 
 ```sh
 m365 app open
 ```
 
-Prints the url of the Azure AD application registration management page on the preview Azure Portal.
+Prints the url of the Microsoft Entra application registration management page on the preview Azure Portal.
 
 ```sh
 m365 app open --preview
 ```
 
-Prints the URL to the Azure AD application registration management page on the Azure Portal, evading a possible choice prompt in the case of multiple saved apps in the `.m365rc.json` file. 
+Prints the URL to the Microsoft Entra application registration management page on the Azure Portal, evading a possible choice prompt in the case of multiple saved apps in the `.m365rc.json` file. 
 
 ```sh
 m365 app open --appId d75be2e1-0204-4f95-857d-51a37cf40be8 

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

@@ -2,7 +2,7 @@ import Global from '/docs/cmd/_global.mdx';
 
 # app permission add
 
-Adds the specified application and/or delegated permissions to the current AAD app API permissions
+Adds the specified application and/or delegated permissions to the current Microsoft Entra app API permissions
 
 ## Usage
 
@@ -14,7 +14,7 @@ m365 app permission add [options]
 
 ```md definition-list
 `--appId [appId]`
-: Client ID of the Azure AD app registered in the .m365rc.json file to retrieve API permissions for.
+: Client ID of the Microsoft Entra app registered in the .m365rc.json file to retrieve API permissions for.
 
 `--applicationPermission [applicationPermission]`
 : Space-separated list of application permissions to add.

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

@@ -4,7 +4,7 @@ import TabItem from '@theme/TabItem';
 
 # app permission list
 
-Lists API permissions for the current AAD app
+Lists API permissions for the current Microsoft Entra app
 
 ## Usage
 
@@ -16,26 +16,26 @@ m365 app permission list [options]
 
 ```md definition-list
 `--appId [appId]`
-: Client ID of the Azure AD app registered in the .m365rc.json file to retrieve API permissions for.
+: Client ID of the Microsoft Entra app registered in the .m365rc.json file to retrieve API permissions for.
 ```
 
 <Global />
 
 ## Remarks
 
-Use this command to quickly look up API permissions for the Azure AD application registration registered in the _.m365rc.json_ file in your current project (folder).
+Use this command to quickly look up API permissions for the Microsoft Entra application registration registered in the _.m365rc.json_ file in your current project (folder).
 
 If you have multiple apps registered in your .m365rc.json file, you can specify the app for which you'd like to retrieve permissions using the `--appId` option. If you don't specify the app using the `--appId` option, you'll be prompted to select one of the applications from your _.m365rc.json_ file.
 
 ## Examples
 
-Retrieve API permissions for your current Azure AD app.
+Retrieve API permissions for your current Microsoft Entra app.
 
 ```sh
 m365 app permission list
 ```
 
-Retrieve API permissions for the Azure AD app with the client ID specified in the _.m365rc.json_ file.
+Retrieve API permissions for the Microsoft Entra app with the client ID specified in the _.m365rc.json_ file.
 
 ```sh
 m365 app permission list --appId e23d235c-fcdf-45d1-ac5f-24ab2ee0695d

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

@@ -4,7 +4,7 @@ import TabItem from '@theme/TabItem';
 
 # cli consent
 
-Consent additional permissions for the Azure AD application used by the CLI for Microsoft 365
+Consent additional permissions for the Microsoft Entra application used by the CLI for Microsoft 365
 
 ## Usage
 
@@ -23,7 +23,7 @@ m365 cli consent [options]
 
 ## 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 Viva Engage commands, which require the Viva Engage API permission that isn't granted to the CLI by default.
+Using the `cli consent` command you can consent additional permissions for the Microsoft Entra 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.
 

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

@@ -4,7 +4,7 @@ import TabItem from '@theme/TabItem';
 
 # cli reconsent
 
-Returns Azure AD URL to open in the browser to re-consent CLI for Microsoft 365 permissions
+Returns URL to open in the browser to re-consent CLI for Microsoft 365 Microsoft Entra permissions
 
 ## Usage
 
@@ -30,28 +30,28 @@ m365 cli reconsent
   <TabItem value="JSON">
 
   ```json
-  "To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to https://login.microsoftonline.com/common/oauth2/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&prompt=admin_consent"
+  "To re-consent the PnP Microsoft 365 Management Shell Microsoft Entra application navigate in your web browser to https://login.microsoftonline.com/common/oauth2/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&prompt=admin_consent"
   ```
 
   </TabItem>
   <TabItem value="Text">
 
   ```text
-  To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to https://login.microsoftonline.com/common/oauth2/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&prompt=admin_consent
+  To re-consent the PnP Microsoft 365 Management Shell Microsoft Entra application navigate in your web browser to https://login.microsoftonline.com/common/oauth2/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&prompt=admin_consent
   ```
 
   </TabItem>
   <TabItem value="CSV">
 
   ```csv
-  To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to https://login.microsoftonline.com/common/oauth2/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&prompt=admin_consent
+  To re-consent the PnP Microsoft 365 Management Shell Microsoft Entra application navigate in your web browser to https://login.microsoftonline.com/common/oauth2/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&prompt=admin_consent
   ```
 
   </TabItem>
   <TabItem value="Markdown">
 
   ```md
-  To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to https://login.microsoftonline.com/common/oauth2/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&prompt=admin_consent
+  To re-consent the PnP Microsoft 365 Management Shell Microsoft Entra application navigate in your web browser to https://login.microsoftonline.com/common/oauth2/authorize?client_id=31359c7f-bd7e-475c-86db-fdb8c937548e&response_type=code&prompt=admin_consent
   ```
 
   </TabItem>
@@ -59,4 +59,4 @@ m365 cli reconsent
 
 ## More information
 
-- Re-consent the PnP Microsoft 365 Management Shell Azure AD application: [https://pnp.github.io/cli-microsoft365/user-guide/connecting-office-365/#re-consent-the-pnp-office-365-management-shell-azure-ad-application](https://pnp.github.io/cli-microsoft365/user-guide/connecting-office-365/#re-consent-the-pnp-office-365-management-shell-azure-ad-application)
+- Re-consent the PnP Microsoft 365 Management Shell Microsoft Entra application: [https://pnp.github.io/cli-microsoft365/user-guide/connecting-microsoft-365/#re-consent-the-pnp-microsoft-365-management-shell-azure-ad-application](https://pnp.github.io/cli-microsoft365/user-guide/connecting-microsoft-365/#re-consent-the-pnp-microsoft-365-management-shell-azure-ad-application)

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

@@ -4,7 +4,7 @@ import TabItem from '@theme/TabItem';
 
 # entra app permission add
 
-Adds the specified application and/or delegated permissions to a specified Entra (Azure AD) app
+Adds the specified application and/or delegated permissions to a Microsoft Entra app
 
 ## Usage
 
@@ -23,10 +23,10 @@ m365 entra appregistration permission add [options]
 
 ```md definition-list
 `-i, --appId [appId]`
-: Client ID of the Entra (Azure AD) app to add the API permissions to. Specify `appId` or `appObjectId` but not both.
+: Client ID of the Microsoft Entra app to add the API permissions to. Specify `appId` or `appObjectId` but not both.
 
 `--appObjectId [appObjectId]`
-: Object ID of the Entra (Azure AD) app to add the API permissions to. Specify `appId` or `appObjectId` but not both.
+: Object ID of the Microsoft Entra app to add the API permissions to. Specify `appId` or `appObjectId` but not both.
 
 `-a, --applicationPermissions [applicationPermissions]`
 : Space-separated list of application permissions to add. Specify at least `applicationPermissions` or `delegatedPermissions`.
@@ -46,19 +46,19 @@ Scopes/Roles to grant must be fully-qualified so that we can disambiguate them b
 
 ## Examples
 
-Grant multiple delegated API permissions to an Entra (Azure AD) app specified by client id
+Grant multiple delegated API permissions to a Microsoft Entra app specified by client id.
 
 ```sh
 m365 entra app permission add --appId 'f1417aa3-bf0b-4cc5-a845-a0b2cf11f690' --delegatedPermissions 'https://management.azure.com/user_impersonation https://service.flow.microsoft.com/Flows.Read.All https://graph.microsoft.com/Agreement.Read.All'
 ```
 
-Grant multiple delegated API permissions to an Entra (Azure AD) app specified by object id
+Grant multiple delegated API permissions to a Microsoft Entra app specified by object id.
 
 ```sh
 m365 entra app permission add --appObjectId 'e0306bb2-bf0b-4cc5-a845-a0b2cf11f690' --delegatedPermissions 'https://management.azure.com/user_impersonation https://service.flow.microsoft.com/Flows.Read.All https://graph.microsoft.com/Agreement.Read.All'
 ```
 
-Grant multiple app-only permissions to an Entra (Azure AD) app specified by client id and grant admin consent
+Grant multiple app-only permissions to a Microsoft Entra 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' --grantAdminConsent

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

@@ -4,7 +4,7 @@ import TabItem from '@theme/TabItem';
 
 # entra approleassignment add
 
-Adds service principal permissions also known as scopes and app role assignments for specified Entra application registration
+Adds service principal permissions also known as scopes and app role assignments for specified Microsoft Entra application registration
 
 ## Usage
 

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

@@ -57,10 +57,6 @@ List app roles assigned to service principal with ObjectId _b2307a39-e878-458b-b
 m365 entra approleassignment list --appObjectId b2307a39-e878-458b-bc90-03bc578531dd
 ```
 
-## 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)
-
 ## Response
 
 <Tabs>
@@ -117,3 +113,7 @@ m365 entra approleassignment list --appObjectId b2307a39-e878-458b-bc90-03bc5785
 
   </TabItem>
 </Tabs>
+
+## More information
+
+- Application and service principal objects in Microsoft Entra ID: [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)

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

@@ -196,5 +196,5 @@ m365 entra enterpriseapp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
 
 ## More information
 
-- 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)
+- Application and service principal objects in Microsoft Entra ID: [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)

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

@@ -224,5 +224,5 @@ m365 entra enterpriseapp get --appObjectId b2307a39-e878-458b-bc90-03bc578531dd
 
 ## More information
 
-- 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)
+- Application and service principal objects in Microsoft Entra ID: [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
 - Get servicePrincipal: [https://learn.microsoft.com/graph/api/serviceprincipal-get?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/serviceprincipal-get?view=graph-rest-1.0)

package/docs/docs/cmd/entra/group/group-user-add.mdx

@@ -14,13 +14,13 @@ m365 entra group user add [options]
 
 ```md definition-list
 `-i, --groupId [groupId]`
-: The ID of the Entra ID group. Specify `groupId` or `groupDisplayName` but not both.
+: The ID of the Microsoft Entra group. Specify `groupId` or `groupDisplayName` but not both.
 
 `-n, --groupDisplayName [groupDisplayName]`
-: The display name of the Entra ID group. Specify `groupId` or `groupDisplayName` but not both.
+: The display name of the Microsoft Entra group. Specify `groupId` or `groupDisplayName` but not both.
 
 `--ids [ids]`
-: Entra ID IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids` or `userNames` but not both.
+: Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids` or `userNames` but not both.
 
 `--userNames [userNames]`
 : The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `ids` or `userNames` but not both.
@@ -33,25 +33,25 @@ m365 entra group user add [options]
 
 ## Examples
 
-Add a single user specified by ID as a member to a group specified by display name
+Add a single user specified by ID as a member to a group specified by display name.
 
 ```sh
 m365 entra group user add --groupDisplayName Developers --ids 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
 ```
 
-Add multiple users specified by ID as members to a group specified by ID
+Add multiple users specified by ID as members to a group specified by ID.
 
 ```sh
 m365 entra group user add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --ids "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
 ```
 
-Add a single user specified by UPN as an owner to a group specified by display name
+Add a single user specified by UPN as an owner to a group specified by display name.
 
 ```sh
 m365 entra group user add --groupDisplayName Developers --userNames john.doe@contoso.com --role Owner
 ```
 
-Adds multiple users specified by UPN as owners to a group specified by ID
+Adds multiple users specified by UPN as owners to a group specified by ID.
 
 ```sh
 m365 entra group user add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userNames "john.doe@contoso.com,adele.vance@contoso.com" --role Owner

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

@@ -61,4 +61,4 @@ The command won't return a response on success.
 
 ## 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 service principal objects in Microsoft Entra ID: [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)

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

@@ -100,5 +100,5 @@ m365 entra oauth2grant list --spObjectId 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 service principal objects in Microsoft Entra ID: [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
 - List oauth2PermissionGrants: [https://learn.microsoft.com/graph/api/oauth2permissiongrant-list?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/oauth2permissiongrant-list?view=graph-rest-1.0)

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

@@ -58,5 +58,5 @@ The command won't return a response on success.
 
 ## 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 service principal objects in Microsoft Entra ID: [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
 - Delete a delegated permission grant (oAuth2PermissionGrant): [https://learn.microsoft.com/graph/api/oauth2permissiongrant-delete?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/oauth2permissiongrant-delete?view=graph-rest-1.0)

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

@@ -52,5 +52,5 @@ The command won't return a response on success.
 
 ## 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 service principal objects in Microsoft Entra ID: [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
 - Update a delegated permission grant (oAuth2PermissionGrant): [https://learn.microsoft.com/graph/api/oauth2permissiongrant-update?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/oauth2permissiongrant-update?view=graph-rest-1.0)