@pnp/cli-microsoft365 7.0.0-beta.093ef31 → 7.0.0-beta.18ce559

package/dist/m365/teams/commands/chat/chat-message-send.js

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsChatMessageSendCommand_instances, _TeamsChatMessageSendCommand_initTelemetry, _TeamsChatMessageSendCommand_initOptions, _TeamsChatMessageSendCommand_initValidators, _TeamsChatMessageSendCommand_initOptionSets;
-import os from 'os';
 import auth from '../../../../Auth.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
@@ -12,6 +11,8 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { chatUtil } from './chatUtil.js';
+import { Cli } from '../../../../cli/Cli.js';
+import { formatting } from '../../../../utils/formatting.js';
 class TeamsChatMessageSendCommand extends GraphCommand {
     get name() {
         return commands.CHAT_MESSAGE_SEND;
@@ -55,10 +56,9 @@ class TeamsChatMessageSendCommand extends GraphCommand {
         if (existingChats.length === 1) {
             return existingChats[0].id;
         }
-        const disambiguationText = existingChats.map(c => {
-            return `- ${c.id}${c.topic && ' - '}${c.topic} - ${c.createdDateTime && new Date(c.createdDateTime).toLocaleString()}`;
-        }).join(os.EOL);
-        throw `Multiple chat conversations with this name found. Please disambiguate:${os.EOL}${disambiguationText}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', existingChats);
+        const result = await Cli.handleMultipleResultsFound(`Multiple chat conversations with this name found.`, resultAsKeyValuePair);
+        return result.id;
     }
     async getChatIdByName(chatName) {
         const existingChats = await chatUtil.findExistingGroupChatsByName(chatName);
@@ -68,11 +68,9 @@ class TeamsChatMessageSendCommand extends GraphCommand {
         if (existingChats.length === 1) {
             return existingChats[0].id;
         }
-        const disambiguationText = existingChats.map(c => {
-            const memberstring = c.members.map(m => m.email).join(', ');
-            return `- ${c.id} - ${c.createdDateTime && new Date(c.createdDateTime).toLocaleString()} - ${memberstring}`;
-        }).join(os.EOL);
-        throw `Multiple chat conversations with this name found. Please disambiguate:${os.EOL}${disambiguationText}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', existingChats);
+        const result = await Cli.handleMultipleResultsFound(`Multiple chat conversations with this name found.`, resultAsKeyValuePair);
+        return result.id;
     }
     // This Microsoft Graph API request throws an intermittent 404 exception, saying that it cannot find the principal.
     // The same behavior occurs when creating the conversation through the Graph Explorer.

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

@@ -3,7 +3,7 @@ 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 _TeamsTeamCloneCommand_instances, _TeamsTeamCloneCommand_initTelemetry, _TeamsTeamCloneCommand_initOptions, _TeamsTeamCloneCommand_initValidators, _TeamsTeamCloneCommand_initOptionSets;
+var _TeamsTeamCloneCommand_instances, _TeamsTeamCloneCommand_initTelemetry, _TeamsTeamCloneCommand_initOptions, _TeamsTeamCloneCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -22,7 +22,6 @@ class TeamsTeamCloneCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const data = {
@@ -42,7 +41,7 @@ class TeamsTeamCloneCommand extends GraphCommand {
         const requestOptions = {
             url: `${this.resource}/v1.0/teams/${formatting.encodeQueryParameter(args.options.id)}/clone`,
             headers: {
-                "content-type": "application/json",
+                'content-type': 'application/json',
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json',
@@ -75,16 +74,14 @@ _TeamsTeamCloneCommand_instances = new WeakSet(), _TeamsTeamCloneCommand_initTel
         Object.assign(this.telemetryProperties, {
             description: typeof args.options.description !== 'undefined',
             classification: typeof args.options.classification !== 'undefined',
-            visibility: typeof args.options.visibility !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
+            visibility: typeof args.options.visibility !== 'undefined'
         });
     });
 }, _TeamsTeamCloneCommand_initOptions = function _TeamsTeamCloneCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id [id]'
+        option: '-i, --id <id>'
     }, {
-        option: '-n, --name [name]'
+        option: '-n, --name <name>'
     }, {
         option: '-p, --partsToClone <partsToClone>',
         autocomplete: ['apps', 'channels', 'members', 'settings', 'tabs']
@@ -121,8 +118,6 @@ _TeamsTeamCloneCommand_instances = new WeakSet(), _TeamsTeamCloneCommand_initTel
         }
         return true;
     });
-}, _TeamsTeamCloneCommand_initOptionSets = function _TeamsTeamCloneCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
 };
 export default new TeamsTeamCloneCommand();
 //# sourceMappingURL=team-clone.js.map

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

@@ -3,11 +3,13 @@ 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 _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions;
+var _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions, _TeamsTeamListCommand_initValidators, _TeamsTeamListCommand_initOptionSets, _TeamsTeamListCommand_initTypes;
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
 class TeamsTeamListCommand extends GraphCommand {
     get name() {
         return commands.TEAM_LIST;
@@ -23,64 +25,126 @@ class TeamsTeamListCommand extends GraphCommand {
         _TeamsTeamListCommand_instances.add(this);
         __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        let endpoint = `${this.resource}/v1.0/groups?$select=id,displayName,description,resourceProvisioningOptions`;
-        if (args.options.joined) {
-            endpoint = `${this.resource}/v1.0/me/joinedTeams`;
+        if (this.verbose) {
+            if (!args.options.joined && !args.options.associated) {
+                await logger.logToStderr(`Retrieving Microsoft Teams in the tenant...`);
+            }
+            else {
+                const user = args.options.userId || args.options.userName || 'me';
+                await logger.logToStderr(`Retrieving Microsoft Teams ${args.options.joined ? 'joined by' : 'associated with'} ${user}...`);
+            }
         }
         try {
-            const items = await odata.getAllItems(endpoint);
-            if (args.options.joined) {
-                await logger.log(items);
+            let endpoint = `${this.resource}/v1.0`;
+            if (args.options.joined || args.options.associated) {
+                endpoint += args.options.userId || args.options.userName ? `/users/${args.options.userId || formatting.encodeQueryParameter(args.options.userName)}` : '/me';
+                endpoint += args.options.joined ? '/joinedTeams' : '/teamwork/associatedTeams';
+                endpoint += '?$select=id';
             }
             else {
-                const teamItems = await Promise.all(items.filter((e) => {
-                    return e.resourceProvisioningOptions.indexOf('Team') > -1;
-                }).map(g => this.getTeamFromGroup(g)));
-                await logger.log(teamItems);
+                // Get all team groups within the tenant
+                endpoint += `/groups?$select=id&$filter=resourceProvisioningOptions/Any(x:x eq 'Team')`;
             }
+            const groupResponse = await odata.getAllItems(endpoint);
+            const groupIds = groupResponse.map(g => g.id);
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieved ${groupIds.length} Microsoft Teams, getting additional information...`);
+            }
+            let teams = await this.getAllTeams(groupIds);
+            // Sort teams by display name
+            teams = teams.sort((x, y) => x.displayName.localeCompare(y.displayName));
+            await logger.log(teams);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getTeamFromGroup(group) {
+    async getAllTeams(groupIds) {
+        const groupBatches = [];
+        for (let i = 0; groupIds.length > i; i += 20) {
+            groupBatches.push(groupIds.slice(i, i + 20));
+        }
+        const promises = groupBatches.map(g => this.getTeamsBatch(g));
+        const teams = await Promise.all(promises);
+        const result = teams.reduce((prev, val) => prev.concat(val), []);
+        return result;
+    }
+    async getTeamsBatch(groupIds) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${group.id}`,
+            url: `${this.resource}/v1.0/$batch`,
             headers: {
-                accept: 'application/json;odata.metadata=none'
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json'
             },
-            responseType: 'json'
-        };
-        try {
-            return await request.get(requestOptions);
-        }
-        catch (err) {
-            if (err.statusCode === 403) {
-                return {
-                    id: group.id,
-                    displayName: group.displayName,
-                    description: group.description,
-                    isArchived: undefined
-                };
+            responseType: 'json',
+            data: {
+                requests: groupIds.map((id, index) => ({
+                    id: index.toString(),
+                    method: 'GET',
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    url: `/teams/${id}`
+                }))
             }
-            else {
-                throw err;
+        };
+        const response = await request.post(requestOptions);
+        // Throw error if any of the requests failed
+        for (const item of response.responses) {
+            if (item.status !== 200) {
+                throw item.body;
             }
         }
+        return response.responses.map(r => r.body);
     }
 }
 _TeamsTeamListCommand_instances = new WeakSet(), _TeamsTeamListCommand_initTelemetry = function _TeamsTeamListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            joined: args.options.joined
+            joined: !!args.options.joined,
+            associated: !!args.options.associated,
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _TeamsTeamListCommand_initOptions = function _TeamsTeamListCommand_initOptions() {
     this.options.unshift({
         option: '-j, --joined'
+    }, {
+        option: '-a, --associated'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _TeamsTeamListCommand_initValidators = function _TeamsTeamListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID for userId.`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userId} is not a valid UPN for userName.`;
+        }
+        if ((args.options.userId || args.options.userName) && !args.options.joined && !args.options.associated) {
+            return 'You must specify either joined or associated when specifying userId or userName.';
+        }
+        return true;
+    });
+}, _TeamsTeamListCommand_initOptionSets = function _TeamsTeamListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['joined', 'associated'],
+        runsWhen: (args) => !!args.options.joined || !!args.options.associated
+    }, {
+        options: ['userId', 'userName'],
+        runsWhen: (args) => typeof args.options.userId !== 'undefined' || typeof args.options.userName !== 'undefined'
     });
+}, _TeamsTeamListCommand_initTypes = function _TeamsTeamListCommand_initTypes() {
+    this.types.string.push('userId', 'userName');
 };
 export default new TeamsTeamListCommand();
 //# sourceMappingURL=team-list.js.map

package/dist/m365/tenant/commands/info/info-get.js

@@ -0,0 +1,83 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _TenantInfoGetCommand_instances, _TenantInfoGetCommand_initTelemetry, _TenantInfoGetCommand_initOptions, _TenantInfoGetCommand_initValidators;
+import auth from '../../../../Auth.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import request from '../../../../request.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { validation } from '../../../../utils/validation.js';
+import commands from '../../commands.js';
+class TenantInfoGetCommand extends GraphCommand {
+    get name() {
+        return commands.INFO_GET;
+    }
+    get description() {
+        return 'Gets information about any tenant';
+    }
+    constructor() {
+        super();
+        _TenantInfoGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TenantInfoGetCommand_instances, "m", _TenantInfoGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TenantInfoGetCommand_instances, "m", _TenantInfoGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TenantInfoGetCommand_instances, "m", _TenantInfoGetCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        let domainName = args.options.domainName;
+        const tenantId = args.options.tenantId;
+        if (!domainName && !tenantId) {
+            const userName = accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken);
+            domainName = userName.split('@')[1];
+        }
+        let requestUrl = `${this.resource}/v1.0/tenantRelationships/`;
+        if (tenantId) {
+            requestUrl += `findTenantInformationByTenantId(tenantId='${formatting.encodeQueryParameter(tenantId)}')`;
+        }
+        else {
+            requestUrl += `findTenantInformationByDomainName(domainName='${formatting.encodeQueryParameter(domainName)}')`;
+        }
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        try {
+            const res = await request.get(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_TenantInfoGetCommand_instances = new WeakSet(), _TenantInfoGetCommand_initTelemetry = function _TenantInfoGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            domainName: typeof args.options.domainName !== 'undefined',
+            tenantId: typeof args.options.tenantId !== 'undefined'
+        });
+    });
+}, _TenantInfoGetCommand_initOptions = function _TenantInfoGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-d, --domainName [domainName]'
+    }, {
+        option: '-i, --tenantId [tenantId]'
+    });
+}, _TenantInfoGetCommand_initValidators = function _TenantInfoGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.tenantId && !validation.isValidGuid(args.options.tenantId)) {
+            return `${args.options.tenantId} is not a valid GUID`;
+        }
+        if (args.options.tenantId && args.options.domainName) {
+            return `Specify either domainName or tenantId but not both`;
+        }
+        return true;
+    });
+};
+export default new TenantInfoGetCommand();
+//# sourceMappingURL=info-get.js.map

package/dist/m365/tenant/commands.js

@@ -1,6 +1,7 @@
 const prefix = 'tenant';
 export default {
     ID_GET: `${prefix} id get`,
+    INFO_GET: `${prefix} info get`,
     REPORT_ACTIVEUSERCOUNTS: `${prefix} report activeusercounts`,
     REPORT_ACTIVEUSERDETAIL: `${prefix} report activeuserdetail`,
     REPORT_OFFICE365ACTIVATIONCOUNTS: `${prefix} report office365activationcounts`,

package/dist/utils/aadGroup.js

@@ -1,13 +1,14 @@
 import request from "../request.js";
 import { formatting } from "./formatting.js";
 import { odata } from "./odata.js";
+import { Cli } from '../cli/Cli.js';
 const graphResource = 'https://graph.microsoft.com';
 export const aadGroup = {
     /**
      * Retrieve a single group.
      * @param id Group ID.
      */
-    getGroupById(id) {
+    async getGroupById(id) {
         const requestOptions = {
             url: `${graphResource}/v1.0/groups/${id}`,
             headers: {
@@ -21,7 +22,7 @@ export const aadGroup = {
      * Get a list of groups by display name.
      * @param displayName Group display name.
      */
-    getGroupsByDisplayName(displayName) {
+    async getGroupsByDisplayName(displayName) {
         return odata.getAllItems(`${graphResource}/v1.0/groups?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
     },
     /**
@@ -36,7 +37,8 @@ export const aadGroup = {
             throw Error(`The specified group '${displayName}' does not exist.`);
         }
         if (groups.length > 1) {
-            throw Error(`Multiple groups with name '${displayName}' found: ${groups.map(x => x.id).join(',')}.`);
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
+            return await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName}' found.`, resultAsKeyValuePair);
         }
         return groups[0];
     },
@@ -73,6 +75,22 @@ export const aadGroup = {
             data: update
         };
         await request.patch(requestOptions);
+    },
+    /**
+     * Checks if group is a m365 group.
+     * @param groupId Group id.
+     * @returns whether the group is a m365 group or not
+     */
+    async isUnifiedGroup(groupId) {
+        const requestOptions = {
+            url: `${graphResource}/v1.0/groups/${groupId}?$select=groupTypes`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const group = await request.get(requestOptions);
+        return group.groupTypes.some(type => type === 'Unified');
     }
 };
 //# sourceMappingURL=aadGroup.js.map

package/dist/utils/formatting.js

@@ -153,6 +153,13 @@ export const formatting = {
         const success = primarySupported ? '✔' : '√';
         const failure = primarySupported ? '✖' : '×';
         return `${result === CheckStatus.Success ? chalk.green(success) : chalk.red(failure)} ${message}`;
+    },
+    convertArrayToHashTable(key, array) {
+        const resultAsKeyValuePair = {};
+        array.forEach((obj) => {
+            resultAsKeyValuePair[obj[key]] = obj;
+        });
+        return resultAsKeyValuePair;
     }
 };
 //# sourceMappingURL=formatting.js.map

package/dist/utils/powerPlatform.js

@@ -19,7 +19,7 @@ export const powerPlatform = {
         };
         try {
             const response = await request.get(requestOptions);
-            return Promise.resolve(response.properties.linkedEnvironmentMetadata.instanceApiUrl);
+            return response.properties.linkedEnvironmentMetadata.instanceApiUrl;
         }
         catch (ex) {
             throw Error(`The environment '${environment}' could not be retrieved. See the inner exception for more details: ${ex.message}`);

package/docs/docs/_clisettings.mdx

@@ -12,6 +12,6 @@ Setting name|Definition|Default value
 `helpMode`|Defines what part of command's help to display. Allowed values are `options`, `examples`, `remarks`, `response`, `full`|`options`
 `output`|Defines the default output when issuing a command. Allowed values are `json`, `text`, `csv`, `md`, `none`|`json`
 `printErrorsAsPlainText`|When output mode is set to `json`, print error messages as plain-text rather than JSON|`true`
-`prompt`|Prompts for missing values in required options and enables interactive selection when multiple values are available for a command that requires a specific value to be retrieved.|`false`
+`prompt`|Prompts for missing values in required options and enables interactive selection when multiple values are available for a command that requires a specific value to be retrieved.|`true`
 `showHelpOnFailure`|Automatically display help when executing a command failed|`true`
 `showSpinner`|Display spinner when executing commands|`true`

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

@@ -14,34 +14,34 @@ m365 aad app set [options]
 
 ```md definition-list
 `--appId [appId]`
-: Application (client) ID of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`
+: Application (client) ID of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`.
 
 `--objectId [objectId]`
-: Object ID of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`
+: Object ID of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`.
 
 `--name [name]`
-: Name of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`
+: Name of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`.
 
-`-u, --uri [uri]`
-: Comma-separated list of Application ID URIs to update
+`-u, --uris [uris]`
+: Comma-separated list of Application ID URIs to update.
 
 `-r, --redirectUris [redirectUris]`
-: Comma-separated list of redirect URIs to add to the app registration. Requires `platform` to be specified
+: Comma-separated list of redirect URIs to add to the app registration. Requires `platform` to be specified.
 
 `-p, --platform [platform]`
-: Platform for which the `redirectUri` should be configured. Allowed values `spa`, `web`, `publicClient`
+: Platform for which the `redirectUri` should be configured. Allowed values `spa`, `web`, `publicClient`.
 
 `--redirectUrisToRemove [redirectUrisToRemove]`
-: Comma-separated list of existing redirect URIs to remove. Specify, when you want to replace existing redirect URIs with another
+: Comma-separated list of existing redirect URIs to remove. Specify, when you want to replace existing redirect URIs with another.
 
 `--certificateFile [certificateFile]`
-: Path to the file with certificate public key. Specify either `certificateFile` or `certificateBase64Encoded`
+: Path to the file with certificate public key. Specify either `certificateFile` or `certificateBase64Encoded`.
 
 `--certificateBase64Encoded [certificateBase64Encoded]`
-: Base64-encoded string with certificate public key. Specify either `certificateFile` or `certificateBase64Encoded`
+: Base64-encoded string with certificate public key. Specify either `certificateFile` or `certificateBase64Encoded`.
 
 `--certificateDisplayName [certificateDisplayName]`
-: Display name for the certificate. If not given, the displayName will be set to the certificate subject. When specified, also specify either `certificateFile` or `certificateBase64Encoded`
+: Display name for the certificate. If not given, the displayName will be set to the certificate subject. When specified, also specify either `certificateFile` or `certificateBase64Encoded`.
 ```
 
 <Global />
@@ -59,19 +59,19 @@ When a certificate is specified it will be added to the list of certificates of
 Update the app URI of the Azure AD application registration specified by its object ID
 
 ```sh
-m365 aad app set --objectId d75be2e1-0204-4f95-857d-51a37cf40be8 --uri https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
+m365 aad app set --objectId d75be2e1-0204-4f95-857d-51a37cf40be8 --uris https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
 ```
 
 Update the app URI of the Azure AD application registration specified by its app (client) ID
 
 ```sh
-m365 aad app set --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --uri https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
+m365 aad app set --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --uris https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
 ```
 
 Update the app URI of the Azure AD application registration specified by its name
 
 ```sh
-m365 aad app set --name "My app" --uri https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
+m365 aad app set --name "My app" --uris https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
 ```
 
 Add a new redirect URI for SPA authentication
@@ -94,4 +94,4 @@ m365 aad app set --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --certificateDispl
 
 ## Response
 
-The command won't return a response on success.
+The command won't return a response on success.

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

@@ -16,19 +16,19 @@ m365 aad approleassignment add [options]
 
 ```md definition-list
 `--appId [appId]`
-: Application appId also known as clientId of the App Registration to which the configured scopes (app roles) should be applied
+: Application appId also known as clientId of the App Registration to which the configured scopes (app roles) should be applied.
 
 `--appObjectId [appObjectId]`
-: Application objectId of the App Registration to which the configured scopes (app roles) should be applied
+: Application objectId of the App Registration to which the configured scopes (app roles) should be applied.
 
 `--appDisplayName [appDisplayName]`
-: Application name of the App Registration to which the configured scopes (app roles) should be applied
+: Application name of the App Registration to which the configured scopes (app roles) should be applied.
 
 `-r, --resource <resource>`
 : Service principal name, appId or objectId that has the scopes (roles) e.g. `SharePoint`.
 
-`-s, --scope <scope>`
-: Permissions known also as scopes and roles to grant the application with. If multiple permissions have to be granted, they have to be comma-separated e.g. `Sites.Read.All`, `Sites.ReadWrite.all`
+`-s, --scopes <scopes>`
+: Permissions known also as scopes and roles to grant the application with. If multiple permissions have to be granted, they have to be comma-separated e.g. `Sites.Read.All`, `Sites.ReadWrite.all`.
 ```
 
 <Global />
@@ -48,19 +48,19 @@ This command can also be used to assign permissions to system or user-assigned m
 Adds SharePoint _Sites.Read.All_ application permissions to Azure AD application with app id _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment add --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "SharePoint" --scope "Sites.Read.All"
+m365 aad approleassignment add --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "SharePoint" --scopes "Sites.Read.All"
 ```
 
 Adds multiple Microsoft Graph application permissions to an Azure AD application with the name _MyAppName__
 
 ```sh
-m365 aad approleassignment add --appDisplayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
+m365 aad approleassignment add --appDisplayName "MyAppName" --resource "Microsoft Graph" --scopes "Mail.Read,Mail.Send"
 ```
 
 Adds Microsoft Graph _Mail.Read_ application permissions to a system-managed identity app with objectId _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
+m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scopes "Mail.Read"
 ```
 
 ## Response
@@ -106,7 +106,7 @@ m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e4
   <TabItem value="Markdown">
 
   ```md
-  # aad approleassignment add --appId "e89804ac-a571-48cf-b2ba-fd57b5d49993" --resource "Microsoft Graph" --scope "Mail.Read"
+  # aad approleassignment add --appId "e89804ac-a571-48cf-b2ba-fd57b5d49993" --resource "Microsoft Graph" --scopes "Mail.Read"
 
   Date: 2023-06-01
 

package/docs/docs/cmd/aad/approleassignment/approleassignment-remove.mdx

@@ -14,22 +14,22 @@ m365 aad approleassignment remove [options]
 
 ```md definition-list
 `--appId [appId]`
-: Application appId also known as clientId of the App Registration for which the configured scopes (app roles) should be deleted
+: Application appId also known as clientId of the App Registration for which the configured scopes (app roles) should be deleted.
 
 `--appObjectId [appObjectId]`
-: Application objectId of the App Registration for which the configured scopes (app roles) should be deleted
+: Application objectId of the App Registration for which the configured scopes (app roles) should be deleted.
 
 `--appDisplayName [appDisplayName]`
-: Application name of the App Registration for which the configured scopes (app roles) should be deleted
+: Application name of the App Registration for which the configured scopes (app roles) should be deleted.
 
 `-r, --resource <resource>`
-: Service principal name, appId or objectId that has the scopes (roles) e.g. `SharePoint`
+: Service principal name, appId or objectId that has the scopes (roles) e.g. `SharePoint`.
 
-`-s, --scope <scope>`
-: Permissions known also as scopes and roles to be deleted from the application. If multiple permissions have to be deleted, they have to be comma-separated e.g. `Sites.Read.All`,`Sites.ReadWrite.All`
+`-s, --scopes <scopes>`
+: Permissions known also as scopes and roles to be deleted from the application. If multiple permissions have to be deleted, they have to be comma-separated e.g. `Sites.Read.All`,`Sites.ReadWrite.All`.
 
 `-f, --force`
-: Don't prompt for confirming removing the all role assignment
+: Don't prompt for confirming removing the all role assignment.
 ```
 
 <Global />
@@ -49,19 +49,19 @@ This command can also be used to assign permissions to system- or user-assigned
 Deletes SharePoint _Sites.Read.All_ application permissions from Azure AD application with app id _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment remove --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "SharePoint" --scope "Sites.Read.All"
+m365 aad approleassignment remove --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "SharePoint" --scopes "Sites.Read.All"
 ```
 
 Deletes multiple Microsoft Graph application permissions from an Azure AD application with name _MyAppName_
 
 ```sh
-m365 aad approleassignment remove --appDisplayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
+m365 aad approleassignment remove --appDisplayName "MyAppName" --resource "Microsoft Graph" --scopes "Mail.Read,Mail.Send"
 ```
 
 Deletes Microsoft Graph _Mail.Read_ application permissions from a system-managed identity app with objectId _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment remove --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
+m365 aad approleassignment remove --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scopes "Mail.Read"
 ```
 
 ## Response