@pnp/cli-microsoft365 6.0.0-beta.09b5216 → 6.0.0-beta.0e3b373

package/dist/utils/pid.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pid = void 0;
+const os = require("os");
+const fs = require("fs");
+const child_process_1 = require("child_process");
+const cache_1 = require("./cache");
+function getProcessNameOnMacOs(pid) {
+    const stdout = (0, child_process_1.execSync)(`ps -o comm= ${pid}`, { encoding: 'utf8' });
+    return stdout.trim();
+}
+function getProcessNameOnLinux(pid) {
+    if (!fs.existsSync(`/proc/${pid}/stat`)) {
+        return undefined;
+    }
+    const stat = fs.readFileSync(`/proc/${pid}/stat`, 'utf8');
+    const start = stat.indexOf('(');
+    const procName = stat.substring(start + 1, stat.indexOf(')') - start);
+    return procName;
+}
+function getProcessNameOnWindows(pid) {
+    const stdout = (0, child_process_1.execSync)(`wmic PROCESS where ProcessId=${pid} get Caption | find /V "Caption"`, { encoding: 'utf8' });
+    return stdout.trim();
+}
+exports.pid = {
+    getProcessName(pid) {
+        let processName = cache_1.cache.getValue(pid.toString());
+        if (processName) {
+            return processName;
+        }
+        let getPidName = undefined;
+        const platform = os.platform();
+        if (platform.indexOf('win') === 0) {
+            getPidName = getProcessNameOnWindows;
+        }
+        if (platform === 'darwin') {
+            getPidName = getProcessNameOnMacOs;
+        }
+        if (platform === 'linux') {
+            getPidName = getProcessNameOnLinux;
+        }
+        if (getPidName) {
+            try {
+                processName = getPidName(pid);
+                if (processName) {
+                    cache_1.cache.setValue(pid.toString(), processName);
+                }
+                return processName;
+            }
+            catch (_a) {
+                return undefined;
+            }
+        }
+        return undefined;
+    }
+};
+//# sourceMappingURL=pid.js.map

package/dist/utils/planner.js

@@ -45,19 +45,19 @@ exports.planner = {
         return odata_1.odata.getAllItems(`${graphResource}/v1.0/groups/${groupId}/planner/plans`, 'none');
     },
     /**
-     * Get Planner plan by name in a specific group.
-     * @param name Name of the Planner plan. Case insensitive.
+     * Get Planner plan by title in a specific group.
+     * @param title Title of the Planner plan. Case insensitive.
      * @param groupId Owner group ID .
      */
-    getPlanByName(name, groupId) {
+    getPlanByTitle(title, groupId) {
         return __awaiter(this, void 0, void 0, function* () {
             const plans = yield this.getPlansByGroupId(groupId);
-            const filteredPlans = plans.filter(p => p.title && p.title.toLowerCase() === name.toLowerCase());
+            const filteredPlans = plans.filter(p => p.title && p.title.toLowerCase() === title.toLowerCase());
             if (!filteredPlans.length) {
-                throw Error(`The specified plan '${name}' does not exist.`);
+                throw Error(`The specified plan '${title}' does not exist.`);
             }
             if (filteredPlans.length > 1) {
-                throw Error(`Multiple plans with name '${name}' found: ${filteredPlans.map(x => x.id)}.`);
+                throw Error(`Multiple plans with title '${title}' found: ${filteredPlans.map(x => x.id)}.`);
             }
             return filteredPlans[0];
         });

package/dist/utils/powerPlatform.js

@@ -0,0 +1,43 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.powerPlatform = void 0;
+const request_1 = require("../request");
+const formatting_1 = require("./formatting");
+const powerPlatformResource = 'https://api.bap.microsoft.com';
+exports.powerPlatform = {
+    getDynamicsInstanceApiUrl(environment, asAdmin) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url = '';
+            if (asAdmin) {
+                url = `${powerPlatformResource}/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments/${formatting_1.formatting.encodeQueryParameter(environment)}`;
+            }
+            else {
+                url = `${powerPlatformResource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(environment)}`;
+            }
+            const requestOptions = {
+                url: `${url}?api-version=2020-10-01&$select=properties.linkedEnvironmentMetadata.instanceApiUrl`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const response = yield request_1.default.get(requestOptions);
+                return Promise.resolve(response.properties.linkedEnvironmentMetadata.instanceApiUrl);
+            }
+            catch (ex) {
+                throw Error(`The environment '${environment}' could not be retrieved. See the inner exception for more details: ${ex.message}`);
+            }
+        });
+    }
+};
+//# sourceMappingURL=powerPlatform.js.map

package/dist/utils/spo.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.spo = void 0;
 const url = require("url");
-const _1 = require(".");
+const urlUtil_1 = require("./urlUtil");
+const validation_1 = require("./validation");
 const Auth_1 = require("../Auth");
 const config_1 = require("../config");
 const base_permissions_1 = require("../m365/spo/base-permissions");
 const request_1 = require("../request");
+const formatting_1 = require("./formatting");
 exports.spo = {
     getRequestDigest(siteUrl) {
         const requestOptions = {
@@ -20,7 +22,7 @@ exports.spo = {
     },
     ensureFormDigest(siteUrl, logger, context, debug) {
         return new Promise((resolve, reject) => {
-            if (_1.validation.isValidFormDigest(context)) {
+            if (validation_1.validation.isValidFormDigest(context)) {
                 if (debug) {
                     logger.logToStderr('Existing form digest still valid');
                 }
@@ -255,7 +257,7 @@ exports.spo = {
             webFullUrl[webFullUrlLastCharPos] === '/') {
             webFullUrl = webFullUrl.substring(0, webFullUrlLastCharPos);
         }
-        folderToEnsure = _1.urlUtil.getWebRelativePath(webFullUrl, folderToEnsure);
+        folderToEnsure = urlUtil_1.urlUtil.getWebRelativePath(webFullUrl, folderToEnsure);
         if (debug) {
             logger.log(`folderToEnsure`);
             logger.log(folderToEnsure);
@@ -282,9 +284,9 @@ exports.spo = {
             // append the next sub-folder to the folder path and check if it exists
             prevFolder = nextFolder;
             nextFolder += `/${folders[folderIndex]}`;
-            const folderServerRelativeUrl = _1.urlUtil.getServerRelativePath(webFullUrl, nextFolder);
+            const folderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webFullUrl, nextFolder);
             const requestOptions = {
-                url: `${webFullUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderServerRelativeUrl)}')`,
+                url: `${webFullUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderServerRelativeUrl)}')`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 }
@@ -296,9 +298,9 @@ exports.spo = {
                 checkOrAddFolder(resolve, reject);
             })
                 .catch(() => {
-                const prevFolderServerRelativeUrl = _1.urlUtil.getServerRelativePath(webFullUrl, prevFolder);
+                const prevFolderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webFullUrl, prevFolder);
                 const requestOptions = {
-                    url: `${webFullUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl=@a1)/AddSubFolderUsingPath(DecodedUrl=@a2)?@a1=%27${encodeURIComponent(prevFolderServerRelativeUrl)}%27&@a2=%27${encodeURIComponent(folders[folderIndex])}%27`,
+                    url: `${webFullUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl=@a1)/AddSubFolderUsingPath(DecodedUrl=@a2)?@a1=%27${formatting_1.formatting.encodeQueryParameter(prevFolderServerRelativeUrl)}%27&@a2=%27${formatting_1.formatting.encodeQueryParameter(folders[folderIndex])}%27`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -402,7 +404,7 @@ exports.spo = {
       * @param formDigestValue formDigestValue
       */
     getFolderIdentity(webObjectIdentity, webUrl, siteRelativeUrl, formDigestValue) {
-        const serverRelativePath = _1.urlUtil.getServerRelativePath(webUrl, siteRelativeUrl);
+        const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(webUrl, siteRelativeUrl);
         const requestOptions = {
             url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
             headers: {

package/dist/utils/validation.js

@@ -6,8 +6,12 @@ exports.validation = {
         return guids.every(guid => this.isValidGuid(guid));
     },
     isValidGuid(guid) {
+        if (!guid) {
+            return false;
+        }
         const guidRegEx = new RegExp(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
-        return guidRegEx.test(guid);
+        // verify if the guid is a valid guid. @meid will be replaced in a later stage with the actual user id of the logged in user
+        return guidRegEx.test(guid) || guid.toLocaleLowerCase().trim() === "@meid";
     },
     isValidTeamsChannelId(guid) {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+@thread\.(skype|tacv2)$/i);

package/docs/docs/_clisettings.md

@@ -0,0 +1,19 @@
+## Available settings
+
+Following is the list of configuration settings available in CLI for Microsoft 365.
+
+Setting name|Definition|Default value
+------------|----------|-------------
+`autoOpenLinksInBrowser`|Automatically open the browser for all commands which return a url and expect the user to copy paste this to the browser. For example when logging in, using `m365 login` in device code mode.|`false`
+`copyDeviceCodeToClipboard`|Automatically copy the device code to the clipboard when running `m365 login` command in device code mode|`false`
+`csvEscape`|Single character used for escaping; only apply to characters matching the quote and the escape options|`"`
+`csvHeader`|Display the column names on the first line|`true`
+`csvQuote`|The quote characters surrounding a field. An empty quote value will preserve the original field, whether it contains quotation marks or not.|` `
+`csvQuoted`|Quote all the non-empty fields even if not required|`false`
+`csvQuotedEmpty`|Quote empty strings and overrides quoted_string on empty strings when defined|`false`
+`errorOutput`|Defines if errors should be written to `stdout` or `stderr`|`stderr`
+`helpMode`|Defines what part of command's help to display. Allowed values are `options`, `examples`, `remarks`, `response`, `full`|`full`
+`output`|Defines the default output when issuing a command|`json`
+`printErrorsAsPlainText`|When output mode is set to `json`, print error messages as plain-text rather than JSON|`true`
+`prompt`|Prompts for missing values in required options|`false`
+`showHelpOnFailure`|Automatically display help when executing a command failed|`true`

package/docs/docs/cmd/_global.md

@@ -1,5 +1,5 @@
-`-h, --help`
-: output usage information
+`-h, --help [help]`
+: Output usage information. Optionally, specify which section of command's help you want to see. Allowed values are `options`, `examples`, `remarks`, `response`, `full`. Default is `full`.
 
 `--query [query]`
 : JMESPath query string. See [http://jmespath.org/](http://jmespath.org/) for more information and examples

package/docs/docs/cmd/aad/app/app-add.md

@@ -11,58 +11,61 @@ m365 aad app add [options]
 ## Options
 
 `-n, --name [name]`
-: Name of the app
+: Name of the app. Specify either `name` or `manifest` but not both.
 
 `--multitenant`
-: Specify, to make the app available to other tenants
+: Specify, to make the app available to other tenants.
 
 `-r, --redirectUris [redirectUris]`
-: Comma-separated list of redirect URIs. Requires `platform` to be specified
+: Comma-separated list of redirect URIs. Requires `platform` to be specified.
 
 `-p, --platform [platform]`
-: Platform for which the `redirectUris` should be configured. Allowed values `spa`,`web`,`publicClient`
+: Platform for which the `redirectUris` should be configured. Allowed values `spa`, `web`, `publicClient`.
 
 `--implicitFlow`
-: Specify, to indicate that the authorization endpoint should return ID and access tokens
+: Specify, to indicate that the authorization endpoint should return ID and access tokens.
 
 `-s, --withSecret`
-: When specified, will create a secret named `Default` and set it to expire 1 year in the future
+: When specified, will create a secret named `Default` and set it to expire 1 year in the future.
 
 `--apisDelegated [apisDelegated]`
-: Comma-separated list of delegated permissions to register with the app
+: Comma-separated list of delegated permissions to register with the app.
 
 `--apisApplication [apisApplication]`
-: Comma-separated list of application permissions to register with the app
+: Comma-separated list of application permissions to register with the app.
 
 `-u, --uri [uri]`
-: Application ID URI
+: Application ID URI.
 
 `--scopeName [scopeName]`
-: Name of the scope to add. Requires `uri` to be specified
+: Name of the scope to add. Requires `uri` to be specified.
 
 `--scopeConsentBy [scopeConsentBy]`
-: Specifies if the scope can be consented only by admins or by admins and users. Allowed values `admins`, `adminsAndUsers`. Default `admins`
+: Specifies if the scope can be consented only by admins or by admins and users. Allowed values `admins`, `adminsAndUsers`. Default `admins`.
 
 `--scopeAdminConsentDisplayName [scopeAdminConsentDisplayName]`
-: Scope admin consent display name
+: Scope admin consent display name.
 
 `--scopeAdminConsentDescription [scopeAdminConsentDescription]`
-: Scope admin consent description
+: Scope admin consent description.
 
 `--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`.
+
+`--grantAdminConsent`
+: When specified, grants application & delegated permissions through admin consent.
 
 `--manifest [manifest]`
-: Azure AD app manifest as retrieved from the Azure Portal to create the app registration from
+: Azure AD app manifest as retrieved from the Azure Portal to create the app registration from. Specify either `name` or `manifest` but not both.
 
 `--save`
-: Use to store the information about the created app in a local file
+: Use to store the information about the created app in a local file.
 
 --8<-- "docs/cmd/_global.md"
 
@@ -94,6 +97,8 @@ After creating the Azure AD app registration, this command returns the app ID an
 
 If you want to store the information about the created Azure AD app registration, use the `--save` option. This is useful when you build solutions connected to Microsoft 365 and want to easily manage app registrations used with your solution. When you use the `--save` option, after you create the app registration, the command will write its ID and name to the `.m365rc.json` file in the current directory. If the file already exists, it will add the information about the to it, allowing you to track multiple apps. If the file doesn't exist, the command will create it.
 
+When specifying `--grantAdminConsent` option, a service principal will be created for the app registration.
+
 ## Examples
 
 Create new Azure AD app registration with the specified name
@@ -156,6 +161,12 @@ Create new Azure AD app registration with Application ID URI set to a value that
 m365 aad app add --name 'My AAD app' --uri api://caf406b91cd4.ngrok.io/_appId_ --scopeName access_as_user --scopeAdminConsentDescription 'Access as a user' --scopeAdminConsentDisplayName 'Access as a user' --scopeConsentBy adminsAndUsers
 ```
 
+Create new Azure AD app registration for a deamon app with specified Microsoft Graph application permissions, including admin consent
+
+```sh
+ m365 aad app add --name 'My AAD app' --apisApplication 'https://graph.microsoft.com/Group.ReadWrite.All' --grantAdminConsent
+```
+
 Create new Azure AD app registration with the specified name. Store information about the created app registration in the _.m365rc.json_ file in the current directory.
 
 ```sh
@@ -165,5 +176,5 @@ m365 aad app add --name 'My AAD app' --save
 Create new Azure AD app registration with a certificate
 
 ```sh
-m365 aad app add --name 'My AAD app' --certificateDisplayName "Some certificate name" --certificateFile c:\temp\some-certificate.cer
+m365 aad app add --name 'My AAD app' --certificateDisplayName "Some certificate name" --certificateFile "c:\temp\some-certificate.cer"
 ```

package/docs/docs/cmd/aad/app/app-list.md

@@ -0,0 +1,149 @@
+# aad app list
+
+Retrieves a list of Azure AD app registrations
+
+## Usage
+
+```sh
+m365 aad app list [options]
+```
+
+## Options
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Retrieve a list of Azure AD app registrations
+
+```sh
+m365 aad app list
+```
+
+## Response
+
+=== "JSON"
+    ```json
+    [
+      {
+        "id": "ff2798f7-1c7a-4607-8a7b-3d5e0c18c756",
+        "deletedDateTime": null,
+        "appId": "61ed4fab-a861-4307-bb87-a6a53dbe39f5",
+        "applicationTemplateId": null,
+        "disabledByMicrosoftStatus": null,
+        "createdDateTime": "2021-03-16T14:51:28Z",
+        "displayName": "TestAppPermissions",
+        "description": null,
+        "groupMembershipClaims": null,
+        "identifierUris": [],
+        "isDeviceOnlyAuthSupported": null,
+        "isFallbackPublicClient": null,
+        "notes": null,
+        "publisherDomain": "Contoso.onmicrosoft.com",
+        "serviceManagementReference": null,
+        "signInAudience": "AzureADMyOrg",
+        "tags": [],
+        "tokenEncryptionKeyId": null,
+        "samlMetadataUrl": null,
+        "defaultRedirectUri": null,
+        "certification": null,
+        "optionalClaims": null,
+        "addIns": [],
+        "api": {
+          "acceptMappedClaims": null,
+          "knownClientApplications": [],
+          "requestedAccessTokenVersion": null,
+          "oauth2PermissionScopes": [],
+          "preAuthorizedApplications": []
+        },
+        "appRoles": [],
+        "info": {
+          "logoUrl": null,
+          "marketingUrl": null,
+          "privacyStatementUrl": null,
+          "supportUrl": null,
+          "termsOfServiceUrl": null
+        },
+        "keyCredentials": [
+          {
+            "customKeyIdentifier": "7D20AB8DD09B653E9A3880F9046314B76917EF62",
+            "displayName": "CN=TestCertificate",
+            "endDateTime": "2022-01-01T00:00:00Z",
+            "key": null,
+            "keyId": "8928a06f-fa2d-4d92-98c3-b0f544804f64",
+            "startDateTime": "2020-01-01T00:00:00Z",
+            "type": "AsymmetricX509Cert",
+            "usage": "Verify"
+          }
+        ],
+        "parentalControlSettings": {
+          "countriesBlockedForMinors": [],
+          "legalAgeGroupRule": "Allow"
+        },
+        "passwordCredentials": [
+          {
+            "customKeyIdentifier": null,
+            "displayName": "TestSecret",
+            "endDateTime": "2022-03-16T14:58:45.602Z",
+            "hint": "~03",
+            "keyId": "714c9628-4bb8-4f08-84b4-7fd8d7a7b8c5",
+            "secretText": null,
+            "startDateTime": "2021-03-16T14:59:07.642Z"
+          }
+        ],
+        "publicClient": {
+          "redirectUris": []
+        },
+        "requiredResourceAccess": [
+          {
+            "resourceAppId": "00000003-0000-0000-c000-000000000000",
+            "resourceAccess": [
+              {
+                "id": "e1fe6dd8-ba31-4d61-89e7-88639da4683d",
+                "type": "Scope"
+              },
+              {
+                "id": "18228521-a591-40f1-b215-5fad4488c117",
+                "type": "Role"
+              },
+              {
+                "id": "09850681-111b-4a89-9bed-3f2cae46d706",
+                "type": "Role"
+              }
+            ]
+          }
+        ],
+        "verifiedPublisher": {
+          "displayName": null,
+          "verifiedPublisherId": null,
+          "addedDateTime": null
+        },
+        "web": {
+          "homePageUrl": null,
+          "logoutUrl": null,
+          "redirectUris": [],
+          "implicitGrantSettings": {
+            "enableAccessTokenIssuance": false,
+            "enableIdTokenIssuance": false
+          },
+          "redirectUriSettings": []
+        },
+        "spa": {
+          "redirectUris": []
+        }
+      }
+    ]
+    ```
+
+=== "Text"
+    ```text
+    appId                                 id                                    displayName                                                              signInAudience
+    ------------------------------------  ------------------------------------  -----------------------------------------------------------------------  ----------------------------------
+    61ed4fab-a861-4307-bb87-a6a53dbe39f5  ff2798f7-1c7a-4607-8a7b-3d5e0c18c756  TestAppPermissions                                                       AzureADMyOrg
+    ```
+
+=== "CSV"
+    ```csv
+    appId,id,displayName,signInAudience
+    61ed4fab-a861-4307-bb87-a6a53dbe39f5,ff2798f7-1c7a-4607-8a7b-3d5e0c18c756,TestAppPermissions,AzureADMyOrg
+    ```

package/docs/docs/cmd/aad/app/app-remove.md

@@ -8,12 +8,6 @@ Removes an Azure AD app registration
 m365 aad app remove [options]
 ```
 
-## Alias
-
-```sh
-m365 aad app delete [options]
-```
-
 ## Options
 
 `--appId [appId]`

package/docs/docs/cmd/aad/app/app-role-remove.md

@@ -8,12 +8,6 @@ Removes role from the specified Azure AD app registration
 m365 aad app role remove [options]
 ```
 
-## Alias
-
-```sh
-m365 aad app role delete [options]
-```
-
 ## Options
 
 `--appId [appId]`

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

@@ -85,5 +85,5 @@ m365 aad app set --objectId 95cfe30d-ed44-4f9d-b73d-c66560f72e83 --redirectUris
 Add a certificate to the app
 
 ```sh
-m365 aad app set --certificateDisplayName "Some certificate name" --certificateFile c:\temp\some-certificate.cer
+m365 aad app set --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --certificateDisplayName "Some certificate name" --certificateFile "c:\temp\some-certificate.cer"
 ```

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

@@ -13,10 +13,10 @@ m365 aad approleassignment add [options]
 `--appId [appId]`
 : Application appId also known as clientId of the App Registration to which the configured scopes (app roles) should be applied
 
-`--objectId [objectId]`
+`--appObjectId [appObjectId]`
 : Application objectId of the App Registration to which the configured scopes (app roles) should be applied
 
-`--displayName [displayName]`
+`--appDisplayName [appDisplayName]`
 : Application name of the App Registration to which the configured scopes (app roles) should be applied
 
 `-r, --resource <resource>`
@@ -31,7 +31,7 @@ m365 aad approleassignment add [options]
 
 This command requires tenant administrator permissions.
 
-Specify either the `appId`, `objectId` or `displayName` but not both. If you specify more than one option value, the command will fail with an error.
+Specify either the `appId`, `appObjectId` or `appDisplayName` but not multiple. If you specify more than one option value, the command will fail with an error.
 
 Autocomplete values for the `resource` option do not mean allowed values. The autocomplete will just suggest some known names, but that doesn't restrict you to use name of your own custom application or other application within your tenant.
 
@@ -48,13 +48,13 @@ m365 aad approleassignment add --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --
 Adds multiple Microsoft Graph application permissions to an Azure AD application with name _MyAppName_
 
 ```sh
-m365 aad approleassignment add --displayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
+m365 aad approleassignment add --appDisplayName "MyAppName" --resource "Microsoft Graph" --scope "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 --objectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
+m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
 ```
 
 ## More information

package/docs/docs/cmd/aad/approleassignment/approleassignment-list.md

@@ -13,17 +13,17 @@ m365 aad approleassignment list [options]
 `-i, --appId [appId]`
 : Application (client) Id of the App Registration for which the configured app roles should be retrieved
 
-`-n, --displayName [displayName]`
+`-n, --appDisplayName [appDisplayName]`
 : Display name of the application for which the configured app roles should be retrieved
 
-`--objectId [objectId]`
+`--appObjectId [appObjectId]`
 : ObjectId of the application for which the configured app roles should be retrieved
 
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
-Specify either the `appId`, `objectId` or `displayName`. If you specify more than one option value, the command will fail with an error.
+Specify either the `appId`, `appObjectId` or `appDisplayName`. If you specify more than one option value, the command will fail with an error.
 
 ## Examples
 
@@ -36,13 +36,13 @@ m365 aad approleassignment list --appId b2307a39-e878-458b-bc90-03bc578531d6
 List app roles assigned to service principal with Application display name _MyAppName_.
 
 ```sh
-m365 aad approleassignment list --displayName 'MyAppName'
+m365 aad approleassignment list --appDisplayName 'MyAppName'
 ```
 
 List app roles assigned to service principal with ObjectId _b2307a39-e878-458b-bc90-03bc578531dd_.
 
 ```sh
-m365 aad approleassignment list --objectId b2307a39-e878-458b-bc90-03bc578531dd
+m365 aad approleassignment list --appObjectId b2307a39-e878-458b-bc90-03bc578531dd
 ```
 
 ## More information

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

@@ -13,10 +13,10 @@ m365 aad approleassignment remove [options]
 `--appId [appId]`
 : Application appId also known as clientId of the App Registration for which the configured scopes (app roles) should be deleted
 
-`--objectId [objectId]`
+`--appObjectId [appObjectId]`
 : Application objectId of the App Registration for which the configured scopes (app roles) should be deleted
 
-`--displayName [displayName]`
+`--appDisplayName [appDisplayName]`
 : Application name of the App Registration for which the configured scopes (app roles) should be deleted
 
 `-r, --resource <resource>`
@@ -34,7 +34,7 @@ m365 aad approleassignment remove [options]
 
 This command requires tenant administrator permissions.
 
-Specify either the `appId`, `objectId` or `displayName` but not both. If you specify more than one option value, the command will fail with an error.
+Specify either the `appId`, `appObjectId` or `appDisplayName` but not multiple. If you specify more than one option value, the command will fail with an error.
 
 Autocomplete values for the `resource` option do not mean allowed values. The autocomplete will just suggest some known names, but that doesn't restrict you to use name of your own custom application or other application within your tenant.
 
@@ -51,13 +51,13 @@ m365 aad approleassignment remove --appId "57907bf8-73fa-43a6-89a5-1f603e29e451"
 Deletes multiple Microsoft Graph application permissions from an Azure AD application with name _MyAppName_
 
 ```sh
-m365 aad approleassignment remove --displayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
+m365 aad approleassignment remove --appDisplayName "MyAppName" --resource "Microsoft Graph" --scope "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 --objectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
+m365 aad approleassignment remove --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
 ```
 
 ## More information