@pnp/cli-microsoft365 9.0.0-beta.2f8dd1e → 9.0.0-beta.59b026e

package/dist/utils/formatting.js

@@ -9,6 +9,8 @@ export var CheckStatus;
 (function (CheckStatus) {
     CheckStatus[CheckStatus["Success"] = 0] = "Success";
     CheckStatus[CheckStatus["Failure"] = 1] = "Failure";
+    CheckStatus[CheckStatus["Information"] = 2] = "Information";
+    CheckStatus[CheckStatus["Warning"] = 3] = "Warning";
 })(CheckStatus || (CheckStatus = {}));
 export const formatting = {
     escapeXml(s) {
@@ -37,6 +39,22 @@ export const formatting = {
     parseJsonWithBom(s) {
         return JSON.parse(s.replace(/^\uFEFF/, ''));
     },
+    /**
+     * Tries to parse a string as JSON. If it fails, returns the original string.
+     * @param value JSON string to parse.
+     * @returns JSON object or the original string if parsing fails.
+     */
+    tryParseJson(value) {
+        try {
+            if (typeof value !== 'string') {
+                return value;
+            }
+            return JSON.parse(value);
+        }
+        catch {
+            return value;
+        }
+    },
     filterObject(obj, propertiesToInclude) {
         const objKeys = Object.keys(obj);
         return propertiesToInclude
@@ -152,7 +170,18 @@ export const formatting = {
             process.env.TERM === 'xterm-256color';
         const success = primarySupported ? '✔' : '√';
         const failure = primarySupported ? '✖' : '×';
-        return `${result === CheckStatus.Success ? chalk.green(success) : chalk.red(failure)} ${message}`;
+        const information = 'i';
+        const warning = '!';
+        switch (result) {
+            case CheckStatus.Success:
+                return `${chalk.green(success)} ${message}`;
+            case CheckStatus.Failure:
+                return `${chalk.red(failure)} ${message}`;
+            case CheckStatus.Information:
+                return `${chalk.blue(information)} ${message}`;
+            case CheckStatus.Warning:
+                return `${chalk.yellow(warning)} ${message}`;
+        }
     },
     convertArrayToHashTable(key, array) {
         const resultAsKeyValuePair = {};

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 = {
@@ -454,15 +464,46 @@ export const spo = {
         const res = await request.get(requestOptions);
         return res.AadObjectId.NameId;
     },
+    /**
+     * Ensure a user exists on a specific SharePoint site.
+     * @param webUrl URL of the SharePoint site.
+     * @param logonName Logon name of the user to ensure on the SharePoint site.
+     * @returns SharePoint user object.
+     */
+    async ensureUser(webUrl, logonName) {
+        const requestOptions = {
+            url: `${webUrl}/_api/web/EnsureUser`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                logonName: logonName
+            }
+        };
+        return request.post(requestOptions);
+    },
+    /**
+     * Ensure a Microsoft Entra ID group exists on a specific SharePoint site.
+     * @param webUrl URL of the SharePoint site.
+     * @param group Microsoft Entra ID group.
+     * @returns SharePoint user object.
+     */
+    async ensureEntraGroup(webUrl, group) {
+        if (!group.securityEnabled) {
+            throw new Error('Cannot ensure a Microsoft Entra ID group that is not security enabled.');
+        }
+        return this.ensureUser(webUrl, group.mailEnabled ? `c:0o.c|federateddirectoryclaimprovider|${group.id}` : `c:0t.c|tenant|${group.id}`);
+    },
     /**
    * Retrieves the spo user by email.
    * @param webUrl Web url
    * @param email The email of the user
    * @param logger the Logger object
-   * @param debug set if debug logging should be logged
+   * @param verbose set if verbose logging should be logged
    */
-    async getUserByEmail(webUrl, email, logger, debug) {
-        if (debug) {
+    async getUserByEmail(webUrl, email, logger, verbose) {
+        if (verbose) {
             await logger.logToStderr(`Retrieving the spo user by email ${email}`);
         }
         const requestUrl = `${webUrl}/_api/web/siteusers/GetByEmail('${formatting.encodeQueryParameter(email)}')`;
@@ -533,10 +574,10 @@ export const spo = {
     * @param webUrl Web url
     * @param name The name of the group
     * @param logger the Logger object
-    * @param debug set if debug logging should be logged
+    * @param verbose set if verbose logging should be logged
     */
-    async getGroupByName(webUrl, name, logger, debug) {
-        if (debug) {
+    async getGroupByName(webUrl, name, logger, verbose) {
+        if (verbose) {
             await logger.logToStderr(`Retrieving the group by name ${name}`);
         }
         const requestUrl = `${webUrl}/_api/web/sitegroups/GetByName('${formatting.encodeQueryParameter(name)}')`;
@@ -1374,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
@@ -1453,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/dist/utils/teams.js

@@ -0,0 +1,49 @@
+import { formatting } from './formatting.js';
+import { odata } from './odata.js';
+import { cli } from '../cli/cli.js';
+const graphResource = 'https://graph.microsoft.com';
+export const teams = {
+    /**
+     * Retrieve the id of a team by its name.
+     * @param displayName Name of the team to retrieve.
+     * @throws Error if the team cannot be found.
+     * @throws Error when multiple teams with the same name and prompting is disabled.
+     * @returns The ID of the team.
+     */
+    async getTeamIdByDisplayName(displayName) {
+        const teams = await odata.getAllItems(`${graphResource}/v1.0/teams?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'&$select=id`);
+        if (!teams.length) {
+            throw Error(`The specified team '${displayName}' does not exist.`);
+        }
+        if (teams.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', teams);
+            const result = await cli.handleMultipleResultsFound(`Multiple teams with name '${displayName}' found.`, resultAsKeyValuePair);
+            return result.id;
+        }
+        return teams[0].id;
+    },
+    /**
+     * Retrieves the channel ID by its name in a Microsoft Teams team.
+     * @param teamId The ID of the team.
+     * @param name The name of the channel.
+     * @returns The ID of the channel.
+     * @throws Throws an error if the specified channel does not exist in the team.
+     */
+    async getChannelIdByDisplayName(teamId, name) {
+        const channelRequestOptions = {
+            url: `${graphResource}/v1.0/teams/${teamId}/channels?$filter=displayName eq '${formatting.encodeQueryParameter(name)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const response = await odata.getAllItems(channelRequestOptions);
+        // Only one channel can have the same name in a team
+        const channelItem = response[0];
+        if (!channelItem) {
+            throw Error(`The channel '${name}' does not exist in the Microsoft Teams team with ID '${teamId}'.`);
+        }
+        return channelItem.id;
+    }
+};
+//# sourceMappingURL=teams.js.map

package/dist/utils/validation.js

@@ -1,3 +1,4 @@
+import { formatting } from "./formatting.js";
 export const validation = {
     isValidGuidArray(guidsString) {
         const guids = guidsString.split(',').map(guid => guid.trim());
@@ -33,6 +34,24 @@ export const validation = {
         // verify if the upn is a valid upn. @meusername will be replaced in a later stage with the actual username of the logged in user
         return upnRegEx.test(upn) || upn.toLowerCase().trim() === '@meusername';
     },
+    /**
+     * Validates if the provided number is a valid positive integer (1 or higher).
+     * @param integer Integer value.
+     * @returns True if integer, false otherwise.
+     */
+    isValidPositiveInteger(integer) {
+        return !isNaN(Number(integer)) && Number.isInteger(+integer) && +integer > 0;
+    },
+    /**
+     * Validates an array of integers. The integers must be positive (1 or higher).
+     * @param integerString Comma-separated string of integers.
+     * @returns True if the integers are valid, an error message with the invalid integers otherwise.
+     */
+    isValidPositiveIntegerArray(integerString) {
+        const integers = formatting.splitAndTrim(integerString);
+        const invalidIntegers = integers.filter(integer => !this.isValidPositiveInteger(integer));
+        return invalidIntegers.length > 0 ? invalidIntegers.join(', ') : true;
+    },
     isDateInRange(date, monthOffset) {
         const d = new Date(date);
         const cutoffDate = new Date();

package/dist/utils/zod.js

@@ -0,0 +1,124 @@
+import { z } from 'zod';
+function parseEffect(def, _options, _currentOption) {
+    return def.schema._def;
+}
+function parseIntersection(def, _options, _currentOption) {
+    if (def.left._def.typeName !== z.ZodFirstPartyTypeKind.ZodAny) {
+        return def.left._def;
+    }
+    if (def.right._def.typeName !== z.ZodFirstPartyTypeKind.ZodAny) {
+        return def.right._def;
+    }
+    return;
+}
+function parseObject(def, options, _currentOption) {
+    const properties = def.shape();
+    for (const key in properties) {
+        const property = properties[key];
+        const option = {
+            name: key,
+            long: key,
+            short: property._def.alias,
+            required: true,
+            type: 'string'
+        };
+        parseDef(property._def, options, option);
+        options.push(option);
+    }
+    return;
+}
+function parseString(_def, _options, currentOption) {
+    if (currentOption) {
+        currentOption.type = 'string';
+    }
+    return;
+}
+function parseNumber(_def, _options, currentOption) {
+    if (currentOption) {
+        currentOption.type = 'number';
+    }
+    return;
+}
+function parseBoolean(_def, _options, currentOption) {
+    if (currentOption) {
+        currentOption.type = 'boolean';
+    }
+    return;
+}
+function parseOptional(def, _options, currentOption) {
+    if (currentOption) {
+        currentOption.required = false;
+    }
+    return def.innerType._def;
+}
+function parseDefault(def, _options, currentOption) {
+    if (currentOption) {
+        currentOption.required = false;
+    }
+    return def.innerType._def;
+}
+function parseEnum(def, _options, currentOption) {
+    if (currentOption) {
+        currentOption.type = 'string';
+        currentOption.autocomplete = def.values;
+    }
+    return;
+}
+function parseNativeEnum(def, _options, currentOption) {
+    if (currentOption) {
+        currentOption.type = 'string';
+        currentOption.autocomplete = Object.getOwnPropertyNames(def.values);
+    }
+    return;
+}
+function getParseFn(typeName) {
+    switch (typeName) {
+        case z.ZodFirstPartyTypeKind.ZodEffects:
+            return parseEffect;
+        case z.ZodFirstPartyTypeKind.ZodObject:
+            return parseObject;
+        case z.ZodFirstPartyTypeKind.ZodOptional:
+            return parseOptional;
+        case z.ZodFirstPartyTypeKind.ZodString:
+            return parseString;
+        case z.ZodFirstPartyTypeKind.ZodNumber:
+            return parseNumber;
+        case z.ZodFirstPartyTypeKind.ZodBoolean:
+            return parseBoolean;
+        case z.ZodFirstPartyTypeKind.ZodEnum:
+            return parseEnum;
+        case z.ZodFirstPartyTypeKind.ZodNativeEnum:
+            return parseNativeEnum;
+        case z.ZodFirstPartyTypeKind.ZodDefault:
+            return parseDefault;
+        case z.ZodFirstPartyTypeKind.ZodIntersection:
+            return parseIntersection;
+        default:
+            return;
+    }
+}
+function parseDef(def, options, currentOption) {
+    let parsedDef = def;
+    do {
+        const parse = getParseFn(parsedDef.typeName);
+        if (!parse) {
+            break;
+        }
+        parsedDef = parse(parsedDef, options, currentOption);
+        if (!parsedDef) {
+            break;
+        }
+    } while (parsedDef);
+}
+export const zod = {
+    alias(alias, type) {
+        type._def.alias = alias;
+        return type;
+    },
+    schemaToOptions(schema) {
+        const options = [];
+        parseDef(schema._def, options);
+        return options;
+    }
+};
+//# sourceMappingURL=zod.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/connection/connection-use.mdx

@@ -15,7 +15,7 @@ m365 connection use [options]
 ## Options
 
 ```md definition-list
-`-n, --name <name>`
+`-n, --name [name]`
 : The name of the connection to switch to.
 ```
 
@@ -23,7 +23,13 @@ m365 connection use [options]
 
 ## Remarks
 
-The value for `--name` can be found by running [m365 connection list](connection-list.mdx). You can update the name of a connection by running [m365 connection set](connection-set.mdx). 
+:::tip
+
+If you haven't disabled the "prompt" setting, running this command without options will show a list of available connections. You can then select the connection to activate it.
+
+:::
+
+You can update the name of a connection by running [m365 connection set](connection-set.mdx).
 
 ## Examples
 

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"