@pnp/cli-microsoft365 6.7.0-beta.54db310 → 6.7.0-beta.7321771

package/dist/m365/spo/commands/listitem/listitem-list.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
@@ -41,63 +42,94 @@ class SpoListItemListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${args.options.webUrl}/_api/web`;
+            let listApiUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
-                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                listApiUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
             else if (args.options.listTitle) {
-                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                listApiUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
             else if (args.options.listUrl) {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
-            }
-            let formDigestValue = '';
-            const fieldsArray = args.options.fields ? args.options.fields.split(",")
-                : (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) ? ["Title", "Id"] : [];
-            const fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
-            const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
-            const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);
+                listApiUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
             try {
-                if (args.options.camlQuery) {
-                    if (this.debug) {
-                        logger.logToStderr(`getting request digest for query request`);
+                const listItems = args.options.camlQuery
+                    ? yield this.getItemsUsingCAMLQuery(logger, args.options, listApiUrl)
+                    : yield this.getItems(logger, args.options, listApiUrl);
+                listItems.forEach(v => delete v['ID']);
+                logger.log(listItems);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getItems(logger, options, listApiUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting list items`);
+            }
+            const queryParams = [];
+            const fieldsArray = options.fields ? options.fields.split(",")
+                : (!options.output || Cli_1.Cli.shouldTrimOutput(options.output)) ? ["Title", "Id"] : [];
+            const expandFieldsArray = this.getExpandFieldsArray(fieldsArray);
+            const skipTokenId = yield this.getLastItemIdForPage(logger, options, listApiUrl);
+            queryParams.push(`$top=${options.pageSize || 5000}`);
+            if (options.filter) {
+                queryParams.push(`$filter=${encodeURIComponent(options.filter)}`);
+            }
+            if (expandFieldsArray.length > 0) {
+                queryParams.push(`$expand=${expandFieldsArray.join(",")}`);
+            }
+            if (fieldsArray.length > 0) {
+                queryParams.push(`$select=${formatting_1.formatting.encodeQueryParameter(fieldsArray.join(","))}`);
+            }
+            if (skipTokenId !== undefined) {
+                queryParams.push(`$skiptoken=Paged=TRUE%26p_ID=${skipTokenId}`);
+            }
+            // If skiptoken is not found, then we are past the last page
+            if (options.pageNumber && Number(options.pageNumber) > 0 && skipTokenId === undefined) {
+                return [];
+            }
+            if (!options.pageSize) {
+                return yield odata_1.odata.getAllItems(`${listApiUrl}/items?${queryParams.join('&')}`);
+            }
+            else {
+                const requestOptions = {
+                    url: `${listApiUrl}/items?${queryParams.join('&')}`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listItemCollection = yield request_1.default.get(requestOptions);
+                return listItemCollection.value;
+            }
+        });
+    }
+    getItemsUsingCAMLQuery(logger, options, listApiUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const formDigestValue = (yield spo_1.spo.getRequestDigest(options.webUrl)).FormDigestValue;
+            if (this.verbose) {
+                logger.logToStderr(`Getting list items using CAML query`);
+            }
+            const items = [];
+            let skipTokenId = undefined;
+            do {
+                const requestBody = {
+                    "query": {
+                        "ViewXml": options.camlQuery,
+                        "AllowIncrementalResults": true
                     }
-                    const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                    formDigestValue = res.FormDigestValue;
-                }
-                let res;
-                if (args.options.pageNumber && Number(args.options.pageNumber) > 0) {
-                    const rowLimit = `$top=${Number(args.options.pageSize) * Number(args.options.pageNumber)}`;
-                    const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
-                    const fieldSelect = `?$select=Id&${rowLimit}&${filter}`;
-                    const requestOptions = {
-                        url: `${requestUrl}/items${fieldSelect}`,
-                        headers: {
-                            'accept': 'application/json;odata=nometadata',
-                            'X-RequestDigest': formDigestValue
-                        },
-                        responseType: 'json'
+                };
+                if (skipTokenId !== undefined) {
+                    requestBody.query.ListItemCollectionPosition = {
+                        "PagingInfo": `Paged=TRUE&p_ID=${skipTokenId}`
                     };
-                    res = yield request_1.default.get(requestOptions);
                 }
-                const skipTokenId = (res && res.value && res.value.length && res.value[res.value.length - 1]) ? res.value[res.value.length - 1].Id : 0;
-                const skipToken = (args.options.pageNumber && Number(args.options.pageNumber) > 0 && skipTokenId > 0) ? `$skiptoken=Paged=TRUE%26p_ID=${res.value[res.value.length - 1].Id}` : ``;
-                const rowLimit = args.options.pageSize ? `$top=${args.options.pageSize}` : ``;
-                const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
-                const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
-                const fieldSelect = fieldsArray.length > 0 ?
-                    `?$select=${formatting_1.formatting.encodeQueryParameter(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
-                    `?${rowLimit}&${skipToken}&${filter}`;
-                const requestBody = args.options.camlQuery ?
-                    {
-                        "query": {
-                            "ViewXml": args.options.camlQuery
-                        }
-                    }
-                    : ``;
                 const requestOptions = {
-                    url: `${requestUrl}/${args.options.camlQuery ? `GetItems` : `items${fieldSelect}`}`,
+                    url: `${listApiUrl}/GetItems`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
                         'X-RequestDigest': formDigestValue
@@ -105,13 +137,39 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                     responseType: 'json',
                     data: requestBody
                 };
-                const listItemInstances = args.options.camlQuery ? yield request_1.default.post(requestOptions) : yield request_1.default.get(requestOptions);
-                listItemInstances.value.forEach(v => delete v['ID']);
-                logger.log(listItemInstances.value);
+                const listItemInstances = yield request_1.default.post(requestOptions);
+                skipTokenId = listItemInstances.value.length > 0 ? listItemInstances.value[listItemInstances.value.length - 1].Id : undefined;
+                items.push(...listItemInstances.value);
+            } while (skipTokenId !== undefined);
+            return items;
+        });
+    }
+    getExpandFieldsArray(fieldsArray) {
+        const fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
+        const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
+        const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);
+        return expandFieldsArray;
+    }
+    getLastItemIdForPage(logger, options, listApiUrl) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.pageNumber || Number(options.pageNumber) === 0) {
+                return undefined;
             }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            if (this.verbose) {
+                logger.logToStderr(`Getting skipToken Id for page ${options.pageNumber}`);
             }
+            const rowLimit = `$top=${Number(options.pageSize) * Number(options.pageNumber)}`;
+            const filter = options.filter ? `$filter=${encodeURIComponent(options.filter)}` : ``;
+            const requestOptions = {
+                url: `${listApiUrl}/items?$select=Id&${rowLimit}&${filter}`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return (_a = response.value[response.value.length - 1]) === null || _a === void 0 ? void 0 : _a.Id;
         });
     }
 }
@@ -155,16 +213,16 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
             return isValidSharePointUrl;
         }
         if (args.options.camlQuery && args.options.fields) {
-            return `Specify camlQuery or fields but not both`;
+            return `You cannot use the fields-option when specifying a camlQuery`;
         }
         if (args.options.camlQuery && args.options.pageSize) {
-            return `Specify camlQuery or pageSize but not both`;
+            return `You cannot use the pageSize-option when specifying a camlQuery`;
         }
         if (args.options.camlQuery && args.options.pageNumber) {
-            return `Specify camlQuery or pageNumber but not both`;
+            return `You cannot use the pageNumber-option when specifying a camlQuery`;
         }
         if (args.options.pageSize && isNaN(Number(args.options.pageSize))) {
-            return `pageSize must be numeric`;
+            return `pageSize ${args.options.pageSize} must be numeric`;
         }
         if (args.options.pageNumber && !args.options.pageSize) {
             return `pageSize must be specified if pageNumber is specified`;

package/dist/m365/spo/commands/site/site-recyclebinitem-clear.js

@@ -0,0 +1,115 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoSiteRecycleBinItemClearCommand_instances, _SpoSiteRecycleBinItemClearCommand_initTelemetry, _SpoSiteRecycleBinItemClearCommand_initOptions, _SpoSiteRecycleBinItemClearCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteRecycleBinItemClearCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.SITE_RECYCLEBINITEM_CLEAR;
+    }
+    get description() {
+        return 'Permanently removes all items in a site recycle bin';
+    }
+    constructor() {
+        super();
+        _SpoSiteRecycleBinItemClearCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemClearCommand_instances, "m", _SpoSiteRecycleBinItemClearCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemClearCommand_instances, "m", _SpoSiteRecycleBinItemClearCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemClearCommand_instances, "m", _SpoSiteRecycleBinItemClearCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.clearRecycleBin(args, logger);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to clear the recycle bin of site ${args.options.siteUrl}?`
+                });
+                if (result.continue) {
+                    yield this.clearRecycleBin(args, logger);
+                }
+            }
+        });
+    }
+    clearRecycleBin(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Permanently removing all items in recycle bin of site ${args.options.siteUrl}...`);
+                }
+                const requestOptions = {
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                if (args.options.secondary) {
+                    if (this.verbose) {
+                        logger.logToStderr('Removing all items from the second-stage recycle bin');
+                    }
+                    requestOptions.url = `${args.options.siteUrl}/_api/site/RecycleBin/DeleteAllSecondStageItems`;
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('Removing all items from the first-stage recycle bin');
+                    }
+                    requestOptions.url = `${args.options.siteUrl}/_api/web/RecycleBin/DeleteAll`;
+                }
+                const result = yield request_1.default.post(requestOptions);
+                if (result['odata.null'] !== true) {
+                    throw result;
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoSiteRecycleBinItemClearCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemClearCommand_initTelemetry = function _SpoSiteRecycleBinItemClearCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            secondary: !!args.options.secondary,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoSiteRecycleBinItemClearCommand_initOptions = function _SpoSiteRecycleBinItemClearCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '--secondary'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoSiteRecycleBinItemClearCommand_initValidators = function _SpoSiteRecycleBinItemClearCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoSiteRecycleBinItemClearCommand();
+//# sourceMappingURL=site-recyclebinitem-clear.js.map

package/dist/m365/spo/commands.js

@@ -247,6 +247,7 @@ exports.default = {
     SITE_HUBSITE_THEME_SYNC: `${prefix} site hubsite theme sync`,
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
+    SITE_RECYCLEBINITEM_CLEAR: `${prefix} site recyclebinitem clear`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
     SITE_RECYCLEBINITEM_RESTORE: `${prefix} site recyclebinitem restore`,
     SITE_REMOVE: `${prefix} site remove`,

package/dist/request.js

@@ -123,6 +123,7 @@ class Request {
         if (!this._logger) {
             return Promise.reject('Logger not set on the request object');
         }
+        this.updateRequestForCloudType(options, Auth_1.default.service.cloudType);
         return new Promise((_resolve, _reject) => {
             (() => {
                 if (options.headers && options.headers['x-anonymous']) {
@@ -181,6 +182,12 @@ class Request {
             });
         });
     }
+    updateRequestForCloudType(options, cloudType) {
+        const url = new URL(options.url);
+        const hostname = `${url.protocol}//${url.hostname}`;
+        const cloudUrl = Auth_1.Auth.getEndpointForResource(hostname, cloudType);
+        options.url = options.url.replace(hostname, cloudUrl);
+    }
 }
 exports.default = new Request();
 //# sourceMappingURL=request.js.map

package/dist/utils/misc.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.misc = void 0;
+exports.misc = {
+    getEnums(en) {
+        return Object
+            .keys(en)
+            .filter(k => isNaN(parseInt(k)));
+    }
+};
+//# sourceMappingURL=misc.js.map

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

@@ -25,17 +25,56 @@ m365 aad user set [options]
 `--forceChangePasswordNextSignIn`
 : If specified, the user will have to change his password the next time they log in. Can only be set in combination with `resetPassword`.
 
+`--forceChangePasswordNextSignInWithMfa`
+: Whether the user should change his/her password on the next login and setup MFA. Can only be set in combination with `resetPassword`.
+
 `--currentPassword [currentPassword]`
 : Current password of the user that is signed in. If this parameter is set, `newPassword` is mandatory. Can't be combined with `resetPassword`.
 
 `--newPassword [newPassword]`
 : New password to be set. Must be set when specifying either `resetPassword` or `currentPassword`.
 
+`--displayName [displayName]`
+: The name to display in the address book for the user.
+
+`--firstName [firstName]`
+: The given name (first name) of the user. Maximum length is 64 characters.
+
+`--lastName [lastName]`
+: The user's surname (family name or last name). Maximum length is 64 characters.
+
+`--usageLocation [usageLocation]`
+: A two letter [country code](https://learn.microsoft.com/en-us/partner-center/commercial-marketplace-co-sell-location-codes#country-and-region-codes) (ISO standard 3166). Required for users that will be assigned licenses.
+
+`--officeLocation [officeLocation]` 
+: The office location in the user's place of business.
+
+`--jobTitle [jobTitle]`
+: The user's job title. Maximum length is 128 characters.
+
+`--companyName [companyName]`
+: The company name which the user is associated. The maximum length is 64 characters.
+
+`--department [department]`
+: The name for the department in which the user works. Maximum length is 64 characters.
+
+`--preferredLanguage [preferredLanguage]`
+: The preferred language for the user. Should follow [ISO 639-1 Code](https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a). Example: `en-US`.
+
+`--managerUserId [managerUserId]`
+: User ID of the user's manager. Specify `managerUserId`, `managerUserName` or `removeManager` but not both.
+
+`--managerUserName [managerUserName]`
+: User principal name of the manager. Specify `managerUserId`, `managerUserName` or `removeManager` but not both.
+
+`--removeManager`
+: Remove currently set manager. The user will have no manager when this flag is set. Specify `managerUserId`, `managerUserName` or `removeManager` but not both.
+
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
-You can update information of a user, either by specifying that user's id (`objectId`) or user name (`userPrincipalName`), but not both.
+This command allows using unknown options.
 
 If the user with the specified id or user name doesn't exist, you will get a `Resource 'xyz' does not exist or one of its queried reference-property objects are not present.` error.
 
@@ -50,7 +89,7 @@ m365 aad user set --objectId 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --Department I
 Update multiple properties of user with name _steve@contoso.onmicrosoft.com_
 
 ```sh
-m365 aad user set --userPrincipalName steve@contoso.onmicrosoft.com --Department "Sales & Marketing" --CompanyName Contoso
+m365 aad user set --userPrincipalName steve@contoso.onmicrosoft.com --firstName John --lastName Doe --jobTitle "Sales Manager" --companyName Contoso --department Sales --officeLocation "New York"
 ```
 
 Enable user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_
@@ -65,12 +104,6 @@ Disable user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_
 m365 aad user set --objectId 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --accountEnabled false
 ```
 
-Enable user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_
-
-```sh
-m365 aad user set --objectId 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --accountEnabled true
-```
-
 Reset password of a given user by userPrincipalName and require the user to change the password on the next sign in
 
 ```sh
@@ -83,6 +116,18 @@ Change password of the currently logged in user
 m365 aad user set --objectId 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --currentPassword SLBF5gnRtyYc --newPassword 6NLUId79Lc24
 ```
 
+Updates a user with a manager
+
+```sh
+m365 aad user set --displayName "John Doe" --userName "john.doe@contoso.com" --managerUserName "adele@contoso.com"
+```
+
+Updates a user by removing its manager
+
+```sh
+m365 aad user set --userName "john.doe@contoso.com" --removeManager
+```
+
 ## Response
 
 The command won't return a response on success.

package/docs/docs/cmd/flow/run/run-get.md

@@ -19,6 +19,9 @@ m365 flow run get [options]
 `-e, --environmentName <environmentName>`
 : The name of the environment where the flow is located
 
+`--includeTriggerInformation`
+: If specified, include information about the trigger details
+
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
@@ -32,6 +35,8 @@ If the Microsoft Flow with the name you specified doesn't exist, you will get th
 
 If the run with the name you specified doesn't exist, you will get the `The provided workflow run name is not valid.` error.
 
+If the option `includeTriggerInformation` is specified, but the trigger does not contain an outputsLink such as for example with a `Recurrence` trigger, this option will be ignored.
+
 ## Examples
 
 Get information about the given run of the specified Power Automate flow
@@ -40,6 +45,11 @@ Get information about the given run of the specified Power Automate flow
 m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62
 ```
 
+Get information about the given run of the specified Power Automate flow including trigger information
+
+```sh
+m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --includeTriggerInformation
+```
 
 ## Response
 
@@ -61,7 +71,7 @@ m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5
         "trigger": {
           "name": "When_a_new_response_is_submitted",
           "inputsLink": {
-            "uri": "https://prod-08.centralindia.logic.azure.com:443/workflows/f7bf8f6b5c494e63bfc21b54087a596e/runs/08585329112602833828909892130CU17/contents/TriggerInputs?api-version=2016-06-01&se=2022-11-17T18%3A00%3A00.0000000Z&sp=%2Fruns%2F08585329112602833828909892130CU17%2Fcontents%2FTriggerInputs%2Fread&sv=1.0&sig=jmdMRWvY7uGoxTmqd3_a2bJtegXuVyuKTKKUVLiwh38",
+            "uri": "https://prod-08.centralindia.logic.azure.com:443/workflows/f7bf8f6b5c494e63bfc21b54087a596e/runs/08585329112602833828909892130CU17/contents/TriggerInputs?api-version=2016-06-01&se=2022-11-17T18%3A00%3A00.0000000Z&sp=%2Fruns%2F08585329112602833828909892130CU17%2Fcontents%2FTriggerInputs%2Fread&sv=1.0&sig=",
             "contentVersion": "6ZrBBE+MJg7IvhMgyJLMmA==",
             "contentSize": 349,
             "contentHash": {
@@ -70,7 +80,7 @@ m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5
             }
           },
           "outputsLink": {
-            "uri": "https://prod-08.centralindia.logic.azure.com:443/workflows/f7bf8f6b5c494e63bfc21b54087a596e/runs/08585329112602833828909892130CU17/contents/TriggerOutputs?api-version=2016-06-01&se=2022-11-17T18%3A00%3A00.0000000Z&sp=%2Fruns%2F08585329112602833828909892130CU17%2Fcontents%2FTriggerOutputs%2Fread&sv=1.0&sig=Y3qqjuWrrcQJrmF7uvm6LVzQy5w-dNOFWJ8Yt8khXvA",
+            "uri": "https://prod-08.centralindia.logic.azure.com:443/workflows/f7bf8f6b5c494e63bfc21b54087a596e/runs/08585329112602833828909892130CU17/contents/TriggerOutputs?api-version=2016-06-01&se=2022-11-17T18%3A00%3A00.0000000Z&sp=%2Fruns%2F08585329112602833828909892130CU17%2Fcontents%2FTriggerOutputs%2Fread&sv=1.0&sig=",
             "contentVersion": "Z/4a8tfYygNAR1xpc44iww==",
             "contentSize": 493,
             "contentHash": {
@@ -97,17 +107,108 @@ m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5
 === "Text"
 
     ```text
-    endTime    :
-    name       : 08585329112602833828909892130CU17
-    startTime  : 2022-11-17T14:33:45.2763872Z
-    status     : Running
-    triggerName: When_a_new_response_is_submitted
+    endTime    : 2023-03-04T09:05:22.5880202Z
+    name       : 08585236861638480597867166179CU104
+    startTime  : 2023-03-04T09:05:21.8066368Z
+    status     : Succeeded
+    triggerName: When_an_email_is_flagged_(V4)
     ```
 
 === "CSV"
 
     ```csv
     name,startTime,endTime,status,triggerName
-    08585329112602833828909892130CU17,2022-11-17T14:33:45.2763872Z,,Running,When_a_new_response_is_submitted
+    08585236861638480597867166179CU104,2023-03-04T09:05:21.8066368Z,2023-03-04T09:05:22.5880202Z,Succeeded,When_an_email_is_flagged_(V4)
+    ```
+
+=== "Markdown"
+
+    ```md
+    # flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62
+
+    Date: 04/03/2023
+
+    ## 08586653536760200319026785874CU62 (/providers/Microsoft.ProcessSimple/environments/Default-d87a7535-dd31-4437-bfe1-95340acd55c5/flows/5923cb07-ce1a-4a5c-ab81-257ce820109a/runs/08586653536760200319026785874CU62)
+
+    Property | Value
+    ---------|-------
+    name | 08586653536760200319026785874CU62
+    id | /providers/Microsoft.ProcessSimple/environments/Default-e1dd4023-a656-480a-8a0e-c1b1eec51e1d/flows/c3c707b5-fefd-4f7a-a96c-b8e0d5ca3cc1/runs/08585208964855963748594654409CU47
+    type | Microsoft.ProcessSimple/environments/flows/runs
+    startTime | 2023-03-04T09:05:21.8066368Z
+    endTime | 2023-03-04T09:05:22.5880202Z
+    status | Succeeded
+    triggerName | When\_an\_email\_is\_flagged\_(V4)
+    ```
+
+### `includeTriggerInformation` response
+
+When using the option `includeTriggerInformation`, the response for the json-output will differ.
+
+=== "JSON"
+
+    ```json
+    {
+      "name": "08585236861638480597867166179CU104",
+      "id": "/providers/Microsoft.ProcessSimple/environments/Default-e1dd4023-a656-480a-8a0e-c1b1eec51e1d/flows/24335774-daf6-4183-acb7-f5155c2cd2fe/runs/08585236861638480597867166179CU104",
+      "type": "Microsoft.ProcessSimple/environments/flows/runs",
+      "properties": {
+        "startTime": "2023-03-04T09:05:21.8066368Z",
+        "endTime": "2023-03-04T09:05:22.5880202Z",
+        "status": "Succeeded",
+        "correlation": {
+          "clientTrackingId": "08585236861638480598867166179CU131"
+        },
+        "trigger": {
+          "name": "When_an_email_is_flagged_(V4)",
+          "inputsLink": {
+            "uri": "https://prod-130.westeurope.logic.azure.com:443/workflows/3ebadb794f6641e0b7f4fda131cdfb0b/runs/08585236861638480597867166179CU104/contents/TriggerInputs?api-version=2016-06-01&se=2023-03-04T14%3A00%3A00.0000000Z&sp=%2Fruns%2F08585236861638480597867166179CU104%2Fcontents%2FTriggerInputs%2Fread&sv=1.0&sig=",
+            "contentVersion": "2v/VLXFrKV6JvwSdcN7aHg==",
+            "contentSize": 343,
+            "contentHash": {
+              "algorithm": "md5",
+              "value": "2v/VLXFrKV6JvwSdcN7aHg=="
+            }
+          },
+          "outputsLink": {
+            "uri": "https://prod-130.westeurope.logic.azure.com:443/workflows/3ebadb794f6641e0b7f4fda131cdfb0b/runs/08585236861638480597867166179CU104/contents/TriggerOutputs?api-version=2016-06-01&se=2023-03-04T14%3A00%3A00.0000000Z&sp=%2Fruns%2F08585236861638480597867166179CU104%2Fcontents%2FTriggerOutputs%2Fread&sv=1.0&sig=",
+            "contentVersion": "AHZEeWNlQ0bLe48yDmpzrQ==",
+            "contentSize": 3478,
+            "contentHash": {
+              "algorithm": "md5",
+              "value": "AHZEeWNlQ0bLe48yDmpzrQ=="
+            }
+          },
+          "startTime": "2023-03-04T09:05:21.6192576Z",
+          "endTime": "2023-03-04T09:05:21.7442626Z",
+          "scheduledTime": "2023-03-04T09:05:21.573561Z",
+          "originHistoryName": "08585236861638480598867166179CU131",
+          "correlation": {
+            "clientTrackingId": "08585236861638480598867166179CU131"
+          },
+          "code": "OK",
+          "status": "Succeeded"
+        }
+      },
+      "startTime": "2023-03-04T09:05:21.8066368Z",
+      "endTime": "2023-03-04T09:05:22.5880202Z",
+      "status": "Succeeded",
+      "triggerName": "When_an_email_is_flagged_(V4)",
+      "triggerInformation": {
+        "from": "john@contoso.com",
+        "toRecipients": "doe@contoso.com",
+        "subject": "Dummy email",
+        "body": "<html><head>\r\\\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body><p>This is dummy content</p></body></html>",
+        "importance": "normal",
+        "bodyPreview": "This is dummy content",
+        "hasAttachments": false,
+        "id": "AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALUqy81AAA=",
+        "internetMessageId": "<DB7PR03MB5018879914324FC65695809FE1AD9@DB7PR03MB5018.eurprd03.prod.outlook.com>",
+        "conversationId": "AAQkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgAQAMqP9zsK8a1CnIYEgHclLTk=",
+        "receivedDateTime": "2023-03-01T15:06:57+00:00",
+        "isRead": false,
+        "attachments": [],
+        "isHtml": true
+      }
+    }
     ```
-