@pnp/cli-microsoft365 7.0.0-beta.c2db9df → 7.0.0-beta.e15bb2d

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -79,9 +79,9 @@ _SpoFileVersionClearCommand_instances = new WeakSet(), _SpoFileVersionClearComma
     });
 }, _SpoFileVersionClearCommand_initOptions = function _SpoFileVersionClearCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {

package/dist/m365/spo/commands/file/file-version-get.js

@@ -67,11 +67,11 @@ _SpoFileVersionGetCommand_instances = new WeakSet(), _SpoFileVersionGetCommand_i
     });
 }, _SpoFileVersionGetCommand_initOptions = function _SpoFileVersionGetCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '--label <label>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     });

package/dist/m365/spo/commands/file/file-version-list.js

@@ -59,9 +59,9 @@ _SpoFileVersionListCommand_instances = new WeakSet(), _SpoFileVersionListCommand
     });
 }, _SpoFileVersionListCommand_initOptions = function _SpoFileVersionListCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     });

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -80,11 +80,11 @@ _SpoFileVersionRemoveCommand_instances = new WeakSet(), _SpoFileVersionRemoveCom
     });
 }, _SpoFileVersionRemoveCommand_initOptions = function _SpoFileVersionRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '--label <label>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -80,11 +80,11 @@ _SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreC
     });
 }, _SpoFileVersionRestoreCommand_initOptions = function _SpoFileVersionRestoreCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '--label <label>'
     }, {
-        option: '-u, --fileUrl [fileUrl]'
+        option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
     }, {

package/dist/m365/spo/commands/group/group-member-add.js

@@ -82,24 +82,24 @@ class SpoGroupMemberAddCommand extends SpoCommand {
             await logger.logToStderr('Checking if the specified users and groups exist');
         }
         const validUserNames = [];
-        const identifiers = args.options.userName ?? args.options.email ?? args.options.aadGroupId ?? args.options.aadGroupName ?? args.options.userId.toString();
+        const identifiers = args.options.userNames ?? args.options.emails ?? args.options.aadGroupIds ?? args.options.aadGroupNames ?? args.options.userIds.toString();
         await Promise.all(identifiers.split(',').map(async (identifier) => {
             const trimmedIdentifier = identifier.trim();
             try {
-                if (args.options.userId) {
+                if (args.options.userIds) {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting AAD ID of user with ID ${trimmedIdentifier}`);
                     }
                     const spoUserAzureId = await spo.getUserAzureIdBySpoId(args.options.webUrl, trimmedIdentifier);
                     validUserNames.push(spoUserAzureId);
                 }
-                else if (args.options.userName) {
+                else if (args.options.userNames) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupId) {
+                else if (args.options.aadGroupIds) {
                     validUserNames.push(trimmedIdentifier);
                 }
-                else if (args.options.aadGroupName) {
+                else if (args.options.aadGroupNames) {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting ID of Azure AD group ${trimmedIdentifier}`);
                     }
@@ -132,11 +132,11 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            email: typeof args.options.email !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            aadGroupId: typeof args.options.aadGroupId !== 'undefined',
-            aadGroupName: typeof args.options.aadGroupName !== 'undefined'
+            userNames: typeof args.options.userNames !== 'undefined',
+            emails: typeof args.options.emails !== 'undefined',
+            userIds: typeof args.options.userIds !== 'undefined',
+            aadGroupIds: typeof args.options.aadGroupIds !== 'undefined',
+            aadGroupNames: typeof args.options.aadGroupNames !== 'undefined'
         });
     });
 }, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
@@ -147,15 +147,15 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--userName [userName]'
+        option: '--userNames [userNames]'
     }, {
-        option: '--email [email]'
+        option: '--emails [emails]'
     }, {
-        option: '--userId [userId]'
+        option: '--userIds [userIds]'
     }, {
-        option: '--aadGroupId [aadGroupId]'
+        option: '--aadGroupIds [aadGroupIds]'
     }, {
-        option: '--aadGroupName [aadGroupName]'
+        option: '--aadGroupNames [aadGroupNames]'
     });
 }, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -167,22 +167,22 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             return `Specified groupId ${args.options.groupId} is not a number`;
         }
         const userIdReg = new RegExp(/^[0-9,]*$/);
-        if (args.options.userId && !userIdReg.test(args.options.userId)) {
-            return `${args.options.userId} is not a number or a comma seperated value`;
+        if (args.options.userIds && !userIdReg.test(args.options.userIds)) {
+            return `${args.options.userIds} is not a number or a comma separated value`;
         }
-        if (args.options.userName && args.options.userName.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
-            return `${args.options.userName} contains one or more invalid usernames`;
+        if (args.options.userNames && args.options.userNames.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
+            return `${args.options.userNames} contains one or more invalid usernames`;
         }
-        if (args.options.email && args.options.email.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
-            return `${args.options.email} contains one or more invalid email addresses`;
+        if (args.options.emails && args.options.emails.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
+            return `${args.options.emails} contains one or more invalid email addresses`;
         }
-        if (args.options.aadGroupId && args.options.aadGroupId.split(',').some(e => !validation.isValidGuid(e))) {
-            return `${args.options.aadGroupId} contains one or more invalid GUIDs`;
+        if (args.options.aadGroupIds && args.options.aadGroupIds.split(',').some(e => !validation.isValidGuid(e))) {
+            return `${args.options.aadGroupIds} contains one or more invalid GUIDs`;
         }
         return true;
     });
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email', 'userId', 'aadGroupId', 'aadGroupName'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'aadGroupIds', 'aadGroupNames'] });
 };
 export default new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

package/dist/m365/spo/commands/page/page-set.js

@@ -58,7 +58,7 @@ class SpoPageSetCommand extends SpoCommand {
                 pageTitle = pageTitle || page.Title;
                 pageId = page.Id;
                 bannerImageUrl = page.BannerImageUrl;
-                canvasContent1 = page.CanvasContent1;
+                canvasContent1 = args.options.content || page.CanvasContent1;
                 layoutWebpartsContent = page.LayoutWebpartsContent;
                 pageDescription = pageDescription || page.Description;
                 topicHeader = page.TopicHeader;
@@ -277,7 +277,8 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
             publish: args.options.publish || false,
             publishMessage: typeof args.options.publishMessage !== 'undefined',
             description: typeof args.options.description !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
+            title: typeof args.options.title !== 'undefined',
+            content: typeof args.options.content !== 'undefined'
         });
     });
 }, _SpoPageSetCommand_initOptions = function _SpoPageSetCommand_initOptions() {
@@ -305,6 +306,8 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
         option: '--description [description]'
     }, {
         option: '--title [title]'
+    }, {
+        option: '--content [content]'
     });
 }, _SpoPageSetCommand_initTypes = function _SpoPageSetCommand_initTypes() {
     this.types.boolean.push('commentsEnabled');
@@ -332,6 +335,14 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
         if (args.options.promoteAs === 'NewsPage' && args.options.layoutType && args.options.layoutType !== 'Article') {
             return 'You can only promote article pages as news article';
         }
+        if (args.options.content) {
+            try {
+                JSON.parse(args.options.content);
+            }
+            catch (e) {
+                return `Specified content is not a valid JSON string. Input: ${args.options.content}. Error: ${e}`;
+            }
+        }
         return true;
     });
 };

package/dist/m365/spo/commands/site/site-commsite-enable.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 _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
+var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initOptionSets, _SpoSiteCommSiteEnableCommand_initValidators;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,11 +21,12 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const designPackageId = args.options.designPackageId || '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+        const designPackageId = this.getDesignPackageId(args.options);
         if (this.verbose) {
-            logger.logToStderr(`Enabling communication site at ${args.options.url}...`);
+            logger.logToStderr(`Enabling communication site with design package '${designPackageId}' at '${args.options.url}'...`);
         }
         try {
             const requestOptions = {
@@ -42,11 +43,26 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    getDesignPackageId(options) {
+        if (options.designPackageId) {
+            return options.designPackageId;
+        }
+        switch (options.designPackage) {
+            case 'Blank':
+                return 'f6cc5403-0d63-442e-96c0-285923709ffc';
+            case 'Showcase':
+                return '6142d2a0-63a5-4ba0-aede-d9fefca2c767';
+            case 'Topic':
+            default:
+                return '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+        }
+    }
 }
 _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableCommand_initTelemetry = function _SpoSiteCommSiteEnableCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            designPackageId: typeof args.options.designPackageId !== 'undefined'
+            designPackageId: typeof args.options.designPackageId !== 'undefined',
+            designPackage: typeof args.options.designPackage !== 'undefined'
         });
     });
 }, _SpoSiteCommSiteEnableCommand_initOptions = function _SpoSiteCommSiteEnableCommand_initOptions() {
@@ -54,12 +70,25 @@ _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableC
         option: '-u, --url <url>'
     }, {
         option: '-i, --designPackageId [designPackageId]'
+    }, {
+        option: '-p, --designPackage [designPackage]',
+        autocomplete: ["Topic", "Showcase", "Blank"]
+    });
+}, _SpoSiteCommSiteEnableCommand_initOptionSets = function _SpoSiteCommSiteEnableCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['designPackageId', 'designPackage'],
+        runsWhen: (args) => args.options.designPackageId || args.options.designPackage
     });
 }, _SpoSiteCommSiteEnableCommand_initValidators = function _SpoSiteCommSiteEnableCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.designPackageId &&
             !validation.isValidGuid(args.options.designPackageId)) {
-            return `${args.options.designPackageId} is not a valid GUID`;
+            return `${args.options.designPackageId} is not a valid GUID.`;
+        }
+        if (args.options.designPackage) {
+            if (['Topic', 'Showcase', 'Blank'].indexOf(args.options.designPackage) === -1) {
+                return `${args.options.designPackage} is not a valid designPackage. Allowed values are Topic|Showcase|Blank`;
+            }
         }
         return validation.isValidSharePointUrl(args.options.url);
     });

package/dist/m365/teams/commands/app/app-remove.js

@@ -3,9 +3,10 @@ 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 _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators;
+var _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators, _TeamsAppRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -22,20 +23,21 @@ class TeamsAppRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const { id: appId } = args.options;
         const removeApp = async () => {
-            if (this.verbose) {
-                await logger.logToStderr(`Removing app with ID ${args.options.id}`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                }
-            };
             try {
+                const appId = await this.getAppId(args.options, logger);
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing app with ID ${appId}`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
                 await request.delete(requestOptions);
             }
             catch (err) {
@@ -50,33 +52,65 @@ class TeamsAppRemoveCommand extends GraphCommand {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the Teams app ${appId} from the app catalog?`
+                message: `Are you sure you want to remove the Teams app ${args.options.id || args.options.name} from the app catalog?`
             });
             if (result.continue) {
                 await removeApp();
             }
         }
     }
+    async getAppId(options, logger) {
+        if (options.id) {
+            return options.id;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving app Id...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting.encodeQueryParameter(options.name)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        const app = response.value[0];
+        if (!app) {
+            throw `The specified Teams app does not exist`;
+        }
+        if (response.value.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Teams apps with name '${options.name}' found.`, resultAsKeyValuePair);
+            return result.id;
+        }
+        return app.id;
+    }
 }
 _TeamsAppRemoveCommand_instances = new WeakSet(), _TeamsAppRemoveCommand_initTelemetry = function _TeamsAppRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
+            force: (!(!args.options.force)).toString(),
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
         });
     });
 }, _TeamsAppRemoveCommand_initOptions = function _TeamsAppRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
     }, {
         option: '-f, --force'
     });
 }, _TeamsAppRemoveCommand_initValidators = function _TeamsAppRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
+}, _TeamsAppRemoveCommand_initOptionSets = function _TeamsAppRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 export default new TeamsAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map

package/dist/m365/teams/commands/channel/channel-member-add.js

@@ -91,11 +91,11 @@ class TeamsChannelMemberAddCommand extends GraphCommand {
         return channelItem.id;
     }
     async getUserId(args) {
-        if (args.options.userId) {
-            return args.options.userId.split(',').map(u => u.trim());
+        if (args.options.userIds) {
+            return args.options.userIds.split(',').map(u => u.trim());
         }
         const tasks = [];
-        const userDisplayNames = args.options.userDisplayName && args.options.userDisplayName.split(',').map(u => u.trim());
+        const userDisplayNames = args.options.userDisplayNames && args.options.userDisplayNames.split(',').map(u => u.trim());
         for (const userName of userDisplayNames) {
             tasks.push(this.getSingleUser(userName));
         }
@@ -129,8 +129,8 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
             teamName: typeof args.options.teamName !== 'undefined',
             channelId: typeof args.options.channelId !== 'undefined',
             channelName: typeof args.options.channelName !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userDisplayName: typeof args.options.userDisplayName !== 'undefined',
+            userIds: typeof args.options.userIds !== 'undefined',
+            userDisplayNames: typeof args.options.userDisplayNames !== 'undefined',
             owner: args.options.owner
         });
     });
@@ -144,9 +144,9 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
     }, {
         option: '--channelName [channelName]'
     }, {
-        option: '--userId [userId]'
+        option: '--userIds [userIds]'
     }, {
-        option: '--userDisplayName [userDisplayName]'
+        option: '--userDisplayNames [userDisplayNames]'
     }, {
         option: '--owner'
     });
@@ -161,7 +161,7 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
         return true;
     });
 }, _TeamsChannelMemberAddCommand_initOptionSets = function _TeamsChannelMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userId', 'userDisplayName'] });
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userIds', 'userDisplayNames'] });
 };
 export default new TeamsChannelMemberAddCommand();
 //# sourceMappingURL=channel-member-add.js.map

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