Skip to content

Commit 7d461de

Browse files
authored
Merge pull request #26317 from microsoftgraph/main
Merge to publish.
2 parents 7d51f1c + 1da69ba commit 7d461de

7 files changed

+71
-213
lines changed

api-reference/beta/api/plannertaskconfiguration-update.md

Lines changed: 46 additions & 192 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ PATCH /solutions/businessScenarios/{businessScenarioId}/planner/taskConfiguratio
4141
|:---|:---|
4242
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
4343
|Content-Type|application/json. Required.|
44+
|If-Match| Last known `@odata-etag` value for the **plannerTaskConfiguration** to be updated. Required. Learn more about [etags](https://learn.microsoft.com/en-us/graph/api/resources/planner-overview?view=graph-rest-1.0#planner-resource-versioning).|
4445

4546
## Request body
4647

@@ -70,89 +71,49 @@ The following example shows a request.
7071
``` http
7172
PATCH https://graph.microsoft.com/beta/solutions/businessScenarios/c5d514e6c6864911ac46c720affb6e4d/planner/taskConfiguration
7273
Content-Type: application/json
74+
If-Match: W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAWCc="
7375
7476
{
75-
"@odata.type": "#microsoft.graph.plannerTaskConfiguration",
76-
"editPolicy": {
77-
"rules": [
78-
{
79-
"defaultRule": "block",
80-
"role": {
81-
"@odata.type": "#microsoft.graph.plannerRelationshipBasedUserType",
82-
"roleKind": "relationship",
83-
"role": "defaultRules"
84-
},
85-
"propertyRule": {
86-
"percentComplete": ["allow"],
87-
"ruleKind": "taskRule",
88-
"assignments": {
89-
"defaultRules": ["addSelf"],
90-
"overrides": []
91-
}
92-
}
93-
},
94-
{
95-
"defaultRule": "block",
96-
"role": {
97-
"@odata.type": "#microsoft.graph.plannerRelationshipBasedUserType",
98-
"roleKind": "relationship",
99-
"role": "taskAssignees"
100-
},
101-
"propertyRule": {
102-
"startDate": ["allow"],
103-
"dueDate": ["allow"],
104-
"percentComplete": ["allow"],
105-
"order": ["allow"],
106-
"ruleKind": "taskRule",
107-
"references": {
108-
"defaultRules": ["allow"],
109-
"overrides": [
110-
{
111-
"name": "userCreated",
112-
"rules": ["allow"]
113-
},
114-
{
115-
"name": "applicationCreated",
116-
"rules": ["block"]
117-
}
118-
]
119-
},
120-
"checkLists": {
121-
"defaultRules": ["allow"],
122-
"overrides": [
123-
{
124-
"name": "userCreated",
125-
"rules": ["allow"]
126-
},
127-
{
128-
"name": "applicationCreated",
129-
"rules": ["check"]
130-
}
131-
]
132-
},
133-
"assignments": {
134-
"defaultRules": ["block"],
135-
"overrides": [
136-
{
137-
"name": "userCreated",
138-
"rules": ["removeSelf"]
139-
},
140-
{
141-
"name": "applicationCreated",
142-
"rules": ["check"]
143-
}
144-
]
145-
},
146-
"appliedCategories": {
147-
"defaultRules": [
148-
"allow"
149-
],
150-
"overrides": []
151-
}
152-
}
153-
}
154-
]
155-
}
77+
"editPolicy": {
78+
"rules": [
79+
{
80+
"userType": {
81+
"@odata.type": "#microsoft.graph.plannerRelationshipBasedUserType",
82+
"selectionKind": "relationship",
83+
"role": "defaultRules"
84+
},
85+
"defaultRule": "block",
86+
"propertyRule": {
87+
"ruleKind": "taskRule",
88+
"references": {
89+
"defaultRules": [ "allow" ],
90+
"overrides": []
91+
},
92+
"checkLists": {
93+
"defaultRules": [ "allow" ],
94+
"overrides": []
95+
},
96+
"assignments": {
97+
"defaultRules": [ "allow" ],
98+
"overrides": [
99+
{
100+
"name": "userCreated",
101+
"rules": [ "allow" ]
102+
},
103+
{
104+
"name": "applicationCreated",
105+
"rules": [ "allow" ]
106+
}
107+
]
108+
},
109+
"appliedCategories": {
110+
"defaultRules": [ "allow" ],
111+
"overrides": []
112+
}
113+
}
114+
}
115+
]
116+
}
156117
}
157118
```
158119

@@ -193,117 +154,10 @@ Content-Type: application/json
193154
### Response
194155

195156
The following example shows the response.
196-
>**Note:** The response object shown here might be shortened for readability.
197157
<!-- {
198158
"blockType": "response",
199-
"truncated": true,
200-
"@odata.type": "microsoft.graph.plannerTaskConfiguration"
201-
}
202-
-->
203-
``` http
204-
HTTP/1.1 200 OK
205-
Content-Type: application/json
206-
207-
{
208-
"@odata.type": "#microsoft.graph.plannerTaskConfiguration",
209-
"id": "52be01e6291f403aa49f2b9f5288ab48",
210-
"editPolicy": {
211-
"rules": [
212-
{
213-
"defaultRule": "block",
214-
"role": {
215-
"@odata.type": "#microsoft.graph.plannerRelationshipBasedUserType",
216-
"roleKind": "relationship",
217-
"role": "defaultRules"
218-
},
219-
"propertyRule": {
220-
"move": [],
221-
"delete": [],
222-
"title": [],
223-
"notes": [],
224-
"priority": [],
225-
"startDate": [],
226-
"dueDate": [],
227-
"percentComplete": ["allow"],
228-
"order": [],
229-
"previewType": [],
230-
"ruleKind": "taskRule",
231-
"references": null,
232-
"checkLists": null,
233-
"assignments": {
234-
"defaultRules": ["addSelf"],
235-
"overrides": []
236-
},
237-
"appliedCategories": null
238-
}
239-
},
240-
{
241-
"defaultRule": "block",
242-
"role": {
243-
"@odata.type": "#microsoft.graph.plannerRelationshipBasedUserType",
244-
"roleKind": "relationship",
245-
"role": "taskAssignees"
246-
},
247-
"propertyRule": {
248-
"move": [],
249-
"delete": [],
250-
"title": [],
251-
"notes": [],
252-
"priority": [],
253-
"startDate": ["allow"],
254-
"dueDate": ["allow"],
255-
"percentComplete": ["allow"],
256-
"order": ["allow"],
257-
"previewType": [],
258-
"ruleKind": "taskRule",
259-
"references": {
260-
"defaultRules": ["allow"],
261-
"overrides": [
262-
{
263-
"name": "userCreated",
264-
"rules": ["allow"]
265-
},
266-
{
267-
"name": "applicationCreated",
268-
"rules": ["block"]
269-
}
270-
]
271-
},
272-
"checkLists": {
273-
"defaultRules": ["allow"],
274-
"overrides": [
275-
{
276-
"name": "userCreated",
277-
"rules": ["allow"]
278-
},
279-
{
280-
"name": "applicationCreated",
281-
"rules": ["check"]
282-
}
283-
]
284-
},
285-
"assignments": {
286-
"defaultRules": ["block"],
287-
"overrides": [
288-
{
289-
"name": "userCreated",
290-
"rules": ["removeSelf"]
291-
},
292-
{
293-
"name": "applicationCreated",
294-
"rules": ["check"]
295-
}
296-
]
297-
},
298-
"appliedCategories": {
299-
"defaultRules": [
300-
"allow"
301-
],
302-
"overrides": []
303-
}
304-
}
305-
}
306-
]
307-
}
308-
}
159+
"truncated": true
160+
} -->
161+
```http
162+
HTTP/1.1 204 No Content
309163
```

api-reference/beta/resources/tiindicator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Currently, **targetProduct** supports the following products:
4040
4141
There's a limit of 15,000 indicators per tenant for Microsoft Defender for Endpoint.
4242

43-
- **Microsoft Sentinel** – Only existing customers can use the **tiIndicator** API to send threat intelligence indicators to Microsoft Sentinel. For the most up-to-date, detailed instructions on how to send threat intelligent indicators to Microsoft Sentinel, see [Connect your threat intelligence platform to Microsoft Sentinel](/azure/sentinel/connect-threat-intelligence-tip).
43+
- **Microsoft Sentinel** – Only existing customers can use the **tiIndicator** API to send threat intelligence indicators to Microsoft Sentinel. For the most up-to-date, detailed instructions on how to send threat intelligent indicators to Microsoft Sentinel, see [Connect your threat intelligence platform to Microsoft Sentinel with the upload API](/azure/sentinel/connect-threat-intelligence-upload-api).
4444

4545
For details about the types of indicators supported and limits on indicator counts per tenant, see [Manage indicators](/windows/security/threat-protection/microsoft-defender-atp/manage-indicators).
4646

concepts/application-saml-sso-configure-api.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.localizationpriority: high
88
ms.topic: tutorial
99
ms.custom: scenarios:getting-started
1010
ms.subservice: entra-applications
11-
ms.date: 02/23/2024
11+
ms.date: 02/27/2025
1212
#customer intent: As a developer, I want to configure SAML-based single sign-on for my application using Microsoft Graph, so that I can improve usability of apps by enabling secure authentication and authorization for users.
1313
---
1414

@@ -27,13 +27,15 @@ In this tutorial, you learn how to:
2727
2828
## Prerequisites
2929

30-
- Sign in to an API client such as [Graph Explorer](https://aka.ms/ge) as a user with Cloud Application Administrator role in your Microsoft Entra tenant.
30+
This tutorial configures SSO for the AWS IAM Identity Center. However, most of the steps on Microsoft Graph apply to any other app that you want to configure SSO.
31+
32+
- Sign in to an API client such as [Graph Explorer](https://aka.ms/ge) with the privileges to instantiate apps from the Microsoft Entra application gallery, configure app roles, and policies on apps. *Cloud Application Administrator* in the least privileged Microsoft Entra built-in role with these permissions.
3133
- Grant yourself the following delegated permissions: `Application.ReadWrite.All`, `AppRoleAssignment.ReadWrite.All`, `Policy.Read.All`, `Policy.ReadWrite.ApplicationConfiguration`, and `User.ReadWrite.All`.
32-
- Have a test user to assign to the application.
34+
- Have a test user to assign to the application. You'll create a matching user in the AWS IAM Identity Center later in this tutorial.
3335

3436
## Step 1: Identify the application to configure
3537

36-
Microsoft Entra ID has a gallery that contains thousands of preintegrated applications that you can use as a template for your application. In Microsoft Graph, this list is available through the **applicationTemplate** entity.
38+
To create an app that supports SSO, you register it through the Microsoft Entra App Gallery. The Microsoft Entra App Gallery is a catalog of thousands of preintegrated apps that simplify deploying and configuring SSO and automated user provisioning. In Microsoft Graph, this list is available through the **applicationTemplate** entity.
3739

3840
In this step, you identify the application template for the `AWS IAM Identity Center (successor to AWS Single Sign-On)` application that you want to configure. Record its **id**.
3941

@@ -123,7 +125,7 @@ Content-type: application/json
123125

124126
## Step 2: Instantiate the application
125127

126-
Using the **id** value for the application template, create an instance of the application in your tenant. Here, you name the application **AWS Contoso**. The response includes an application and service principal object for **AWS Contoso**, which is an instance of the **AWS IAM Identity Center (successor to AWS Single Sign-On)** app. Record the IDs of the two objects for use later in this tutorial.
128+
Using the **id** value for the application template, create an instance of the application in your tenant. Here, you name the application **AWS Contoso**. The response includes an application and service principal object for **AWS Contoso**, which is an instance of the **AWS IAM Identity Center (successor to AWS Single Sign-On)** app. Record the IDs of the created application and service principal objects for use later in this tutorial.
127129

128130
#### Request
129131

@@ -361,11 +363,11 @@ Content-type: application/json
361363

362364
## Step 3: Configure single sign-on
363365

364-
In this step, you configure SSO for both the AWS Contoso application and the service principal. For the application, you configure the SAML URLs while for the service principal, you set the SSO mode to `saml`.
366+
In this step, you configure SSO for both the AWS Contoso. For the application, you configure the SAML URLs while for the service principal, you set the SSO mode to `saml`.
365367

366368
### Step 3.1: Set single sign-on mode for the service principal
367369

368-
Set `saml` as the SSO mode for the service principal you created in Step 2. The request returns a `204 No Content` response code.
370+
Set `saml` as the SSO mode for the AWS Contoso service principal. The request returns a `204 No Content` response code.
369371

370372
# [HTTP](#tab/http)
371373
<!-- {
@@ -417,7 +419,7 @@ Content-type: application/json
417419

418420
### Step 3.2: Set basic SAML URLs for the application
419421

420-
In this step, set the **web**/**redirectUris** and **web**/**redirectUris** for the application you created in Step 2. The request returns a `204 No Content` response code.
422+
Set the **web**/**redirectUris** and **web**/**redirectUris** for the AWS Contoso application. The request returns a `204 No Content` response code.
421423

422424
# [HTTP](#tab/http)
423425
<!-- {
@@ -476,7 +478,7 @@ Content-type: application/json
476478

477479
## Step 4: Add app roles
478480

479-
If the application requires the role information in the token, add the definition of the roles in the application object. By default, the **appRoles** object in the application and service principal in Step 2 included the default `User` and `msiam_access` roles. Don't modify or remove them. To add more roles, you must include both the existing roles and the new roles in the **appRoles** object in the request, otherwise, the existing roles are replaced.
481+
If the application requires the role information in the token, add the definition of the roles in the **appRoles** property. AWS Contoso was instantiated with the default `User` and `msiam_access` roles - don't modify or remove them. To add more roles, you include both the existing roles and the new roles in the **appRoles** object in the request, otherwise, the existing roles are replaced.
480482

481483
In this step, add the `Finance,WAAD` and `Admin,WAAD` roles to the AWS Contoso service principal. The request returns a `204 No Content` response code.
482484

@@ -1128,7 +1130,7 @@ Content-type: application/json
11281130

11291131
### Assign a user to the application
11301132

1131-
Assign the user that you created to the service principal and grant them the `Admin,WAAD` app role. In the request body, provide the following values:
1133+
Assign the test user that you created to the service principal and grant them the `Admin,WAAD` app role. In the request body, provide the following values:
11321134

11331135
- **principalId** - The ID of the user account that you created.
11341136
- **appRoleId** - The ID of the `Admin,WAAD` app role that you added.
@@ -1236,12 +1238,12 @@ The following shows an example of what you might see for your application. Save
12361238

12371239
## Step 9: Complete and test the integration
12381240

1239-
Now that you've completed the configuration steps for the application in Microsoft Entra ID and have the SAML metadata, sign in to your AWS IAM Identity Center company site as an administrator and:
1240-
1. Complete the steps to [Configure AWS IAM Identity Center SSO](/entra/identity/saas-apps/aws-single-sign-on-tutorial#configure-aws-iam-identity-center-sso).
1241-
1. Create a test user whose user name and email address match the user account that you created in Microsoft Entra ID.
1241+
Now that you've configured the Microsoft Entra application and have the SAML metadata, sign in to your AWS IAM Identity Center company site as an administrator and:
1242+
1. [Configure AWS IAM Identity Center SSO](/entra/identity/saas-apps/aws-single-sign-on-tutorial#configure-aws-iam-identity-center-sso).
1243+
1. [Create an AWS IAM Identity Center test user whose user name and email address match the user account that you created in Microsoft Entra ID](/entra/identity/saas-apps/aws-single-sign-on-tutorial#create-aws-iam-identity-center-test-user).
12421244
1. [Test the SSO integration](/entra/identity/saas-apps/aws-single-sign-on-tutorial#test-sso).
12431245

1244-
## Step 10: Clean up resources
1246+
## [Optional] Step 10: Clean up resources
12451247

12461248
In this step, remove the resources that you created and no longer need.
12471249

concepts/best-practices-concept.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,5 +159,5 @@ To ensure reliability and facilitate support for your application:
159159
- Open connections to all advertised DNS answers.
160160
- Generate a unique GUID and send it on each Microsoft Graph REST request. This helps Microsoft investigate any errors more easily if you need to report an issue with Microsoft Graph.
161161
- On every request to Microsoft Graph, generate a unique GUID, send it in the `client-request-id` HTTP request header, and also log it in your application's logs.
162-
- Always log the `request-id` and `Date` from the HTTP response headers. These, together with the `client-request-id`, are required when reporting issues in [Microsoft Q&A](/answers/products/m365#microsoft-graph) or to Microsoft Support.
162+
- Always log the full HTTP Graph API call including the full URL, all the headers and JSON body for both the response and the request. These are required when reporting issues in [Microsoft Q&A](/answers/products/m365#microsoft-graph) or to Microsoft Support.
163163
- If you're using a third-party application, the app vendor needs to engage with our support team to investigate the issue.

concepts/cli/installation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ The Microsoft Graph command-line interface (CLI) is published on [GitHub](https:
2121

2222
### Windows environment setup (Optional)
2323

24-
1. Open **Settings**.
25-
1. Select **About**, then **Advanced system settings**.
24+
1. Open **Settings** > **System**.
25+
1. Select **About** > **Advanced system settings**.
2626
1. Select **Environment Variables...**.
27-
1. Locate and select **Path**, then select **Edit**.
27+
1. Locate and select **Path** > select **Edit**.
2828

2929
> [!NOTE]
3030
> The **Path** variable is present in **User variables** as well as **System variables**. Updating the variable in **User variables** will only update the current user's path. Updating the variable in **System variables** will update the path for all users on the computer.

0 commit comments

Comments
 (0)