@pnp/cli-microsoft365 8.1.0-beta.bf59841 → 9.0.0-beta.1cfb646

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

@@ -16,7 +16,7 @@ class SpoListListCommand extends SpoCommand {
         return 'Lists all available list in the specified site';
     }
     defaultProperties() {
-        return ['Title', 'Url', 'Id'];
+        return ['Title', 'Id'];
     }
     constructor() {
         super();
@@ -36,9 +36,6 @@ class SpoListListCommand extends SpoCommand {
                 queryParams.push(`$filter=${args.options.filter}`);
             }
             const listInstances = await odata.getAllItems(`${args.options.webUrl}/_api/web/lists?${queryParams.join('&')}`);
-            listInstances.forEach(l => {
-                l.Url = l.RootFolder.ServerRelativeUrl;
-            });
             await logger.log(listInstances);
         }
         catch (err) {

package/dist/m365/spo/commands/site/site-appcatalog-remove.js

@@ -3,7 +3,8 @@ 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 _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators;
+var _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initTelemetry, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators, _SpoSiteAppCatalogRemoveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -21,47 +22,70 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoSiteAppCatalogRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        const url = args.options.siteUrl;
-        try {
-            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-            const requestDigest = await spo.getRequestDigest(spoAdminUrl);
+        const removeSiteAppcatalog = async () => {
+            const url = args.options.siteUrl;
             if (this.verbose) {
                 await logger.logToStderr(`Disabling site collection app catalog...`);
             }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': requestDigest.FormDigestValue
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
-            };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('Site collection app catalog disabled');
+            try {
+                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+                const requestDigest = await spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': requestDigest.FormDigestValue
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
+                };
+                const res = await request.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    if (this.verbose) {
+                        await logger.logToStderr('Site collection app catalog disabled');
+                    }
                 }
             }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeSiteAppcatalog();
         }
-        catch (err) {
-            this.handleRejectedPromise(err);
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app catalog from ${args.options.siteUrl}?` });
+            if (result) {
+                await removeSiteAppcatalog();
+            }
         }
     }
 }
-_SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
+_SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initTelemetry = function _SpoSiteAppCatalogRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-f, --force'
     });
 }, _SpoSiteAppCatalogRemoveCommand_initValidators = function _SpoSiteAppCatalogRemoveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
+}, _SpoSiteAppCatalogRemoveCommand_initTypes = function _SpoSiteAppCatalogRemoveCommand_initTypes() {
+    this.types.string.push('siteUrl');
 };
 export default new SpoSiteAppCatalogRemoveCommand();
 //# sourceMappingURL=site-appcatalog-remove.js.map

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

@@ -31,9 +31,6 @@ class SpoSiteRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.wait) {
-            await this.warn(logger, `Option 'wait' is deprecated and will be removed in the next major release.`);
-        }
         if (args.options.force) {
             await this.removeSite(logger, args.options);
         }
@@ -196,7 +193,6 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         Object.assign(this.telemetryProperties, {
             skipRecycleBin: !!args.options.skipRecycleBin,
             fromRecycleBin: !!args.options.fromRecycleBin,
-            wait: !!args.options.wait,
             force: !!args.options.force
         });
     });
@@ -207,8 +203,6 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         option: '--skipRecycleBin'
     }, {
         option: '--fromRecycleBin'
-    }, {
-        option: '--wait'
     }, {
         option: '-f, --force'
     });
@@ -230,7 +224,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
     });
 }, _SpoSiteRemoveCommand_initTypes = function _SpoSiteRemoveCommand_initTypes() {
     this.types.string.push('url');
-    this.types.boolean.push('skipRecycleBin', 'fromRecycleBin', 'wait', 'force');
+    this.types.boolean.push('skipRecycleBin', 'fromRecycleBin', 'force');
 };
 export default new SpoSiteRemoveCommand();
 //# sourceMappingURL=site-remove.js.map

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.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 _SpoTenantRecycleBinItemRestoreCommand_instances, _SpoTenantRecycleBinItemRestoreCommand_initTelemetry, _SpoTenantRecycleBinItemRestoreCommand_initOptions, _SpoTenantRecycleBinItemRestoreCommand_initValidators, _SpoTenantRecycleBinItemRestoreCommand_initTypes;
+var _SpoTenantRecycleBinItemRestoreCommand_instances, _SpoTenantRecycleBinItemRestoreCommand_initOptions, _SpoTenantRecycleBinItemRestoreCommand_initValidators, _SpoTenantRecycleBinItemRestoreCommand_initTypes;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -22,15 +22,11 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
     constructor() {
         super();
         _SpoTenantRecycleBinItemRestoreCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.wait) {
-            await this.warn(logger, `Option 'wait' is deprecated and will be removed in the next major release.`);
-        }
         try {
             if (this.verbose) {
                 await logger.logToStderr(`Restoring site collection '${args.options.siteUrl}' from recycle bin.`);
@@ -62,13 +58,6 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
                 };
                 await request.post(restoreOptions);
             }
-            // Here, we return a fixed response because this new API endpoint doesn't return a response while the previous API did.
-            // This has to be removed in the next major release.
-            await logger.log({
-                HasTimedout: false,
-                IsComplete: !!args.options.wait,
-                PollingInterval: 15000
-            });
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -79,23 +68,14 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
         return sites[0].GroupId;
     }
 }
-_SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initTelemetry = function _SpoTenantRecycleBinItemRestoreCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            wait: !!args.options.wait
-        });
-    });
-}, _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
+_SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
-    }, {
-        option: '--wait'
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initValidators = function _SpoTenantRecycleBinItemRestoreCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
 }, _SpoTenantRecycleBinItemRestoreCommand_initTypes = function _SpoTenantRecycleBinItemRestoreCommand_initTypes() {
     this.types.string.push('siteUrl');
-    this.types.boolean.push('wait');
 };
 export default new SpoTenantRecycleBinItemRestoreCommand();
 //# sourceMappingURL=tenant-recyclebinitem-restore.js.map

package/dist/m365/spo/commands.js

@@ -92,7 +92,6 @@ export default {
     FOLDER_LIST: `${prefix} folder list`,
     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`,

package/dist/utils/spo.js

@@ -12,6 +12,16 @@ import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js';
 import { entraGroup } from './entraGroup.js';
 import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js';
 import { setTimeout } from 'timers/promises';
+export var CreateCopyJobsNameConflictBehavior;
+(function (CreateCopyJobsNameConflictBehavior) {
+    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Fail"] = 0] = "Fail";
+    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Replace"] = 1] = "Replace";
+    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Rename"] = 2] = "Rename";
+})(CreateCopyJobsNameConflictBehavior || (CreateCopyJobsNameConflictBehavior = {}));
+// Wrapping this into a settings object so we can alter the values in tests
+export const settings = {
+    pollingInterval: 3000
+};
 export const spo = {
     async getRequestDigest(siteUrl) {
         const requestOptions = {
@@ -1484,6 +1494,70 @@ export const spo = {
         };
         const itemsResponse = await request.get(requestOptionsItems);
         return (itemsResponse);
+    },
+    /**
+     * Create a SharePoint copy job to copy a file/folder to another location.
+     * @param webUrl Absolute web URL where the source file/folder is located.
+     * @param sourceUrl Absolute URL of the source file/folder.
+     * @param destinationUrl Absolute URL of the destination folder.
+     * @param options Options for the copy job.
+     * @returns Copy job information. Use {@link spo.getCopyJobResult} to get the result of the copy job.
+     */
+    async createCopyJob(webUrl, sourceUrl, destinationUrl, options) {
+        const requestOptions = {
+            url: `${webUrl}/_api/Site/CreateCopyJobs`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                destinationUri: destinationUrl,
+                exportObjectUris: [sourceUrl],
+                options: {
+                    NameConflictBehavior: options?.nameConflictBehavior ?? CreateCopyJobsNameConflictBehavior.Fail,
+                    AllowSchemaMismatch: true,
+                    BypassSharedLock: !!options?.bypassSharedLock,
+                    IgnoreVersionHistory: !!options?.ignoreVersionHistory,
+                    CustomizedItemName: options?.newName ? [options.newName] : undefined,
+                    SameWebCopyMoveOptimization: true
+                }
+            }
+        };
+        const response = await request.post(requestOptions);
+        return response.value[0];
+    },
+    /**
+     * Poll until the copy job is finished and return the result.
+     * @param webUrl Absolute web URL where the copy job was created.
+     * @param copyJobInfo Information about the copy job.
+     * @throws Error if the copy job has failed.
+     * @returns Information about the destination object.
+     */
+    async getCopyJobResult(webUrl, copyJobInfo) {
+        const requestOptions = {
+            url: `${webUrl}/_api/Site/GetCopyJobProgress`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                copyJobInfo: copyJobInfo
+            }
+        };
+        let progress = await request.post(requestOptions);
+        while (progress.JobState !== 0) {
+            await setTimeout(settings.pollingInterval);
+            progress = await request.post(requestOptions);
+        }
+        const logs = progress.Logs.map(l => JSON.parse(l));
+        // Check if the job has failed
+        const errorLog = logs.find(l => l.Event === 'JobError');
+        if (errorLog) {
+            throw new Error(errorLog.Message);
+        }
+        // Get the destination object information
+        const objectInfo = logs.find(l => l.Event === 'JobFinishedObjectInfo');
+        return objectInfo;
     }
 };
 //# sourceMappingURL=spo.js.map

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

@@ -16,10 +16,10 @@ m365 app permission add [options]
 `--appId [appId]`
 : Client ID of the Microsoft Entra app registered in the .m365rc.json file to retrieve API permissions for.
 
-`--applicationPermission [applicationPermission]`
+`--applicationPermissions [applicationPermissions]`
 : Space-separated list of application permissions to add.
 
-`--delegatedPermission [delegatedPermission]`
+`--delegatedPermissions [delegatedPermissions]`
 : Space-separated list of delegated permissions to add.
 
 `--grantAdminConsent`
@@ -37,19 +37,19 @@ If you have multiple apps registered in your .m365rc.json file, you can specify
 Adds the specified application permissions to the default app registered in the _.m365rc.json_ file while granting admin consent.
 
 ```sh
-m365 app permission add --applicationPermission 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --grantAdminConsent
+m365 app permission add --applicationPermissions 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --grantAdminConsent
 ```
 
 Adds the specified delegated permissions to the default app registered in the _.m365rc.json_ file without granting admin consent.
 
 ```sh
-m365 app permission add --delegatedPermission 'https://graph.microsoft.com/offline_access'
+m365 app permission add --delegatedPermissions 'https://graph.microsoft.com/offline_access'
 ```
 
 Adds the specified application and delegated permissions to a specific app registered in the _.m365rc.json_ file while granting admin consent.
 
 ```sh
-m365 app permission add --appId '1663767b-4172-4519-bfd1-28e6ff19055b' --applicationPermission 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --delegatedPermission 'https://graph.microsoft.com/offline_access' --grantAdminConsent
+m365 app permission add --appId '1663767b-4172-4519-bfd1-28e6ff19055b' --applicationPermissions 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --delegatedPermissions 'https://graph.microsoft.com/offline_access' --grantAdminConsent
 ```
 
 ## Response

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

@@ -22,39 +22,39 @@ m365 entra sp add [options]
 ## Options
 
 ```md definition-list
-`--appId [appId]`
-: ID of the app for which the enterprise application should be created
+`-i, --id [id]`
+: ID of the app for which the enterprise application should be created.
 
-`--appName [appName]`
-: Display name of the app for which the enterprise application should be created
+`-n, --displayName [displayName]`
+: Display name of the app for which the enterprise application should be created.
 
 `--objectId [objectId]`
-: ObjectId of the app for which the enterprise application should be created
+: ObjectId of the app for which the enterprise application should be created.
 ```
 
 <Global />
 
 ## Remarks
 
-Specify either the `appId`, `appName` or `objectId`. If you specify more than one option value, the command will fail with an error.
+Specify either the `id`, `displayName` or `objectId`. If you specify more than one option value, the command will fail with an error.
 
 If you register an application in the portal, an application object as well as an enterprise application object are automatically created in your home tenant. If you register an application using CLI for Microsoft 365 or the Microsoft Graph, you'll need to create the enterprise application separately. To register/create an application using the CLI for Microsoft 365, use the [m365 entra app add](../app/app-add.mdx) command.
 
 ## Examples
 
-Creates an enterprise application for a registered Entra app with appId _b2307a39-e878-458b-bc90-03bc578531d6_.
+Creates an enterprise application for a registered Entra app with the specified id.
 
 ```sh
-m365 entra enterpriseapp add --appId b2307a39-e878-458b-bc90-03bc578531d6
+m365 entra enterpriseapp add --id b2307a39-e878-458b-bc90-03bc578531d6
 ```
 
-Creates an enterprise application for a registered Entra app with appName _Microsoft Graph_.
+Creates an enterprise application for a registered Entra app with the specified displayName.
 
 ```sh
-m365 entra enterpriseapp add --appName "Microsoft Graph"
+m365 entra enterpriseapp add --displayName "Microsoft Graph"
 ```
 
-Creates an enterprise application for a registered Entra app with objectId _b2307a39-e878-458b-bc90-03bc578531d6_.
+Creates an enterprise application for a registered Entra app with the specified objectId.
 
 ```sh
 m365 entra enterpriseapp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
@@ -172,7 +172,7 @@ m365 entra enterpriseapp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
   <TabItem value="Markdown">
 
   ```md
-  # entra enterpriseapp add --appId "8da75b6a-4272-4b17-8ee1-20ba66e2b06f"
+  # entra enterpriseapp add --id "8da75b6a-4272-4b17-8ee1-20ba66e2b06f"
 
   Date: 2023-06-02
 

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

@@ -22,40 +22,40 @@ m365 entra sp get [options]
 ## Options
 
 ```md definition-list
-`-i, --appId [appId]`
-: ID of the application for which the enterprise application should be retrieved
+`-i, --id [id]`
+: ID of the application for which the enterprise application should be retrieved.
 
-`-n, --appDisplayName [appDisplayName]`
-: Display name of the application for which the enterprise application should be retrieved
+`-n, --displayName [displayName]`
+: Display name of the application for which the enterprise application should be retrieved.
 
-`--appObjectId [appObjectId]`
-: ObjectId of the application for which the enterprise application should be retrieved
+`--objectId [objectId]`
+: ObjectId of the application for which the enterprise application should be retrieved.
 ```
 
 <Global />
 
 ## Remarks
 
-Specify either the `appId`, `appObjectId` or `appDisplayName`. If you specify more than one option value, the command will fail with an error.
+Specify either the `id`, `objectId` or `displayName`. If you specify more than one option value, the command will fail with an error.
 
 ## Examples
 
-Return details about the enterprise application with appId _b2307a39-e878-458b-bc90-03bc578531d6_.
+Return details about the enterprise application with the specified id.
 
 ```sh
-m365 entra enterpriseapp get --appId b2307a39-e878-458b-bc90-03bc578531d6
+m365 entra enterpriseapp get --id b2307a39-e878-458b-bc90-03bc578531d6
 ```
 
-Return details about the _Microsoft Graph_ enterprise application.
+Return details about the enterprise application with the specified displayName.
 
 ```sh
-m365 entra enterpriseapp get --appDisplayName "Microsoft Graph"
+m365 entra enterpriseapp get --displayName "Microsoft Graph"
 ```
 
-Return details about the enterprise application with ObjectId _b2307a39-e878-458b-bc90-03bc578531dd_.
+Return details about the enterprise application with the specified ObjectId.
 
 ```sh
-m365 entra enterpriseapp get --appObjectId b2307a39-e878-458b-bc90-03bc578531dd
+m365 entra enterpriseapp get --objectId b2307a39-e878-458b-bc90-03bc578531dd
 ```
 
 ## Response
@@ -198,7 +198,7 @@ m365 entra enterpriseapp get --appObjectId b2307a39-e878-458b-bc90-03bc578531dd
   <TabItem value="Markdown">
 
   ```md
-  # entra enterpriseapp get --appId "ac7c9b4b-83b0-4a5e-ace2-a3530162c8f8"
+  # entra enterpriseapp get --id "ac7c9b4b-83b0-4a5e-ace2-a3530162c8f8"
 
   Date: 2023-06-02
 

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

@@ -22,24 +22,24 @@ m365 entra sp list [options]
 ## Options
 
 ```md definition-list
-`--displayName [displayName]`
-: Returns only enterprise applications with the specified name
+`-n, --displayName [displayName]`
+: Returns only enterprise applications with the specified name.
 
 `--tag [tag]`
-: Returns only enterprise applications with the specified tag
+: Returns only enterprise applications with the specified tag.
 ```
 
 <Global />
 
 ## Examples
 
-Return a list of all enterprise applications
+Returns a list of all enterprise applications.
 
 ```sh
 m365 entra enterpriseapp list
 ```
 
-Return a list of all enterprise applications that comply with the display name and the tag parameters
+Returns a list of all enterprise applications that comply with the specified display name and the tag parameters.
 
 ```sh
 m365 entra enterpriseapp list --displayName "My custom enterprise application" --tag "WindowsAzureActiveDirectoryIntegratedApp"

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

@@ -22,10 +22,10 @@ m365 aad group user list [options]
 
 ```md definition-list
 `-i, --groupId [groupId]`
-: The ID of the Entra group. Specify `groupId` or `groupDisplayName` but not both.
+: The ID of the Entra group. Specify `groupId` or `groupName` but not both.
 
-`-n, --groupDisplayName [groupDisplayName]`
-: The display name of the Entra group. Specify `groupId` or `groupDisplayName` but not both.
+`-n, --groupName [groupName]`
+: The display name of the Entra group. Specify `groupId` or `groupName` but not both.
 
 `-r, --role [role]`
 : Filter the results to only users with the given role: `Owner`, `Member`.
@@ -54,25 +54,25 @@ m365 entra group user list --groupId 03cba9da-3974-46c1-afaf-79caa2e45bbe
 List all owners from a group specified by display name.
 
 ```sh
-m365 entra group user list --groupDisplayName Developers --role Owner
+m365 entra group user list --groupName Developers --role Owner
 ```
 
 List all group users from a group specified by name. For each one return the display name, e-mail address, and manager display name.
 
 ```sh
-m365 entra group user list --groupDisplayName Developers --properties "displayName,mail,manager/displayName"
+m365 entra group user list --groupName Developers --properties "displayName,mail,manager/displayName"
 ```
 
 List all group users from a group specified by name. For each one return the display name, e-mail address, and manager information.
 
 ```sh
-m365 entra group user list --groupDisplayName Developers --properties "displayName,mail,manager/*"
+m365 entra group user list --groupName Developers --properties "displayName,mail,manager/*"
 ```
 
 List all group members that are guest users.
 
 ```sh
-m365 entra group user list --groupDisplayName Developers --filter "userType eq 'Guest'"
+m365 entra group user list --groupName Developers --filter "userType eq 'Guest'"
 ```
 
 ## Response

package/docs/docs/cmd/entra/m365group/m365group-conversation-post-list.mdx

@@ -22,10 +22,10 @@ m365 aad m365group conversation post list [options]
 
 ```md definition-list
 `-i, --groupId [groupId]`
-: The Id of the Microsoft 365 Group. You can specify the groupId or groupDisplayName, but not both.
+: The Id of the Microsoft 365 Group. You can specify the groupId or groupName, but not both.
 
-`-d, --groupDisplayName [groupDisplayName]`
-: The Displayname of the Microsoft 365 Group. You can specify the groupId or groupDisplayName, but not both.
+`-d, --groupName [groupName]`
+: The Displayname of the Microsoft 365 Group. You can specify the groupId or groupName, but not both.
 
 `-t, --threadId <threadId>`
 : The ID of the thread to retrieve details for
@@ -41,10 +41,10 @@ Lists the posts of the specific conversation of Microsoft 365 group by groupId
 m365 entra m365group conversation post list --groupId '00000000-0000-0000-0000-000000000000' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
 ```
 
-Lists the posts of the specific conversation of Microsoft 365 group by groupDisplayName
+Lists the posts of the specific conversation of Microsoft 365 group by groupName
 
 ```sh
-m365 entra m365group conversation post list --groupDisplayName 'MyGroup' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
+m365 entra m365group conversation post list --groupName 'MyGroup' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
 ```
 
 ## Response

package/docs/docs/cmd/entra/m365group/m365group-recyclebinitem-list.mdx

@@ -21,7 +21,7 @@ m365 aad m365group recyclebinitem list [options]
 ## Options
 
 ```md definition-list
-`-d, --groupDisplayName [groupDisplayName]`
+`-d, --groupName [groupName]`
 : Lists groups with DisplayName starting with the specified value
 
 `-m, --groupMailNickname [groupMailNickname]`
@@ -41,7 +41,7 @@ m365 entra m365group recyclebinitem list
 List deleted Microsoft 365 Groups with display name starting with _Project_
 
 ```sh
-m365 entra m365group recyclebinitem list --groupDisplayName Project
+m365 entra m365group recyclebinitem list --groupName Project
 ```
 
 List deleted Microsoft 365 Groups mail nick name starting with _team_
@@ -53,7 +53,7 @@ m365 entra m365group recyclebinitem list --groupMailNickname team
 List deleted Microsoft 365 Groups mail nick name starting with _team_ and with display name starting with _Project_
 
 ```sh
-m365 entra m365group recyclebinitem list --groupMailNickname team --groupDisplayName Project
+m365 entra m365group recyclebinitem list --groupMailNickname team --groupName Project
 ```
 
 ## Response

package/docs/docs/cmd/entra/m365group/m365group-user-list.mdx

@@ -28,7 +28,7 @@ m365 aad m365group user list [options]
 : The display name of the Microsoft 365 group. Specify `groupId` or `groupDisplayName` but not both.
 
 `-r, --role [role]`
-: Filter the results to only users with the given role. Allowed values: `Owner`, `Member`, or (Deprecated) `Guest`.
+: Filter the results to only users with the given role. Allowed values: `Owner`, `Member`.
 
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve.