@pnp/cli-microsoft365 6.0.0-beta.38c66cf → 6.0.0-beta.3a04435

package/dist/request.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
 const stream_1 = require("stream");
 const Auth_1 = require("./Auth");
-const utils_1 = require("./utils");
+const formatting_1 = require("./utils/formatting");
 const packageJSON = require('../package.json');
 class Request {
     constructor() {
@@ -60,7 +60,7 @@ class Request {
                     if (config.responseType !== 'stream') {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(utils_1.formatting.filterObject(config, properties), null, 2));
+                    this._logger.logToStderr(JSON.stringify(formatting_1.formatting.filterObject(config, properties), null, 2));
                 }
                 return config;
             });
@@ -75,14 +75,14 @@ class Request {
                         response.headers['content-type'].indexOf('json') > -1) {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, utils_1.formatting.filterObject(response, properties)), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, formatting_1.formatting.filterObject(response, properties)), null, 2));
                 }
                 return response;
             }, (error) => {
                 if (this._logger) {
                     const properties = ['status', 'statusText', 'headers'];
                     this._logger.logToStderr('Request error:');
-                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, utils_1.formatting.filterObject(error.response, properties)), { error: error.error }), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, formatting_1.formatting.filterObject(error.response, properties)), { error: error.error }), null, 2));
                 }
                 throw error;
             });
@@ -128,7 +128,8 @@ class Request {
                     return Promise.resolve('');
                 }
                 else {
-                    const resource = Auth_1.Auth.getResourceFromUrl(options.url);
+                    const url = options.headers && options.headers['x-resource'] ? options.headers['x-resource'] : options.url;
+                    const resource = Auth_1.Auth.getResourceFromUrl(url);
                     return Auth_1.default.ensureAccessToken(resource, this._logger, this._debug);
                 }
             })()
@@ -137,7 +138,10 @@ class Request {
                     if (options.headers['x-anonymous']) {
                         delete options.headers['x-anonymous'];
                     }
-                    else {
+                    if (options.headers['x-resource']) {
+                        delete options.headers['x-resource'];
+                    }
+                    if (accessToken !== '') {
                         options.headers.authorization = `Bearer ${accessToken}`;
                     }
                 }

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

@@ -42,12 +42,10 @@ const addFileCommands = {
         addFileCommand: 'cat > [FILEPATH] << EOF [FILECONTENT]EOF'
     },
     powershell: {
-        addFileCommand: `@"[FILECONTENT]"@ | Out-File -FilePath "[FILEPATH]"
-    `
+        addFileCommand: `@"[FILECONTENT]"@ | Out-File -FilePath [FILEPATH]`
     },
     cmd: {
-        addFileCommand: `echo [FILECONTENT] > "[FILEPATH]"
-    `
+        addFileCommand: `echo [FILECONTENT] > [FILEPATH]`
     }
 };
 const removeFileCommands = {

package/dist/utils/md.js

@@ -46,7 +46,7 @@ function convertHyperlinks(md) {
     });
 }
 function convertCodeFences(md) {
-    const regex = new RegExp('^```.*?' + os_1.EOL + '(.*?)```' + os_1.EOL, 'gms');
+    const regex = new RegExp('^```.*?(?:\r\n|\n)(.*?)```(?:\r\n|\n)', 'gms');
     return md.replace(regex, (match, code) => {
         return `  ${code}${os_1.EOL}`;
     });

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/dist/utils/spo.js

@@ -2,7 +2,8 @@
 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");
@@ -20,7 +21,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 +256,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,7 +283,7 @@ 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)}')`,
                 headers: {
@@ -296,7 +297,7 @@ 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`,
                     headers: {
@@ -402,7 +403,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/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-add.md

@@ -58,6 +58,9 @@ m365 aad app add [options]
 `--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`
 
+`--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
 
@@ -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-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

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

package/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-list.md

@@ -10,11 +10,11 @@ m365 aad o365group recyclebinitem list [options]
 
 ## Options
 
-`-d, --displayName [displayName]`
-: Lists groups with displayName starting with the specified value
+`-d, --groupDisplayName [groupDisplayName]`
+: Lists groups with DisplayName starting with the specified value
 
-`-m, --mailNickname [mailNickname]`
-: Lists groups with mailNickname starting with the specified value
+`-m, --groupMailNickname [groupMailNickname]`
+: Lists groups with MailNickname starting with the specified value
 
 --8<-- "docs/cmd/_global.md"
 
@@ -29,17 +29,17 @@ m365 aad o365group recyclebinitem list
 List deleted Microsoft 365 Groups with display name starting with _Project_
 
 ```sh
-m365 aad o365group recyclebinitem list --displayName Project
+m365 aad o365group recyclebinitem list --groupDisplayName Project
 ```
 
 List deleted Microsoft 365 Groups mail nick name starting with _team_
 
 ```sh
-m365 aad o365group recyclebinitem list --mailNickname team
+m365 aad o365group recyclebinitem list --groupMailNickname team
 ```
 
 List deleted Microsoft 365 Groups mail nick name starting with _team_ and with display name starting with _Project_
 
 ```sh
-m365 aad o365group recyclebinitem list --mailNickname team --displayName Project
+m365 aad o365group recyclebinitem list --groupMailNickname team --groupDisplayName Project
 ```

package/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-restore.md

@@ -1,4 +1,4 @@
-# aad o365group restore
+# aad o365group recyclebinitem restore
 
 Restores a deleted Microsoft 365 Group
 
@@ -8,23 +8,35 @@ Restores a deleted Microsoft 365 Group
 m365 aad o365group recyclebinitem restore [options]
 ```
 
-## Alias
+## Options
 
-```sh
-m365 aad o365group restore [options]
-```
+`-i, --id [id]`
+: The ID of the Microsoft 365 Group to restore. Specify either `id`, `displayName` or `mailNickname` but not multiple.
 
-## Options
+`-d, --displayName [displayName]`
+: Display name for the Microsoft 365 Group to restore. Specify either `id`, `displayName` or `mailNickname` but not multiple.
 
-`-i, --id <id>`
-: The ID of the Microsoft 365 Group to restore
+`-m, --mailNickname [mailNickname]`
+: Name of the group e-mail (part before the @). Specify either `id`, `displayName` or `mailNickname` but not multiple.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Examples
 
-Restores the Microsoft 365 Group with id _28beab62-7540-4db1-a23f-29a6018a3848_
+Restores the Microsoft 365 Group with specific ID
 
 ```sh
 m365 aad o365group recyclebinitem restore --id 28beab62-7540-4db1-a23f-29a6018a3848
 ```
+
+Restores the Microsoft 365 Group with specific name
+
+```sh
+m365 aad o365group recyclebinitem restore --displayName "My Group"
+```
+
+Restores the Microsoft 365 Group with specific mail nickname
+
+```sh
+m365 aad o365group recyclebinitem restore --mailNickname "Mygroup"
+```