@pnp/cli-microsoft365 9.0.0-beta.33615bd → 9.0.0-beta.59b026e

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

@@ -0,0 +1,110 @@
+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 _SpoFolderSharingLinkListCommand_instances, _SpoFolderSharingLinkListCommand_initTelemetry, _SpoFolderSharingLinkListCommand_initOptions, _SpoFolderSharingLinkListCommand_initOptionSets, _SpoFolderSharingLinkListCommand_initValidators, _SpoFolderSharingLinkListCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import { spo } from '../../../../utils/spo.js';
+import { odata } from '../../../../utils/odata.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { drive } from '../../../../utils/drive.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpoFolderSharingLinkListCommand extends SpoCommand {
+    get name() {
+        return commands.FOLDER_SHARINGLINK_LIST;
+    }
+    get description() {
+        return 'Lists all the sharing links of a specific folder';
+    }
+    defaultProperties() {
+        return ['id', 'scope', 'roles', 'link'];
+    }
+    constructor() {
+        super();
+        _SpoFolderSharingLinkListCommand_instances.add(this);
+        this.allowedScopes = ['anonymous', 'users', 'organization'];
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving sharing links for folder ${args.options.folderId || args.options.folderUrl}...`);
+        }
+        try {
+            const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
+            const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
+            const folderUrl = new URL(absoluteFolderUrl);
+            const siteId = await spo.getSiteId(args.options.webUrl);
+            const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
+            const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
+            let requestUrl = `https://graph.microsoft.com/v1.0/drives/${driveDetails.id}/items/${itemId}/permissions?$filter=Link ne null`;
+            if (args.options.scope) {
+                requestUrl += ` and Link/Scope eq '${args.options.scope}'`;
+            }
+            const sharingLinks = await odata.getAllItems(requestUrl);
+            // remove grantedToIdentities from the sharing link object
+            const filteredSharingLinks = sharingLinks.map(link => {
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                const { grantedToIdentities, ...filteredLink } = link;
+                return filteredLink;
+            });
+            if (!args.options.output || !cli.shouldTrimOutput(args.options.output)) {
+                await logger.log(filteredSharingLinks);
+            }
+            else {
+                //converted to text friendly output
+                await logger.log(filteredSharingLinks.map(i => {
+                    return {
+                        id: i.id,
+                        roles: i.roles.join(','),
+                        link: i.link.webUrl,
+                        scope: i.link.scope
+                    };
+                }));
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_SpoFolderSharingLinkListCommand_instances = new WeakSet(), _SpoFolderSharingLinkListCommand_initTelemetry = function _SpoFolderSharingLinkListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            folderUrl: typeof args.options.folderUrl !== 'undefined',
+            folderId: typeof args.options.folderId !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined'
+        });
+    });
+}, _SpoFolderSharingLinkListCommand_initOptions = function _SpoFolderSharingLinkListCommand_initOptions() {
+    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '--folderUrl [folderUrl]' }, { option: '--folderId [folderId]' }, {
+        option: '-s, --scope [scope]',
+        autocomplete: this.allowedScopes
+    });
+}, _SpoFolderSharingLinkListCommand_initOptionSets = function _SpoFolderSharingLinkListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['folderUrl', 'folderId'] });
+}, _SpoFolderSharingLinkListCommand_initValidators = function _SpoFolderSharingLinkListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.folderId && !validation.isValidGuid(args.options.folderId)) {
+            return `${args.options.folderId} is not a valid GUID`;
+        }
+        if (args.options.scope && !this.allowedScopes.some(scope => scope === args.options.scope)) {
+            return `'${args.options.scope}' is not a valid scope. Allowed values are: ${this.allowedScopes.join(',')}`;
+        }
+        return true;
+    });
+}, _SpoFolderSharingLinkListCommand_initTypes = function _SpoFolderSharingLinkListCommand_initTypes() {
+    this.types.string.push('webUrl', 'folderUrl', 'folderId', 'scope');
+};
+export default new SpoFolderSharingLinkListCommand();
+//# sourceMappingURL=folder-sharinglink-list.js.map

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

@@ -1,2 +1,7 @@
-export {};
+export var DefaultTrimModeType;
+(function (DefaultTrimModeType) {
+    DefaultTrimModeType[DefaultTrimModeType["NoExpiration"] = 0] = "NoExpiration";
+    DefaultTrimModeType[DefaultTrimModeType["ExpireAfter"] = 1] = "ExpireAfter";
+    DefaultTrimModeType[DefaultTrimModeType["AutoExpiration"] = 2] = "AutoExpiration";
+})(DefaultTrimModeType || (DefaultTrimModeType = {}));
 //# sourceMappingURL=ListInstance.js.map

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

@@ -10,6 +10,7 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { DefaultTrimModeType } from "./ListInstance.js";
 import { ListPrincipalType } from './ListPrincipalType.js';
 class SpoListGetCommand extends SpoCommand {
     get name() {
@@ -49,9 +50,11 @@ class SpoListGetCommand extends SpoCommand {
         if (fieldsProperties.expandProperties.length > 0) {
             queryParams.push(`$expand=${fieldsProperties.expandProperties.join(',')}`);
         }
-        const querystring = queryParams.length > 0 ? `?${queryParams.join('&')}` : ``;
+        if (queryParams.length === 0) {
+            queryParams.push(`$expand=VersionPolicies`);
+        }
         const requestOptions = {
-            url: `${requestUrl}${querystring}`,
+            url: `${requestUrl}?${queryParams.join('&')}`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -64,6 +67,9 @@ class SpoListGetCommand extends SpoCommand {
                     r.Member.PrincipalTypeString = ListPrincipalType[r.Member.PrincipalType];
                 });
             }
+            if (listInstance.VersionPolicies) {
+                listInstance.VersionPolicies.DefaultTrimModeValue = DefaultTrimModeType[listInstance.VersionPolicies.DefaultTrimMode];
+            }
             await logger.log(listInstance);
         }
         catch (err) {
@@ -74,7 +80,7 @@ class SpoListGetCommand extends SpoCommand {
         const selectProperties = [];
         let expandProperties = [];
         if (withPermissions) {
-            expandProperties = ['HasUniqueRoleAssignments', 'RoleAssignments/Member', 'RoleAssignments/RoleDefinitionBindings'];
+            expandProperties = ['HasUniqueRoleAssignments', 'RoleAssignments/Member', 'RoleAssignments/RoleDefinitionBindings', 'VersionPolicies'];
         }
         if (properties) {
             properties.split(',').forEach((property) => {

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.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`,
@@ -100,6 +99,8 @@ export default {
     FOLDER_ROLEASSIGNMENT_ADD: `${prefix} folder roleassignment add`,
     FOLDER_ROLEINHERITANCE_BREAK: `${prefix} folder roleinheritance break`,
     FOLDER_ROLEINHERITANCE_RESET: `${prefix} folder roleinheritance reset`,
+    FOLDER_SHARINGLINK_GET: `${prefix} folder sharinglink get`,
+    FOLDER_SHARINGLINK_LIST: `${prefix} folder sharinglink list`,
     GET: `${prefix} get`,
     GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,

package/dist/utils/drive.js

@@ -0,0 +1,61 @@
+import request from "../request.js";
+export const drive = {
+    /**
+     * Retrieves the Drive associated with the specified site and URL.
+     * @param siteId Site ID
+     * @param url Drive URL
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     * @returns The Drive associated with the drive URL.
+     */
+    async getDriveByUrl(siteId, url, logger, verbose) {
+        if (verbose && logger) {
+            await logger.logToStderr(`Retrieving drive information for URL: ${url.href}`);
+        }
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const drives = await request.get(requestOptions);
+        const lowerCaseFolderUrl = url.href.toLowerCase();
+        const drive = drives.value
+            .sort((a, b) => b.webUrl.localeCompare(a.webUrl))
+            .find((d) => {
+            const driveUrl = d.webUrl.toLowerCase();
+            return lowerCaseFolderUrl.startsWith(driveUrl) &&
+                (driveUrl.length === lowerCaseFolderUrl.length ||
+                    lowerCaseFolderUrl[driveUrl.length] === '/');
+        });
+        if (!drive) {
+            throw new Error(`Drive '${url.href}' not found`);
+        }
+        return drive;
+    },
+    /**
+     * Retrieves the ID of a drive item (file, folder, etc.) associated with the given drive and item URL.
+     * @param drive The Drive object containing the item
+     * @param itemUrl Item URL
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     * @returns Drive item ID
+     */
+    async getDriveItemId(drive, itemUrl, logger, verbose) {
+        const relativeItemUrl = itemUrl.href.replace(new RegExp(`${drive.webUrl}`, 'i'), '').replace(/\/+$/, '');
+        if (verbose && logger) {
+            await logger.logToStderr(`Retrieving drive item ID for URL: ${relativeItemUrl}`);
+        }
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/drives/${drive.id}/root${relativeItemUrl ? `:${relativeItemUrl}` : ''}?$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const driveItem = await request.get(requestOptions);
+        return driveItem?.id;
+    }
+};
+//# sourceMappingURL=drive.js.map

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 = {
@@ -1405,6 +1415,38 @@ export const spo = {
         const site = await request.get(requestOptions);
         return site.id;
     },
+    /**
+     * Retrieves the server-relative URL of a folder.
+     * @param webUrl Web URL
+     * @param folderUrl Folder URL
+     * @param folderId Folder ID
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     * @returns The server-relative URL of the folder
+     */
+    async getFolderServerRelativeUrl(webUrl, folderUrl, folderId, logger, verbose) {
+        if (verbose && logger) {
+            await logger.logToStderr(`Retrieving server-relative URL for folder ${folderUrl ? `URL: ${folderUrl}` : `ID: ${folderId}`}`);
+        }
+        let requestUrl = `${webUrl}/_api/web/`;
+        if (folderUrl) {
+            const folderServerRelativeUrl = urlUtil.getServerRelativePath(webUrl, folderUrl);
+            requestUrl += `GetFolderByServerRelativePath(decodedUrl='${formatting.encodeQueryParameter(folderServerRelativeUrl)}')`;
+        }
+        else {
+            requestUrl += `GetFolderById('${folderId}')`;
+        }
+        requestUrl += '?$select=ServerRelativeUrl';
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        return res.ServerRelativeUrl;
+    },
     /**
      * Retrieves the ObjectIdentity from a SharePoint site
      * @param webUrl web url
@@ -1484,6 +1526,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/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/m365group/m365group-user-add.mdx

@@ -26,13 +26,25 @@ m365 teams user add
 
 ```md definition-list
 `-i, --groupId [groupId]`
-: The ID of the Microsoft 365 Group to which to add the user
+: The ID of the Microsoft 365 group. Specify only one of the following: `groupId`, `groupName`, `teamId`, or `teamName`.
+
+`--groupName [groupName]`
+: The display name of the Microsoft 365 group. Specify only one of the following: `groupId`, `groupName`, `teamId`, or `teamName`.
 
 `--teamId [teamId]`
-: The ID of the Teams team to which to add the user
+: The ID of the Teams team. Specify only one of the following: `groupId`, `groupName`, `teamId`, or `teamName`.
+
+`--teamName [teamName]`
+: The display name of the Microsoft Teams team. Specify only one of the following: `groupId`, `groupName`, `teamId`, or `teamName`.
+
+`-n, --userName [userName]`
+: (deprecated) User's UPN (User Principal Name), e.g. johndoe@example.com.
+
+`--ids [ids]`
+: Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids` or `userNames` but not both.
 
-`-n, --userName <userName>`
-: User's UPN (user principal name, eg. johndoe@example.com)
+`--userNames [userNames]`
+: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `ids` or `userNames` but not both.
 
 `-r, --role [role]`
 : The role to be assigned to the new user: `Owner,Member`. Default `Member`
@@ -42,22 +54,28 @@ m365 teams user add
 
 ## Examples
 
-Add a new member to the specified Microsoft 365 Group
+Add a new member with the userNames parameter to the specified Microsoft 365 Group
+
+```sh
+m365 entra m365group user add --groupId '00000000-0000-0000-0000-000000000000' --userNames 'anne.matthews@contoso.onmicrosoft.com'
+```
+
+Add multiple new owners with the userNames parameter to the specified Microsoft 365 Group
 
 ```sh
-m365 entra m365group user add --groupId '00000000-0000-0000-0000-000000000000' --userName 'anne.matthews@contoso.onmicrosoft.com'
+m365 entra m365group user add --groupName 'Contoso' --userNames 'anne.matthews@contoso.onmicrosoft.com, john.doe@contoso.onmicrosoft.com' --role Owner
 ```
 
-Add a new owner to the specified Microsoft 365 Group
+Add a new member with the userNames parameter to the specified Microsoft Teams team
 
 ```sh
-m365 entra m365group user add --groupId '00000000-0000-0000-0000-000000000000' --userName 'anne.matthews@contoso.onmicrosoft.com' --role Owner
+m365 entra m365group member add --teamId '00000000-0000-0000-0000-000000000000' --userNames 'anne.matthews@contoso.onmicrosoft.com' --role Member
 ```
 
-Add a new member to the specified Microsoft Teams team
+Add multiple new members with the ids parameter to the specified Microsoft Teams team
 
 ```sh
-m365 teams user add --teamId '00000000-0000-0000-0000-000000000000' --userName 'anne.matthews@contoso.onmicrosoft.com'
+m365 entra m365group user add --teamName 'Engineering' --ids '74a3b772-3122-447b-b9da-10895e238219,dd3d21e4-a142-46b9-8482-bca8fe9596b3' --role Member
 ```
 
 ## Response