@pnp/cli-microsoft365 7.6.0-beta.682272b → 7.6.0-beta.c1fa99c

package/dist/m365/spo/commands/tenant/tenant-settings-set.js

@@ -89,7 +89,7 @@ class SpoTenantSettingsSetCommand extends SpoCommand {
                 throw response.ErrorInfo.ErrorMessage;
             }
             if (args.options.EnableAzureADB2BIntegration === true) {
-                await this.warn(logger, 'WARNING: Make sure to also enable the Azure AD one-time passcode authentication preview. If it is not enabled then SharePoint will not use Azure AD B2B even if EnableAzureADB2BIntegration is set to true. Learn more at http://aka.ms/spo-b2b-integration.');
+                await this.warn(logger, 'WARNING: Make sure to also enable the Microsoft Entra one-time passcode authentication preview. If it is not enabled then SharePoint will not use Microsoft Entra B2B even if EnableAzureADB2BIntegration is set to true. Learn more at http://aka.ms/spo-b2b-integration.');
             }
         }
         catch (err) {

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/report/report-directroutingcalls.js

@@ -10,6 +10,9 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TeamsReportDirectroutingcallsCommand extends GraphCommand {
+    get allowedOutputs() {
+        return ['json', 'csv'];
+    }
     get name() {
         return commands.REPORT_DIRECTROUTINGCALLS;
     }

package/dist/m365/teams/commands/report/report-pstncalls.js

@@ -10,6 +10,9 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TeamsReportPstncallsCommand extends GraphCommand {
+    get allowedOutputs() {
+        return ['json', 'csv'];
+    }
     get name() {
         return commands.REPORT_PSTNCALLS;
     }

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/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