@pnp/cli-microsoft365 5.9.0-beta.fd6d022 → 6.0.0-beta.01ba480

package/dist/m365/todo/commands.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'todo';
 exports.default = {
     LIST_ADD: `${prefix} list add`,
+    LIST_GET: `${prefix} list get`,
     LIST_LIST: `${prefix} list list`,
     LIST_REMOVE: `${prefix} list remove`,
     LIST_SET: `${prefix} list set`,
     TASK_ADD: `${prefix} task add`,
+    TASK_GET: `${prefix} task get`,
     TASK_LIST: `${prefix} task list`,
     TASK_REMOVE: `${prefix} task remove`,
     TASK_SET: `${prefix} task set`

package/dist/m365/viva/commands/connections/connections-app-create.js

@@ -74,7 +74,7 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand_1.default {
                     "manifestVersion": "1.9",
                     "version": "1.0",
                     "id": appId,
-                    "packageName": `com.microsoft.teams.${args.options.appName}`,
+                    "packageName": `com.microsoft.teams.${args.options.name}`,
                     "developer": {
                         "name": args.options.companyName,
                         "websiteUrl": args.options.companyWebsiteUrl,
@@ -86,8 +86,8 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand_1.default {
                         "outline": outlineIconFileName
                     },
                     "name": {
-                        "short": args.options.appName,
-                        "full": args.options.appName
+                        "short": args.options.name,
+                        "full": args.options.name
                     },
                     "description": {
                         "short": `${args.options.description}`,
@@ -98,7 +98,7 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand_1.default {
                     "staticTabs": [
                         {
                             "entityId": `sharepointportal_${appId}`,
-                            "name": `Portals-${args.options.appName}`,
+                            "name": `Portals-${args.options.name}`,
                             "contentUrl": `https://${domain}/_layouts/15/teamslogon.aspx?spfx=true&dest=${appPortalUrl}`,
                             "websiteUrl": portalUrl,
                             "searchUrl": `https://${searchUrlPath}/_layouts/15/search.aspx?q={searchQuery}`,
@@ -135,7 +135,7 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand_1.default {
                     this.archive.addFile('manifest.json', Buffer.alloc(manifestString.length, manifestString, 'utf8'));
                     this.archive.addLocalFile(coloredIconPath, undefined, coloredIconFileName);
                     this.archive.addLocalFile(outlineIconPath, undefined, outlineIconFileName);
-                    this.archive.writeZip(`${args.options.appName}.zip`);
+                    this.archive.writeZip(`${args.options.name}.zip`);
                 }
                 catch (ex) {
                     throw ex.message;
@@ -151,7 +151,7 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand_1.default {
             logger.logToStderr(`Checking if site ${args.options.url} exists...`);
         }
         const options = {
-            webUrl: args.options.portalUrl,
+            url: args.options.portalUrl,
             output: 'json',
             debug: this.debug,
             verbose: this.verbose
@@ -160,10 +160,10 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand_1.default {
     }
 }
 _VivaConnectionsAppCreateCommand_instances = new WeakSet(), _VivaConnectionsAppCreateCommand_initOptions = function _VivaConnectionsAppCreateCommand_initOptions() {
-    this.options.unshift({ option: '--portalUrl <portalUrl>' }, { option: '--appName <appName>' }, { option: '--description <description>' }, { option: '--longDescription <longDescription>' }, { option: '--privacyPolicyUrl [privacyPolicyUrl]' }, { option: '--termsOfUseUrl [termsOfUseUrl]' }, { option: '--companyName <companyName>' }, { option: '--companyWebsiteUrl <companyWebsiteUrl>' }, { option: '--coloredIconPath <coloredIconPath>' }, { option: '--outlineIconPath <outlineIconPath>' }, { option: '--accentColor [accentColor]' }, { option: '--force' });
+    this.options.unshift({ option: '--portalUrl <portalUrl>' }, { option: '--name <name>' }, { option: '--description <description>' }, { option: '--longDescription <longDescription>' }, { option: '--privacyPolicyUrl [privacyPolicyUrl]' }, { option: '--termsOfUseUrl [termsOfUseUrl]' }, { option: '--companyName <companyName>' }, { option: '--companyWebsiteUrl <companyWebsiteUrl>' }, { option: '--coloredIconPath <coloredIconPath>' }, { option: '--outlineIconPath <outlineIconPath>' }, { option: '--accentColor [accentColor]' }, { option: '--force' });
 }, _VivaConnectionsAppCreateCommand_initValidators = function _VivaConnectionsAppCreateCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appName.length > 30) {
+        if (args.options.name.length > 30) {
             return `App name must not exceed 30 characters`;
         }
         if (args.options.description &&
@@ -174,7 +174,7 @@ _VivaConnectionsAppCreateCommand_instances = new WeakSet(), _VivaConnectionsAppC
             args.options.longDescription.length > 4000) {
             return 'Long description must not exceed 4000 characters';
         }
-        const appFilePath = path.resolve(`${args.options.appName}.zip`);
+        const appFilePath = path.resolve(`${args.options.name}.zip`);
         if (fs.existsSync(appFilePath) && !args.options.force) {
             return `File ${appFilePath} already exists. Delete the file or use the --force option to overwrite the existing file`;
         }

package/dist/m365/yammer/commands/group/group-user-add.js

@@ -42,8 +42,8 @@ class YammerGroupUserAddCommand extends YammerCommand_1.default {
                 },
                 responseType: 'json',
                 data: {
-                    group_id: args.options.id,
-                    user_id: args.options.userId,
+                    group_id: args.options.groupId,
+                    user_id: args.options.id,
                     email: args.options.email
                 }
             };
@@ -59,26 +59,26 @@ class YammerGroupUserAddCommand extends YammerCommand_1.default {
 _YammerGroupUserAddCommand_instances = new WeakSet(), _YammerGroupUserAddCommand_initTelemetry = function _YammerGroupUserAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
             email: typeof args.options.email !== 'undefined'
         });
     });
 }, _YammerGroupUserAddCommand_initOptions = function _YammerGroupUserAddCommand_initOptions() {
     this.options.unshift({
-        option: '--id <id>'
+        option: '--groupId <groupId>'
     }, {
-        option: '--userId [userId]'
+        option: '--id [id]'
     }, {
         option: '--email [email]'
     });
 }, _YammerGroupUserAddCommand_initValidators = function _YammerGroupUserAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (typeof args.options.groupId !== 'number') {
+            return `${args.options.groupId} is not a number`;
+        }
         if (args.options.id && typeof args.options.id !== 'number') {
             return `${args.options.id} is not a number`;
         }
-        if (args.options.userId && typeof args.options.userId !== 'number') {
-            return `${args.options.userId} is not a number`;
-        }
         return true;
     }));
 };

package/dist/m365/yammer/commands/group/group-user-remove.js

@@ -45,8 +45,8 @@ class YammerGroupUserRemoveCommand extends YammerCommand_1.default {
                     },
                     responseType: 'json',
                     data: {
-                        group_id: args.options.id,
-                        user_id: args.options.userId
+                        group_id: args.options.groupId,
+                        user_id: args.options.id
                     }
                 };
                 try {
@@ -60,9 +60,9 @@ class YammerGroupUserRemoveCommand extends YammerCommand_1.default {
                 yield executeRemoveAction();
             }
             else {
-                let messagePrompt = `Are you sure you want to leave group ${args.options.id}?`;
-                if (args.options.userId) {
-                    messagePrompt = `Are you sure you want to remove the user ${args.options.userId} from the group ${args.options.id}?`;
+                let messagePrompt = `Are you sure you want to leave group ${args.options.groupId}?`;
+                if (args.options.id) {
+                    messagePrompt = `Are you sure you want to remove the user ${args.options.id} from the group ${args.options.groupId}?`;
                 }
                 const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
@@ -80,26 +80,26 @@ class YammerGroupUserRemoveCommand extends YammerCommand_1.default {
 _YammerGroupUserRemoveCommand_instances = new WeakSet(), _YammerGroupUserRemoveCommand_initTelemetry = function _YammerGroupUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            userId: args.options.userId !== undefined,
+            userId: args.options.id !== undefined,
             confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _YammerGroupUserRemoveCommand_initOptions = function _YammerGroupUserRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '--id <id>'
+        option: '--groupId <groupId>'
     }, {
-        option: '--userId [userId]'
+        option: '--id [id]'
     }, {
         option: '--confirm'
     });
 }, _YammerGroupUserRemoveCommand_initValidators = function _YammerGroupUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.groupId && typeof args.options.groupId !== 'number') {
+            return `${args.options.groupId} is not a number`;
+        }
         if (args.options.id && typeof args.options.id !== 'number') {
             return `${args.options.id} is not a number`;
         }
-        if (args.options.userId && typeof args.options.userId !== 'number') {
-            return `${args.options.userId} is not a number`;
-        }
         return true;
     }));
 };

package/dist/m365/yammer/commands/message/message-like-set.js

@@ -45,7 +45,7 @@ class YammerMessageLikeSetCommand extends YammerCommand_1.default {
                     },
                     responseType: 'json',
                     data: {
-                        message_id: args.options.id
+                        message_id: args.options.messageId
                     }
                 };
                 try {
@@ -65,7 +65,7 @@ class YammerMessageLikeSetCommand extends YammerCommand_1.default {
                     yield executeLikeAction();
                 }
                 else {
-                    const messagePrompt = `Are you sure you want to unlike message ${args.options.id}?`;
+                    const messagePrompt = `Are you sure you want to unlike message ${args.options.messageId}?`;
                     const result = yield Cli_1.Cli.prompt({
                         type: 'confirm',
                         name: 'continue',
@@ -92,7 +92,7 @@ _YammerMessageLikeSetCommand_instances = new WeakSet(), _YammerMessageLikeSetCom
     });
 }, _YammerMessageLikeSetCommand_initOptions = function _YammerMessageLikeSetCommand_initOptions() {
     this.options.unshift({
-        option: '--id <id>'
+        option: '--messageId <messageId>'
     }, {
         option: '--enable [enable]'
     }, {
@@ -100,8 +100,8 @@ _YammerMessageLikeSetCommand_instances = new WeakSet(), _YammerMessageLikeSetCom
     });
 }, _YammerMessageLikeSetCommand_initValidators = function _YammerMessageLikeSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && typeof args.options.id !== 'number') {
-            return `${args.options.id} is not a number`;
+        if (args.options.messageId && typeof args.options.messageId !== 'number') {
+            return `${args.options.messageId} is not a number`;
         }
         if (args.options.enable &&
             args.options.enable !== 'true' &&

package/dist/m365/yammer/commands/user/user-get.js

@@ -38,8 +38,8 @@ class YammerUserGetCommand extends YammerCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             let endPoint = `${this.resource}/v1/users/current.json`;
-            if (args.options.userId) {
-                endPoint = `${this.resource}/v1/users/${encodeURIComponent(args.options.userId)}.json`;
+            if (args.options.id) {
+                endPoint = `${this.resource}/v1/users/${encodeURIComponent(args.options.id)}.json`;
             }
             else if (args.options.email) {
                 endPoint = `${this.resource}/v1/users/by_email.json?email=${encodeURIComponent(args.options.email)}`;
@@ -65,19 +65,19 @@ class YammerUserGetCommand extends YammerCommand_1.default {
 _YammerUserGetCommand_instances = new WeakSet(), _YammerUserGetCommand_initTelemetry = function _YammerUserGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            userId: args.options.userId !== undefined,
+            userId: args.options.id !== undefined,
             email: args.options.email !== undefined
         });
     });
 }, _YammerUserGetCommand_initOptions = function _YammerUserGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --userId [userId]'
+        option: '-i, --id [id]'
     }, {
         option: '--email [email]'
     });
 }, _YammerUserGetCommand_initValidators = function _YammerUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.userId !== undefined && args.options.email !== undefined) {
+        if (args.options.id !== undefined && args.options.email !== undefined) {
             return `You are only allowed to search by ID or e-mail but not both`;
         }
         return true;

package/dist/settingsNames.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.settingsNames = void 0;
 const settingsNames = {
-    autoOpenBrowserOnLogin: 'autoOpenBrowserOnLogin',
     autoOpenLinksInBrowser: 'autoOpenLinksInBrowser',
     copyDeviceCodeToClipboard: 'copyDeviceCodeToClipboard',
     csvEscape: 'csvEscape',

package/dist/utils/cache.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cache = void 0;
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const config_1 = require("../config");
+const cacheFolderPath = path.join(os.tmpdir(), config_1.default.configstoreName.replace('config', 'cache'));
+const mkdirOptions = { mode: 0o0700, recursive: true };
+exports.cache = {
+    cacheFolderPath: cacheFolderPath,
+    getValue(key) {
+        this.clearExpired();
+        try {
+            const cacheFilePath = path.join(cacheFolderPath, key);
+            if (!fs.existsSync(cacheFilePath)) {
+                return undefined;
+            }
+            return fs.readFileSync(cacheFilePath, 'utf8');
+        }
+        catch (_a) {
+            return undefined;
+        }
+    },
+    setValue(key, value) {
+        this.clearExpired();
+        try {
+            fs.mkdirSync(cacheFolderPath, mkdirOptions);
+            const cacheFilePath = path.join(cacheFolderPath, key);
+            // we don't need to wait for the file to be written
+            // eslint-disable-next-line @typescript-eslint/no-empty-function
+            fs.writeFile(cacheFilePath, value, () => { });
+        }
+        catch (_a) { }
+    },
+    clearExpired(cb) {
+        // we don't need to wait for this to complete
+        // even if it stops meanwhile, it will be picked up next time
+        fs.readdir(cacheFolderPath, (err, files) => {
+            if (err) {
+                if (cb) {
+                    cb();
+                }
+                return;
+            }
+            const numFiles = files.length;
+            if (numFiles === 0) {
+                if (cb) {
+                    cb();
+                }
+                return;
+            }
+            files.forEach((file, index) => {
+                fs.stat(path.join(cacheFolderPath, file), (err, stats) => {
+                    if (err || stats.isDirectory()) {
+                        if (cb && index === numFiles - 1) {
+                            cb();
+                        }
+                        return;
+                    }
+                    // remove files that haven't been accessed in the last 24 hours
+                    if (stats.atime.getTime() < Date.now() - 24 * 60 * 60 * 1000) {
+                        // we don't need to wait for the file to be deleted
+                        // eslint-disable-next-line @typescript-eslint/no-empty-function
+                        fs.unlink(path.join(cacheFolderPath, file), () => {
+                            if (cb && index === numFiles - 1) {
+                                cb();
+                            }
+                        });
+                    }
+                    else {
+                        if (cb && index === numFiles - 1) {
+                            cb();
+                        }
+                    }
+                });
+            });
+        });
+    }
+};
+//# sourceMappingURL=cache.js.map

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/powerPlatform.js

@@ -0,0 +1,42 @@
+"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 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/${encodeURIComponent(environment)}`;
+            }
+            else {
+                url = `${powerPlatformResource}/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(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/docs/docs/_clisettings.md

@@ -0,0 +1,18 @@
+## 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`
+`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/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/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

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

@@ -25,8 +25,8 @@ m365 aad o365group add [options]
 `--members [members]`
 : Comma-separated list of Microsoft 365 Group members
 
-`--isPrivate [isPrivate]`
-: Set to `true` if the Microsoft 365 Group should be private and to `false` if it should be public (default)
+`--isPrivate`
+: Specify, if the Microsoft 365 Group should be private. If not specified, will create a public group (default)
 
 `--allowMembersToPost [allowMembersToPost]`
 : Set if only group members should be able to post conversations to the group
@@ -61,7 +61,7 @@ m365 aad o365group add --displayName Finance --description "This is the Contoso
 Create a private Microsoft 365 Group
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --isPrivate true
+m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --isPrivate
 ```
 
 Create a public Microsoft 365 Group and set specified users as its owners