@pnp/cli-microsoft365 7.6.0-beta.c74fe4b → 7.6.0-beta.fc0eacc

package/dist/m365/teams/commands/team/team-add.js

@@ -3,12 +3,17 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsTeamAddCommand_instances, _TeamsTeamAddCommand_initTelemetry, _TeamsTeamAddCommand_initOptions, _TeamsTeamAddCommand_initOptionSets;
+var _TeamsTeamAddCommand_instances, _TeamsTeamAddCommand_initTelemetry, _TeamsTeamAddCommand_initOptions, _TeamsTeamAddCommand_initValidators, _TeamsTeamAddCommand_initOptionSets;
 import { setTimeout } from 'timers/promises';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { formatting } from '../../../../utils/formatting.js';
 class TeamsTeamAddCommand extends GraphCommand {
     get name() {
         return commands.TEAM_ADD;
@@ -22,9 +27,14 @@ class TeamsTeamAddCommand extends GraphCommand {
         this.pollingInterval = 30000;
         __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
+        if (isAppOnlyAccessToken && !args.options.ownerUserNames && !args.options.ownerIds && !args.options.ownerEmails) {
+            this.handleError(`Specify at least 'ownerUserNames', 'ownerIds' or 'ownerEmails' when using application permissions.`);
+        }
         let requestBody;
         if (args.options.template) {
             if (this.verbose) {
@@ -54,6 +64,19 @@ class TeamsTeamAddCommand extends GraphCommand {
                 description: args.options.description
             };
         }
+        let members = [];
+        if (args.options.ownerEmails || args.options.ownerIds || args.options.ownerUserNames) {
+            await this.retrieveMembersToAdd(members, 'owner', args.options.ownerEmails, args.options.ownerIds, args.options.ownerUserNames);
+        }
+        if (args.options.memberEmails || args.options.memberIds || args.options.memberUserNames) {
+            await this.retrieveMembersToAdd(members, 'member', args.options.memberEmails, args.options.memberIds, args.options.memberUserNames);
+        }
+        // We filter out the first owner here and add it to the request body when we are using application only permissions. This is required or the Graph API will throw an error.
+        if (members.length > 0 && members.filter(y => y.roles.includes('owner')).length > 0 && isAppOnlyAccessToken) {
+            const groupOwner = members.filter(y => y.roles.includes('owner')).slice(0, 1);
+            members = members.filter(y => y !== groupOwner[0]);
+            requestBody.members = groupOwner;
+        }
         const requestOptionsPost = {
             url: `${this.resource}/v1.0/teams`,
             headers: {
@@ -72,12 +95,18 @@ class TeamsTeamAddCommand extends GraphCommand {
                 responseType: 'json'
             };
             const teamsAsyncOperation = await request.get(requestOptions);
-            if (!args.options.wait) {
+            if (!args.options.wait && members.length === 0) {
                 await logger.log(teamsAsyncOperation);
             }
             else {
                 await this.waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger);
                 const entraGroup = await this.getEntraGroup(teamsAsyncOperation.targetResourceId, logger);
+                if (members.length > 0) {
+                    if (this.verbose) {
+                        await logger.logToStderr('Adding members to the team...');
+                    }
+                    await this.addMembers(members, entraGroup.id);
+                }
                 await logger.log(entraGroup);
             }
         }
@@ -85,6 +114,19 @@ class TeamsTeamAddCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async addMembers(members, groupId) {
+        for (const member of members) {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/teams/${groupId}/members`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: member
+            };
+            await request.post(requestOptions);
+        }
+    }
     async waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger) {
         if (teamsAsyncOperation.status === 'succeeded') {
             if (this.verbose) {
@@ -118,6 +160,31 @@ class TeamsTeamAddCommand extends GraphCommand {
         }
         return group;
     }
+    async retrieveMembersToAdd(members, role, emails, ids, userNames) {
+        let itemsToProcess = [];
+        if (emails) {
+            itemsToProcess = await entraUser.getUserIdsByEmails(formatting.splitAndTrim(emails));
+        }
+        else if (ids) {
+            itemsToProcess = formatting.splitAndTrim(ids);
+        }
+        else if (userNames) {
+            itemsToProcess = await entraUser.getUserIdsByUpns(formatting.splitAndTrim(userNames));
+        }
+        itemsToProcess.map((item) => {
+            const member = members.find((y) => y['user@odata.bind'] === `https://graph.microsoft.com/v1.0/users('${item}')`);
+            if (!member) {
+                members.push({
+                    '@odata.type': '#microsoft.graph.aadUserConversationMember',
+                    'user@odata.bind': `https://graph.microsoft.com/v1.0/users('${item}')`,
+                    roles: [role]
+                });
+            }
+            else {
+                member.roles.push(role);
+            }
+        });
+    }
 }
 _TeamsTeamAddCommand_instances = new WeakSet(), _TeamsTeamAddCommand_initTelemetry = function _TeamsTeamAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -125,7 +192,13 @@ _TeamsTeamAddCommand_instances = new WeakSet(), _TeamsTeamAddCommand_initTelemet
             name: typeof args.options.name !== 'undefined',
             description: typeof args.options.description !== 'undefined',
             template: typeof args.options.template !== 'undefined',
-            wait: !!args.options.wait
+            wait: !!args.options.wait,
+            ownerUserNames: typeof args.options.ownerUserNames !== 'undefined',
+            ownerIds: typeof args.options.ownerIds !== 'undefined',
+            ownerEmails: typeof args.options.ownerEmails !== 'undefined',
+            memberUserNames: typeof args.options.memberUserNames !== 'undefined',
+            memberIds: typeof args.options.memberIds !== 'undefined',
+            memberEmails: typeof args.options.memberEmails !== 'undefined'
         });
     });
 }, _TeamsTeamAddCommand_initOptions = function _TeamsTeamAddCommand_initOptions() {
@@ -137,6 +210,52 @@ _TeamsTeamAddCommand_instances = new WeakSet(), _TeamsTeamAddCommand_initTelemet
         option: '--template [template]'
     }, {
         option: '--wait'
+    }, {
+        option: '--ownerUserNames [ownerUserNames]'
+    }, {
+        option: '--ownerIds [ownerIds]'
+    }, {
+        option: '--ownerEmails [ownerEmails]'
+    }, {
+        option: '--memberUserNames [memberUserNames]'
+    }, {
+        option: '--memberIds [memberIds]'
+    }, {
+        option: '--memberEmails [memberEmails]'
+    });
+}, _TeamsTeamAddCommand_initValidators = function _TeamsTeamAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.ownerUserNames) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(formatting.splitAndTrim(args.options.ownerUserNames));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `Owner username '${isValidUserPrincipalNameArray}' is invalid for option 'ownerUserNames'.`;
+            }
+        }
+        if (args.options.ownerEmails) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(formatting.splitAndTrim(args.options.ownerEmails));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `Owner email '${isValidUserPrincipalNameArray}' is invalid for option 'ownerEmails'.`;
+            }
+        }
+        if (args.options.ownerIds && !validation.isValidGuidArray(formatting.splitAndTrim(args.options.ownerIds))) {
+            return `The option 'ownerIds' contains one or more invalid GUIDs.`;
+        }
+        if (args.options.memberUserNames) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(formatting.splitAndTrim(args.options.memberUserNames));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `Member username '${isValidUserPrincipalNameArray}' is invalid for option 'memberUserNames'.`;
+            }
+        }
+        if (args.options.memberEmails) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(formatting.splitAndTrim(args.options.memberEmails));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `Member email '${isValidUserPrincipalNameArray}' is invalid for option 'memberEmails'.`;
+            }
+        }
+        if (args.options.memberIds && !validation.isValidGuidArray(formatting.splitAndTrim(args.options.memberIds))) {
+            return `The option 'memberIds' contains one or more invalid GUIDs`;
+        }
+        return true;
     });
 }, _TeamsTeamAddCommand_initOptionSets = function _TeamsTeamAddCommand_initOptionSets() {
     this.optionSets.push({
@@ -149,6 +268,16 @@ _TeamsTeamAddCommand_instances = new WeakSet(), _TeamsTeamAddCommand_initTelemet
         runsWhen: (args) => {
             return !args.options.template;
         }
+    }, {
+        options: ['ownerUserNames', 'ownerIds', 'ownerEmails'],
+        runsWhen: (args) => {
+            return args.options.ownerUserNames || args.options.ownerIds || args.options.ownerEmails;
+        }
+    }, {
+        options: ['memberUserNames', 'memberIds', 'memberEmails'],
+        runsWhen: (args) => {
+            return args.options.memberUserNames || args.options.memberIds || args.options.memberEmails;
+        }
     });
 };
 export default new TeamsTeamAddCommand();

package/dist/m365/tenant/commands/report/report-office365activationcounts.js

@@ -3,6 +3,9 @@ import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TenantReportOffice365ActivationCountsCommand extends GraphCommand {
+    get allowedOutputs() {
+        return ['json', 'csv'];
+    }
     get name() {
         return commands.REPORT_OFFICE365ACTIVATIONCOUNTS;
     }

package/dist/m365/tenant/commands/report/report-office365activationsusercounts.js

@@ -3,6 +3,9 @@ import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TenantReportOffice365ActivationsUserCountsCommand extends GraphCommand {
+    get allowedOutputs() {
+        return ['json', 'csv'];
+    }
     get name() {
         return commands.REPORT_OFFICE365ACTIVATIONSUSERCOUNTS;
     }

package/dist/m365/tenant/commands/report/report-office365activationsuserdetail.js

@@ -3,6 +3,9 @@ import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TenantReportOffice365ActivationsUserDetailCommand extends GraphCommand {
+    get allowedOutputs() {
+        return ['json', 'csv'];
+    }
     get name() {
         return commands.REPORT_OFFICE365ACTIVATIONSUSERDETAIL;
     }

package/dist/utils/entraUser.js

@@ -74,6 +74,42 @@ export const entraUser = {
         }
         return res.value[0].id;
     },
+    /**
+     * Retrieve the IDs of users by their mail. There is no guarantee that the order of the returned IDs will match the order of the specified mails.
+     * @param emails Array of user mails.
+     * @returns Array of user IDs.
+     */
+    async getUserIdsByEmails(emails) {
+        const userIds = [];
+        for (let i = 0; i < emails.length; i += 20) {
+            const emailsChunk = emails.slice(i, i + 20);
+            const requestOptions = {
+                url: `${graphResource}/v1.0/$batch`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    requests: emailsChunk.map((email, index) => ({
+                        id: index + 1,
+                        method: 'GET',
+                        url: `/users?$filter=mail eq '${formatting.encodeQueryParameter(email)}'&$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 mail '${emailsChunk[response.id - 1]}' does not exist.`);
+                }
+                userIds.push(response.body.id);
+            }
+        }
+        return userIds;
+    },
     /**
      * Retrieve the UPN of a user by its ID.
      * @param id User ID.

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)