@pnp/cli-microsoft365 6.5.0-beta.f8b8018 → 6.6.0-beta.f3b4299

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -467,6 +467,21 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.17.0': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '>=16.13.0 <17.0.0',
+                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);

package/dist/m365/spo/commands/file/file-move.js

@@ -147,7 +147,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 yield Cli_1.Cli.executeCommand(removeCommand, { options: Object.assign(Object.assign({}, removeOptions), { _: [] }) });
             }
             catch (err) {
-                if (err.error !== undefined && err.error.message !== undefined && err.error.message.includes('does not exist')) {
+                if (err !== undefined && err.message !== undefined && err.message.includes('does not exist')) {
                 }
                 else {
                     throw err;

package/dist/m365/spo/commands/file/file-retentionlabel-ensure.js

@@ -42,6 +42,9 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const fileProperties = yield this.getFileProperties(logger, args);
+                if (args.options.assetId) {
+                    yield this.applyAssetId(args.options.webUrl, fileProperties.ListItemAllFields.ParentList.Id, fileProperties.ListItemAllFields.Id, args.options.assetId);
+                }
                 const options = {
                     webUrl: args.options.webUrl,
                     listId: fileProperties.ListItemAllFields.ParentList.Id,
@@ -84,12 +87,28 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand_1.default {
             return yield request_1.default.get(requestOptions);
         });
     }
+    applyAssetId(webUrl, listId, listItemId, assetId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestUrl = `${webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listId)}')`;
+            const requestBody = { "formValues": [{ "FieldName": "ComplianceAssetId", "FieldValue": assetId }] };
+            const requestOptions = {
+                url: `${requestUrl}/items(${listItemId})/ValidateUpdateListItem()`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
 }
 _SpoFileRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoFileRetentionLabelEnsureCommand_initTelemetry = function _SpoFileRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             fileUrl: typeof args.options.fileUrl !== 'undefined',
-            fileId: typeof args.options.fileId !== 'undefined'
+            fileId: typeof args.options.fileId !== 'undefined',
+            assetId: typeof args.options.assetId !== 'undefined'
         });
     });
 }, _SpoFileRetentionLabelEnsureCommand_initOptions = function _SpoFileRetentionLabelEnsureCommand_initOptions() {
@@ -101,6 +120,8 @@ _SpoFileRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoFileRetention
         option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
+    }, {
+        option: '-a, --assetId [assetId]'
     });
 }, _SpoFileRetentionLabelEnsureCommand_initValidators = function _SpoFileRetentionLabelEnsureCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -58,8 +58,14 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
             const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
             const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
+            if (args.options.id) {
+                requestUrl += `/items(${args.options.id})`;
+            }
+            else {
+                requestUrl += `/GetItemByUniqueId(guid'${args.options.uniqueId}')`;
+            }
             const requestOptions = {
-                url: `${requestUrl}/items(${args.options.id})?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
+                url: `${requestUrl}?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -68,7 +74,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             try {
                 const itemProperties = yield request_1.default.get(requestOptions);
                 if (args.options.withPermissions) {
-                    requestOptions.url = `${requestUrl}/items(${args.options.id})/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
+                    requestOptions.url = `${requestUrl}/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
                     const response = yield request_1.default.get(requestOptions);
                     response.value.forEach((r) => {
                         r.RoleDefinitionBindings = formatting_1.formatting.setFriendlyPermissions(r.RoleDefinitionBindings);
@@ -90,6 +96,8 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            uniqueId: typeof args.options.uniqueId !== 'undefined',
             withPermissions: !!args.options.withPermissions
         });
     });
@@ -97,7 +105,9 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '--uniqueId [uniqueId]'
     }, {
         option: '-l, --listId [listId]'
     }, {
@@ -119,15 +129,20 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
             !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (isNaN(parseInt(args.options.id))) {
+        if (args.options.id &&
+            isNaN(parseInt(args.options.id))) {
             return `${args.options.id} is not a number`;
         }
+        if (args.options.uniqueId &&
+            !validation_1.validation.isValidGuid(args.options.uniqueId)) {
+            return `${args.options.uniqueId} in option uniqueId is not a valid GUID`;
+        }
         return true;
     }));
 }, _SpoListItemGetCommand_initTypes = function _SpoListItemGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'properties');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'uniqueId', 'properties');
 }, _SpoListItemGetCommand_initOptionSets = function _SpoListItemGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['id', 'uniqueId'] });
 };
 module.exports = new SpoListItemGetCommand();
 //# sourceMappingURL=listitem-get.js.map

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-ensure.js

@@ -42,6 +42,9 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const labelInformation = yield this.getLabelInformation(args.options, logger);
+                if (args.options.assetId) {
+                    yield this.applyAssetId(args.options, logger);
+                }
                 yield this.applyLabel(args.options, labelInformation, logger);
             }
             catch (err) {
@@ -106,6 +109,34 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand_1.default {
             yield request_1.default.post(requestOptions);
         });
     }
+    applyAssetId(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Applying the asset Id ${options.assetId}...`);
+            }
+            let requestUrl = `${options.webUrl}/_api/web`;
+            if (options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')/items(${options.listItemId})/ValidateUpdateListItem()`;
+            }
+            else if (options.listTitle) {
+                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')/items(${options.listItemId})/ValidateUpdateListItem()`;
+            }
+            else if (options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                requestUrl += `/GetList(@listUrl)/items(${options.listItemId})/ValidateUpdateListItem()?@listUrl='${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}'`;
+            }
+            const requestBody = { "formValues": [{ "FieldName": "ComplianceAssetId", "FieldValue": options.assetId }] };
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
 }
 _SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemRetentionLabelEnsureCommand_initTelemetry = function _SpoListItemRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -114,7 +145,8 @@ _SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemR
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            id: typeof args.options.id !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            assetId: typeof args.options.assetId !== 'undefined'
         });
     });
 }, _SpoListItemRetentionLabelEnsureCommand_initOptions = function _SpoListItemRetentionLabelEnsureCommand_initOptions() {
@@ -132,6 +164,8 @@ _SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemR
         option: '-n, --name [name]'
     }, {
         option: '-i, --id [id]'
+    }, {
+        option: '-a, --assetId [assetId]'
     });
 }, _SpoListItemRetentionLabelEnsureCommand_initValidators = function _SpoListItemRetentionLabelEnsureCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/web/web-set.js

@@ -69,20 +69,37 @@ class SpoWebSetCommand extends SpoCommand_1.default {
                 const searchScope = args.options.searchScope.toLowerCase();
                 payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
             }
-            const requestOptions = {
-                url: `${args.options.url}/_api/web`,
-                headers: {
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: payload
-            };
-            if (this.verbose) {
-                logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
-            }
             try {
+                const requestOptions = {
+                    url: `${args.options.url}/_api/web`,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: payload
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
+                }
                 yield request_1.default.patch(requestOptions);
+                if (typeof args.options.welcomePage !== 'undefined') {
+                    if (this.verbose) {
+                        logger.logToStderr(`Setting welcome page to: ${args.options.welcomePage}...`);
+                    }
+                    const requestOptions = {
+                        url: `${args.options.url}/_api/web/RootFolder`,
+                        headers: {
+                            'content-type': 'application/json;odata=nometadata',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json',
+                        data: {
+                            WelcomePage: args.options.welcomePage
+                        }
+                    };
+                    yield request_1.default.patch(requestOptions);
+                }
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -105,7 +122,8 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
             quickLaunchEnabled: typeof args.options.quickLaunchEnabled !== 'undefined',
             footerEnabled: typeof args.options.footerEnabled !== 'undefined',
             navAudienceTargetingEnabled: typeof args.options.navAudienceTargetingEnabled !== 'undefined',
-            searchScope: args.options.searchScope !== 'undefined'
+            searchScope: typeof args.options.searchScope !== 'undefined',
+            welcomePage: typeof args.options.welcomePage !== 'undefined'
         });
         this.trackUnknownOptions(this.telemetryProperties, args.options);
     });
@@ -139,6 +157,8 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     }, {
         option: '--searchScope [searchScope]',
         autocomplete: SpoWebSetCommand.searchScopeOptions
+    }, {
+        option: '--welcomePage [welcomePage]'
     });
 }, _SpoWebSetCommand_initTypes = function _SpoWebSetCommand_initTypes() {
     this.types.boolean.push('megaMenuEnabled', 'footerEnabled', 'quickLaunchEnabled', 'navAudienceTargetingEnabled');

package/dist/settingsNames.js

@@ -15,7 +15,8 @@ const settingsNames = {
     output: 'output',
     printErrorsAsPlainText: 'printErrorsAsPlainText',
     prompt: 'prompt',
-    showHelpOnFailure: 'showHelpOnFailure'
+    showHelpOnFailure: 'showHelpOnFailure',
+    showSpinner: 'showSpinner'
 };
 exports.settingsNames = settingsNames;
 //# sourceMappingURL=settingsNames.js.map

package/docs/docs/_clisettings.md

@@ -18,3 +18,4 @@ Setting name|Definition|Default value
 `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`
+`showSpinner`|Display spinner when executing commands|`true`

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

@@ -48,7 +48,7 @@ m365 aad o365group add [options]
 ## Remarks
 
 When specifying the path to the logo image you can use both relative and absolute paths. Note, that ~ in the path, will not be resolved and will most likely result in an error.
-If an invalid user is provided in the comma-separated list or Owners or Members, the command operation will fail and the Micrsoft 365 Group will not be created.
+If an invalid user is provided in the comma-separated list of Owners or Members, the command operation will fail and the Microsoft 365 Group will not be created.
 
 ## Examples
 
@@ -76,13 +76,13 @@ Create a public Microsoft 365 Group and set specified users as its members
 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 --members "DebraB@contoso.onmicrosoft.com,DiegoS@contoso.onmicrosoft.com"
 ```
 
-Create a public Microsoft 365 Group and allows only group members to be able to post conversations to the group.
+Create a public Microsoft 365 Group and allow only group members to be able to post conversations to the 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 --allowMembersToPost
 ```
 
-Create a public Microsoft 365 Group and hides it from the Outlook experiences (web and client).
+Create a public Microsoft 365 Group and hide it from the Outlook experiences (web and client).
 
 ```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 --hideGroupInOutlook

package/docs/docs/cmd/pa/app/app-export.md

@@ -0,0 +1,52 @@
+# pa app export
+
+Exports the specified Power App
+
+## Usage
+
+```sh
+m365 pa app export [options]
+```
+
+## Options
+
+`-i, --id <id>`
+: The id of the Power App to export
+
+`-e, --environment <environment>`
+: The name of the environment for which to export the app
+
+`-n, --packageDisplayName [packageDisplayName]`
+: The display name to use in the exported package
+
+`-d, --packageDescription [packageDescription]`
+: The description to use in the exported package
+
+`-c, --packageCreatedBy [packageCreatedBy]`
+: The name of the person to be used as the creator of the exported package
+
+`-s, --packageSourceEnvironment [packageSourceEnvironment]`
+: The name of the source environment from which the exported package was taken
+
+`-p, --path [path]`
+: The path to save the exported package to. If not specified the app will be exported in the current working directory
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Export the specified Power App as a ZIP file
+
+```sh
+m365 pa app export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d 
+```
+
+Export the specified Power App as a ZIP file with the package displayname, package description, the one who created it, the package source environment and the path
+
+```sh
+m365 pa app export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName "PowerApp" --packageDescription "Power App Description" --packageCreatedBy "John Doe" --packageSourceEnvironment "Contoso" --path "C:/Users/John/Documents"
+```
+
+## Response
+
+The command won't return a response on success.

package/docs/docs/cmd/purview/threatassessment/threatassessment-get.md

@@ -0,0 +1,191 @@
+# purview threatassessment get
+
+Get a threat assessment
+
+## Usage
+
+```sh
+m365 purview threatassessment get [options]
+```
+
+## Options
+
+`-i, --id <id>`
+: The Id of the threat assessment
+
+`--includeResults`
+: Include the threat assessment results
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Get a threat assessment
+
+```sh
+m365 purview threatassessment get --id c37d695e-d581-4ae9-82a0-9364eba4291e
+```
+
+Get a threat assessment including results
+
+```sh
+m365 purview threatassessment get --id c37d695e-d581-4ae9-82a0-9364eba4291e --includeResults
+```
+
+## Response
+
+### Standard Response
+
+=== "JSON"
+
+    ```json
+    {
+      "id": "8aaba0ac-ec4d-4e62-5774-08db16c68731",
+      "createdDateTime": "2023-02-25T00:23:33.0550644Z",
+      "contentType": "mail",
+      "expectedAssessment": "block",
+      "category": "spam",
+      "status": "pending",
+      "requestSource": "administrator",
+      "recipientEmail": "john@contoso.com",
+      "destinationRoutingReason": "notJunk",
+      "messageUri": "https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=",
+      "createdBy": {
+        "user": {
+          "id": "fe36f75e-c103-410b-a18a-2bf6df06ac3a",
+          "displayName": "John Doe"
+        }
+      }
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    category                : spam
+    contentType             : mail
+    createdBy               : {"user":{"id":"fe36f75e-c103-410b-a18a-2bf6df06ac3a","displayName":"John Doe"}}
+    createdDateTime         : 2023-02-25T00:23:33.0550644Z
+    destinationRoutingReason: notJunk
+    expectedAssessment      : block
+    id                      : 8aaba0ac-ec4d-4e62-5774-08db16c68731
+    messageUri              : https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=
+    recipientEmail          : john@contoso.com
+    requestSource           : administrator
+    status                  : pending
+    ```
+
+=== "CSV"
+
+    ```csv
+    id,createdDateTime,contentType,expectedAssessment,category,status,requestSource,recipientEmail,destinationRoutingReason,messageUri,createdBy
+    8aaba0ac-ec4d-4e62-5774-08db16c68731,2023-02-25T00:23:33.0550644Z,mail,block,spam,pending,administrator,john@contoso.com,notJunk,https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=,"{""user"":{""id"":""fe36f75e-c103-410b-a18a-2bf6df06ac3a"",""displayName"":""John Doe""}}"
+    ```
+
+=== "Markdown"
+
+    ```md
+    # purview threatassessment get --id "8aaba0ac-ec4d-4e62-5774-08db16c68731"
+
+    Date: 25/02/2023
+
+    ## 8aaba0ac-ec4d-4e62-5774-08db16c68731
+
+    Property | Value
+    ---------|-------
+    id | 8aaba0ac-ec4d-4e62-5774-08db16c68731
+    createdDateTime | 2023-02-25T00:23:33.0550644Z
+    contentType | mail
+    expectedAssessment | block
+    category | spam
+    status | pending
+    requestSource | administrator
+    recipientEmail | john@contoso.com
+    destinationRoutingReason | notJunk
+    messageUri | https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E\_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E\_hLMK5kAALHNaMuAAA=
+    createdBy | {"user":{"id":"fe36f75e-c103-410b-a18a-2bf6df06ac3a","displayName":"John Doe"}}
+    ```
+
+### `includeResults` response
+
+When we make use of the option `includeResults` the response will differ. 
+
+=== "JSON"
+
+    ```json
+    {
+      "id": "8aaba0ac-ec4d-4e62-5774-08db16c68731",
+      "createdDateTime": "2023-02-25T00:23:33.0550644Z",
+      "contentType": "mail",
+      "expectedAssessment": "block",
+      "category": "spam",
+      "status": "pending",
+      "requestSource": "administrator",
+      "recipientEmail": "john@contoso.com",
+      "destinationRoutingReason": "notJunk",
+      "messageUri": "https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=",
+      "createdBy": {
+        "user": {
+          "id": "fe36f75e-c103-410b-a18a-2bf6df06ac3a",
+          "displayName": "John Doe"
+        }
+      },
+      "results": [
+        {
+          "id": "a5455871-18d1-44d8-0866-08db16c68b85",
+          "createdDateTime": "2023-02-25T00:23:40.28Z",
+          "resultType": "checkPolicy",
+          "message": "No policy was hit."
+        }
+      ]
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    category                : spam
+    contentType             : mail
+    createdBy               : {"user":{"id":"fe36f75e-c103-410b-a18a-2bf6df06ac3a","displayName":"John Doe"}}
+    createdDateTime         : 2023-02-25T00:23:33.0550644Z
+    destinationRoutingReason: notJunk
+    expectedAssessment      : block
+    id                      : 8aaba0ac-ec4d-4e62-5774-08db16c68731
+    messageUri              : https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=
+    recipientEmail          : john@contoso.com
+    requestSource           : administrator
+    results                 : [{"id":"a5455871-18d1-44d8-0866-08db16c68b85","createdDateTime":"2023-02-25T00:23:40.28Z","resultType":"checkPolicy","message":"No policy was hit."}]
+    status                  : pending
+    ```
+
+=== "CSV"
+
+    ```csv
+    id,createdDateTime,contentType,expectedAssessment,category,status,requestSource,recipientEmail,destinationRoutingReason,messageUri,createdBy,results
+    8aaba0ac-ec4d-4e62-5774-08db16c68731,2023-02-25T00:23:33.0550644Z,mail,block,spam,pending,administrator,john@contoso.com,notJunk,https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=,"{""user"":{""id"":""fe36f75e-c103-410b-a18a-2bf6df06ac3a"",""displayName"":""John Doe""}}","[{""id"":""a5455871-18d1-44d8-0866-08db16c68b85"",""createdDateTime"":""2023-02-25T00:23:40.28Z"",""resultType"":""checkPolicy"",""message"":""No policy was hit.""}]"
+    ```
+
+=== "Markdown"
+
+    ```md
+    # purview threatassessment get --id "8aaba0ac-ec4d-4e62-5774-08db16c68731" --includeResults "true"
+
+    Date: 25/02/2023
+
+    ## 8aaba0ac-ec4d-4e62-5774-08db16c68731
+
+    Property | Value
+    ---------|-------
+    id | 8aaba0ac-ec4d-4e62-5774-08db16c68731
+    createdDateTime | 2023-02-25T00:23:33.0550644Z
+    contentType | mail
+    expectedAssessment | block
+    category | spam
+    status | pending
+    requestSource | administrator
+    recipientEmail | john@contoso.com
+    destinationRoutingReason | notJunk
+    messageUri | https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E\_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E\_hLMK5kAALHNaMuAAA=
+    createdBy | {"user":{"id":"fe36f75e-c103-410b-a18a-2bf6df06ac3a","displayName":"John Doe"}}
+    results | [{"id":"a5455871-18d1-44d8-0866-08db16c68b85","createdDateTime":"2023-02-25T00:23:40.28Z","resultType":"checkPolicy","message":"No policy was hit."}]
+    ```

package/docs/docs/cmd/request.md

@@ -40,6 +40,12 @@ If you specify the `resource` option, the CLI will try to retrieve a valid token
 
 Specify additional headers by typing them as options, for example: `--content-type "application/json"`, `--if-match "*"`, `--x-requestdigest "somedigest"`.
 
+You can simplify the request by using tokens for the `url` option. Following tokens are available:
+
+- `@graph` resolves to `https://graph.microsoft.com/v1.0`
+- `@graphbeta` resolves to `https://graph.microsoft.com/beta`
+- `@spo` resolves to the current SharePoint URL if available. You can set a SharePoint URL using the [spo set](./spo/spo-set.md) command.
+
 !!! important
     When building the request, depending on the shell you use, you might need to escape all `$` characters in the URL, request headers, and the body. If you don't do it, the shell will treat it as a variable and will remove the following word from the request, breaking the request.
 
@@ -63,16 +69,16 @@ Call the SharePoint API to retrieve a form digest.
 m365 request --method post --url "https://contoso.sharepoint.com/sites/project-x/_api/contextinfo"
 ```
 
-Call the SharePoint API to update a site title.
+Call the SharePoint API to update a site title using the @spo token.
 
 ```sh
-m365 request --method post --url "https://contoso.sharepoint.com/sites/project-x/_api/web" --body '{ "Title": "New title" }' --content-type "application/json" --x-http-method "PATCH"
+m365 request --method post --url "@spo/sites/project-x/_api/web" --body '{ "Title": "New title" }' --content-type "application/json" --x-http-method "PATCH"
 ```
 
-Call the Microsoft Graph to get a profile photo.
+Call the Microsoft Graph to get a profile photo using the @graphbeta token.
 
 ```sh
-m365 request --url "https://graph.microsoft.com/beta/me/photo/\$value" --filePath ./profile-pic.jpg
+m365 request --url '@graphbeta/me/photo/$value' --filePath ./profile-pic.jpg
 ```
 
 ## Response

package/docs/docs/cmd/spfx/project/project-upgrade.md

@@ -29,13 +29,13 @@ m365 spfx project upgrade [options]
 
 ## Remarks
 
-The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.16.1).
+The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.17.0).
 
 This command doesn't change your project files. Instead, it gives you a report with all steps necessary to upgrade your project to the specified version of the SharePoint Framework. Changing project files is error-prone, especially when it comes to updating your solution's code. This is why at this moment, this command produces a report that you can use yourself to perform the necessary updates and verify that everything is working as expected.
 
 !!! important
     Run this command in the folder where the project that you want to upgrade is located. This command doesn't change your project files.
-    
+
 ## Examples
 
 Get instructions to upgrade the current SharePoint Framework project to SharePoint Framework version 1.5.0 and save the findings in a Markdown file

package/docs/docs/cmd/spo/file/file-retentionlabel-ensure.md

@@ -22,12 +22,17 @@ m365 spo file retentionlabel ensure [options]
 `--name <name>`
 : Name of the retention label to apply to the file.
 
+`-a, --assetId [assetId]`
+: A Compliance Asset Id to set on the item when it's labeled. See below for more information.
+
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
 You can also use [spo listitem retentionlabel remove](./../../../cmd/spo//listitem/listitem-retentionlabel-remove.md) for removing the retentionlabel from a listitem.
 
+The `--assetId` option has to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created.
+
 ## Examples
 
 Applies a retention label to a file based on the label name and the fileUrl
@@ -39,7 +44,13 @@ m365 spo file retentionlabel ensure --webUrl https://contoso.sharepoint.com/site
 Applies a retention label to a file based on the label name and the fileId
 
 ```sh
-m365 spo file retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --fileId '26541f96-017c-4189-a604-599e083533b8'  --name 'Some label'
+m365 spo file retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --fileId '26541f96-017c-4189-a604-599e083533b8' --name 'Some label'
+```
+
+Applies a event-based retention label to a file and updates the Asset Id field
+
+```sh
+m365 spo file retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --fileId '26541f96-017c-4189-a604-599e083533b8' --name 'Some label' --assetId 'XYZ'
 ```
 
 ## Response