@pnp/cli-microsoft365 6.0.0-beta.27b9708 → 6.0.0-beta.291f17c

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

@@ -38,21 +38,21 @@ exports.formatting = {
             return filtered;
         }, {});
     },
-    parseCsvToJson(s) {
-        const rows = s.split('\n');
-        const jsonObj = [];
-        const headers = rows[0].split(',');
-        for (let i = 1; i < rows.length; i++) {
-            const data = rows[i].split(',');
-            const obj = {};
-            for (let j = 0; j < data.length; j++) {
-                const value = data[j].trim();
-                const numValue = parseInt(value);
-                obj[headers[j].trim()] = isNaN(numValue) || numValue.toString() !== value ? value : numValue;
-            }
-            jsonObj.push(obj);
-        }
-        return jsonObj;
+    parseCsvToJson(s, quoteChar = '"', delimiter = ',') {
+        const regex = new RegExp(`\\s*(${quoteChar})?(.*?)\\1\\s*(?:${delimiter}|$)`, 'gs');
+        const lines = s.split('\n');
+        const match = (line) => [...line.matchAll(regex)]
+            .map(m => m[2]) // we only want the second capture group
+            .slice(0, -1); // cut off blank match at the end
+        const heads = match(lines[0]);
+        return lines.slice(1).map(line => {
+            return match(line).reduce((acc, cur, i) => {
+                const val = cur;
+                const numValue = parseInt(val);
+                const key = heads[i];
+                return Object.assign(Object.assign({}, acc), { [key]: isNaN(numValue) || numValue.toString() !== val ? val : numValue });
+            }, {});
+        });
     },
     encodeQueryParameter(value) {
         if (!value) {

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

@@ -45,10 +45,16 @@ function convertHyperlinks(md) {
         return `${label} (${url})`;
     });
 }
+function convertContentTabs(md) {
+    const regex = new RegExp('^=== "(.+?)"(?:\r\n|\n){2}((?:^    (?:.*?(?:\r\n|\n))?)+)', 'gms');
+    return md.replace(regex, (match, title, content) => {
+        return `  ${title}${os_1.EOL}${os_1.EOL}${content.replace(/^    /gms, '')}`;
+    });
+}
 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}`;
+        return `${code.replace(/^(.+)$/gm, '  $1')}${os_1.EOL}`;
     });
 }
 function removeInlineMarkup(md) {
@@ -65,6 +71,7 @@ const convertFunctions = [
     convertAdmonitions,
     convertDd,
     convertHyperlinks,
+    convertContentTabs,
     convertCodeFences,
     removeInlineMarkup,
     removeTooManyEmptyLines

package/dist/utils/odata.js

@@ -19,7 +19,8 @@ exports.odata = {
             const requestOptions = {
                 url: url,
                 headers: {
-                    accept: `application/json;odata.metadata=${metadata !== null && metadata !== void 0 ? metadata : 'none'}`
+                    accept: `application/json;odata.metadata=${metadata !== null && metadata !== void 0 ? metadata : 'none'}`,
+                    'odata-version': '4.0'
                 },
                 responseType: 'json'
             };

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,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/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,61 +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
+: 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"
 

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/o365group/o365group-recyclebinitem-restore.md

@@ -1,4 +1,4 @@
-# aad o365group restore
+# aad o365group recyclebinitem restore
 
 Restores a deleted Microsoft 365 Group
 
@@ -8,12 +8,6 @@ Restores a deleted Microsoft 365 Group
 m365 aad o365group recyclebinitem restore [options]
 ```
 
-## Alias
-
-```sh
-m365 aad o365group restore [options]
-```
-
 ## Options
 
 `-i, --id [id]`