Skip to content

Commit 7e3f00a

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into localworking
2 parents e16962b + b886c27 commit 7e3f00a

File tree

1,391 files changed

+13033
-11935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,391 files changed

+13033
-11935
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@
146146
"url": "https://github.com/Azure/azure-functions-durable-extension",
147147
"branch": "master"
148148
},
149+
{
150+
"path_to_root": "functions-python-tensorflow-tutorial",
151+
"url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
152+
"branch": "master",
153+
"branch_mapping": {}
154+
},
149155
{
150156
"path_to_root": "samples-personalizer",
151157
"url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",

.openpublishing.redirection.json

Lines changed: 117 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1746,9 +1746,74 @@
17461746
"redirect_url": "/azure/iot-hub/iot-hub-create-using-cli",
17471747
"redirect_document_id": true
17481748
},
1749+
{
1750+
"source_path": "articles/iot-hub/iot-hub-tls.md",
1751+
"redirect_url": "/azure/iot-hub/iot-hub-tls-support",
1752+
"redirect_document_id": true
1753+
},
1754+
{
1755+
"source_path": "articles/iot-hub/tls-1.2-everywhere.md",
1756+
"redirect_url": "/azure/iot-hub/iot-hub-tls-deprecating-1-0-and-1-1",
1757+
"redirect_document_id": true
1758+
},
17491759
{
17501760
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-tutorial-analytics.md",
1751-
"redirect_url": "/azure/cognitive-services/custom-decision-service",
1761+
"redirect_url": "/azure/cognitive-services/personalizer",
1762+
"redirect_document_id": false
1763+
},
1764+
{
1765+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-api-reference.md",
1766+
"redirect_url": "/azure/cognitive-services/personalizer",
1767+
"redirect_document_id": false
1768+
},
1769+
{
1770+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-experimentation-reference.md",
1771+
"redirect_url": "/azure/cognitive-services/personalizer",
1772+
"redirect_document_id": false
1773+
},
1774+
{
1775+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-get-started-app.md",
1776+
"redirect_url": "/azure/cognitive-services/personalizer",
1777+
"redirect_document_id": false
1778+
},
1779+
{
1780+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-get-started-browser.md",
1781+
"redirect_url": "/azure/cognitive-services/personalizer",
1782+
"redirect_document_id": false
1783+
},
1784+
{
1785+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-get-started-register.md",
1786+
"redirect_url": "/azure/cognitive-services/personalizer",
1787+
"redirect_document_id": false
1788+
},
1789+
{
1790+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-log-downloader-reference.md",
1791+
"redirect_url": "/azure/cognitive-services/personalizer",
1792+
"redirect_document_id": false
1793+
},
1794+
{
1795+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-overview.md",
1796+
"redirect_url": "/azure/cognitive-services/personalizer",
1797+
"redirect_document_id": false
1798+
},
1799+
{
1800+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-tutorial-ml.md",
1801+
"redirect_url": "/azure/cognitive-services/personalizer",
1802+
"redirect_document_id": false
1803+
},
1804+
{
1805+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-tutorial-news.md",
1806+
"redirect_url": "/azure/cognitive-services/personalizer",
1807+
"redirect_document_id": false
1808+
},
1809+
{
1810+
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-workflow.md",
1811+
"redirect_url": "/azure/cognitive-services/personalizer",
1812+
"redirect_document_id": false
1813+
},
1814+
{
1815+
"source_path": "articles/cognitive-services/custom-decision-service/index.yml",
1816+
"redirect_url": "/azure/cognitive-services/personalizer",
17521817
"redirect_document_id": false
17531818
},
17541819
{
@@ -1766,6 +1831,11 @@
17661831
"redirect_url": "/azure/cosmos-db/create-sql-api-dotnet",
17671832
"redirect_document_id": false
17681833
},
1834+
{
1835+
"source_path": "articles/cosmos-db/change-feed-hl7-fhir-logic-apps.md",
1836+
"redirect_url": "/azure/cosmos-db/change-feed",
1837+
"redirect_document_id": false
1838+
},
17691839
{
17701840
"source_path": "articles/cosmos-db/spark-api-introduction.md",
17711841
"redirect_url": "/azure/cosmos-db/analytics-usecases",
@@ -3433,7 +3503,12 @@
34333503
},
34343504
{
34353505
"source_path": "articles/azure-resource-manager/extension-resource-types.md",
3436-
"redirect_url": "/azure/azure-resource-manager/templates/extension-resource-types",
3506+
"redirect_url": "/azure/azure-resource-manager/management/extension-resource-types",
3507+
"redirect_document_id": false
3508+
},
3509+
{
3510+
"source_path": "articles/azure-resource-manager/templates/extension-resource-types.md",
3511+
"redirect_url": "/azure/azure-resource-manager/management/extension-resource-types",
34373512
"redirect_document_id": false
34383513
},
34393514
{
@@ -4238,7 +4313,7 @@
42384313
},
42394314
{
42404315
"source_path": "articles/billing-how-to-create-billing-support-ticket.md",
4241-
"redirect_url": "/azure/azure-supportability/how-to-create-azure-support-request",
4316+
"redirect_url": "/azure/azure-portal/supportability/how-to-create-azure-support-request",
42424317
"redirect_document_id": false
42434318
},
42444319
{
@@ -4248,7 +4323,7 @@
42484323
},
42494324
{
42504325
"source_path": "articles/billing-how-to-use-file-uploader.md",
4251-
"redirect_url": "/azure/azure-supportability/how-to-use-file-uploader",
4326+
"redirect_url": "/azure/azure-portal/supportability/how-to-use-file-uploader",
42524327
"redirect_document_id": false
42534328
},
42544329
{
@@ -14694,9 +14769,14 @@
1469414769
},
1469514770
{
1469614771
"source_path": "articles/machine-learning/machine-learning-algorithm-choice.md",
14697-
"redirect_url": "/azure/machine-learning/studio/algorithm-choice",
14772+
"redirect_url": "/azure/machine-learning/how-to-select-algorithms",
1469814773
"redirect_document_id": false
1469914774
},
14775+
{
14776+
"source_path": "articles/machine-learning/studio/algorithm-choice.md",
14777+
"redirect_url": "/azure/machine-learning/how-to-select-algorithms",
14778+
"redirect_document_id": true
14779+
},
1470014780
{
1470114781
"source_path": "articles/machine-learning/machine-learning-algorithm-parameters-optimize.md",
1470214782
"redirect_url": "/azure/machine-learning/studio/algorithm-parameters-optimize",
@@ -17334,7 +17414,7 @@
1733417414
},
1733517415
{
1733617416
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-use-low-priority.md",
17337-
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-use-spot",
17417+
"redirect_url": "/azure/virtual-machine-scale-sets/use-spot",
1733817418
"redirect_document_id": true
1733917419
},
1734017420
{
@@ -31003,7 +31083,7 @@
3100331083
},
3100431084
{
3100531085
"source_path": "articles/operations-management-suite/operations-management-suite-service-map-configure.md",
31006-
"redirect_url": "/azure/monitoring/monitoring-service-map-configure",
31086+
"redirect_url": "/azure/azure-monitor/insights/service-map#enable-service-map",
3100731087
"redirect_document_id": false
3100831088
},
3100931089
{
@@ -38170,6 +38250,11 @@
3817038250
"redirect_url": "/azure/azure-monitor/insights/service-map-scom",
3817138251
"redirect_document_id": false
3817238252
},
38253+
{
38254+
"source_path": "articles/monitoring/monitoring-service-map-configure.md",
38255+
"redirect_url": "/azure/azure-monitor/insights/service-map#enable-service-map",
38256+
"redirect_document_id": false
38257+
},
3817338258
{
3817438259
"source_path": "articles/cognitive-services/video-indexer/connect-to-azure.md",
3817538260
"redirect_url": "/azure/media-services/video-indexer/connect-to-azure",
@@ -46604,6 +46689,31 @@
4660446689
"source_path": "articles/load-balancer/load-balancer-arm.md",
4660546690
"redirect_url": "/azure/load-balancer/load-balancer-overview",
4660646691
"redirect_document_id": true
46692+
},
46693+
{
46694+
"source_path": "articles/healthcare-apis/tutorial-2-setup-environment.md",
46695+
"redirect_url": "/azure/healthcare-apis/tutorial-web-app-fhir-server",
46696+
"redirect_document_id": false
46697+
},
46698+
{
46699+
"source_path": "articles/healthcare-apis/tutorial-3-connect-to-endpoint.md",
46700+
"redirect_url": "/azure/healthcare-apis/tutorial-web-app-fhir-server",
46701+
"redirect_document_id": false
46702+
},
46703+
{
46704+
"source_path": "articles/healthcare-apis/tutorial-1-decision-flow.md",
46705+
"redirect_url": "/azure/healthcare-apis/fhir-app-registration",
46706+
"redirect_document_id": false
46707+
},
46708+
{
46709+
"source_path": "articles/healthcare-apis/overview-open-source-server.md",
46710+
"redirect_url": "/azure/healthcare-apis/overview",
46711+
"redirect_document_id": false
46712+
},
46713+
{
46714+
"source_path": "articles/mysql/concepts-aad-authentication.md",
46715+
"redirect_url": "/azure/mysql/concepts-azure-ad-authentication",
46716+
"redirect_document_id": false
4660746717
}
4660846718
]
4660946719
}

articles/active-directory-b2c/active-directory-b2c-reference-audit-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Write-Output "Searching for events starting $7daysago"
161161
$body = @{grant_type="client_credentials";resource=$resource;client_id=$ClientID;client_secret=$ClientSecret}
162162
$oauth = Invoke-RestMethod -Method Post -Uri $loginURL/$tenantdomain/oauth2/token?api-version=1.0 -Body $body
163163
164-
# Parse audit report items, save output to file(s): auditX.json, where X = 0 thru n for number of nextLink pages
164+
# Parse audit report items, save output to file(s): auditX.json, where X = 0 through n for number of nextLink pages
165165
if ($oauth.access_token -ne $null) {
166166
$i=0
167167
$headerParams = @{'Authorization'="$($oauth.token_type) $($oauth.access_token)"}

articles/active-directory-b2c/active-directory-b2c-reference-oauth-code.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ Now that you've acquired an authorization code, you can redeem the `code` for a
9898
You can also request an access token for your app's own back-end Web API by convention of using the app's client ID as the requested scope (which will result in an access token with that client ID as the "audience"):
9999

100100
```HTTP
101-
POST {tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
102-
Host: {tenant}.b2clogin.com
101+
POST https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
102+
103103
Content-Type: application/x-www-form-urlencoded
104104
105105
grant_type=authorization_code&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&code=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob
@@ -165,8 +165,8 @@ Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZn
165165
Access tokens and ID tokens are short-lived. After they expire, you must refresh them to continue to access resources. To do this, submit another POST request to the `/token` endpoint. This time, provide the `refresh_token` instead of the `code`:
166166

167167
```HTTP
168-
POST {tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
169-
Host: {tenant}.b2clogin.com
168+
POST https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/token HTTP/1.1
169+
170170
Content-Type: application/x-www-form-urlencoded
171171
172172
grant_type=refresh_token&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access&refresh_token=AwABAAAAvPM1KaPlrEqdFSBzjqfTGBCmLdgfSTLEMPGYuNHSUYBrq...&redirect_uri=urn:ietf:wg:oauth:2.0:oob

articles/active-directory-b2c/active-directory-b2c-reference-oidc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ When you want to sign the user out of the application, it isn't enough to clear
263263
To sign out the user, redirect the user to the `end_session` endpoint that is listed in the OpenID Connect metadata document described earlier:
264264

265265
```HTTP
266-
GET https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/logout?post_logout_redirect_uri=https%3A%2F%2Faadb2cplayground.azurewebsites.net%2F
266+
GET https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/logout?post_logout_redirect_uri=https%3A%2F%2Fjwt.ms%2F
267267
```
268268

269269
| Parameter | Required | Description |

articles/active-directory-b2c/claimsschema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ The **Paragraph** user input type is used to provide a field that shows text onl
364364
<UserHelpText>A claim responsible for holding response messages to send to the relying party</UserHelpText>
365365
<UserInputType>Paragraph</UserInputType>
366366
<Restriction>
367-
<Enumeration Text="B2C_V1_90001" Value="You cant sign in because you are a minor" />
367+
<Enumeration Text="B2C_V1_90001" Value="You cannot sign in because you are a minor" />
368368
<Enumeration Text="B2C_V1_90002" Value="This action can only be performed by gold members" />
369369
<Enumeration Text="B2C_V1_90003" Value="You have not been enabled for this operation" />
370370
</Restriction>
Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Cookie definitions - Azure Active Directory B2C | Microsoft Docs
2+
title: Cookie definitions
3+
titleSuffix: Azure AD B2C
34
description: Provides definitions for the cookies used in Azure Active Directory B2C.
45
services: active-directory-b2c
56
author: mmacy
@@ -8,24 +9,38 @@ manager: celestedg
89
ms.service: active-directory
910
ms.workload: identity
1011
ms.topic: conceptual
11-
ms.date: 03/18/2019
12+
ms.date: 01/23/2020
1213
ms.author: marsma
1314
ms.subservice: B2C
1415
---
1516

16-
# Cookies definitions for Azure Active Directory B2C
17+
# Cookies definitions for Azure AD B2C
1718

18-
The following table lists the cookies used in Azure Active Directory B2C.
19+
The following sections provide information about the cookies used in Azure Active Directory B2C (Azure AD B2C).
20+
21+
## SameSite
22+
23+
The Microsoft Azure AD B2C service is compatible with SameSite browser configurations, including support for `SameSite=None` with the `Secure` attribute.
24+
25+
To safeguard access to sites, web browsers will introduce a new secure-by-default model that assumes all cookies should be protected from external access unless otherwise specified. The Chrome browser is the first to implement this change, starting with [Chrome 80 in February 2020](https://www.chromium.org/updates/same-site). For more information about preparing for the change in Chrome, see [Developers: Get Ready for New SameSite=None; Secure Cookie Settings](https://blog.chromium.org/2019/10/developers-get-ready-for-new.html) on the Chromium Blog.
26+
27+
Developers must use the new cookie setting, `SameSite=None`, to designate cookies for cross-site access. When the `SameSite=None` attribute is present, an additional `Secure` attribute must be used so cross-site cookies can only be accessed over HTTPS connections. Validate and test all your applications, including those applications that use Azure AD B2C.
28+
29+
For more information, see [Effect on customer websites and Microsoft services and products in Chrome version 80 or later](https://support.microsoft.com/help/4522904/potential-disruption-to-customer-websites-in-latest-chrome).
30+
31+
## Cookies
32+
33+
The following table lists the cookies used in Azure AD B2C.
1934

2035
| Name | Domain | Expiration | Purpose |
2136
| ----------- | ------ | -------------------------- | --------- |
22-
| x-ms-cpim-admin | main.b2cadmin.ext.azure.com | End of [browser session](session-behavior.md) | Holds user membership data across tenants. The tenants a user is a member of and level of membership (Admin or User). |
23-
| x-ms-cpim-slice | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used to route requests to the appropriate production instance. |
24-
| x-ms-cpim-trans | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for tracking the transactions (number of authentication requests to Azure AD B2C) and the current transaction. |
25-
| x-ms-cpim-sso:{Id} | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for maintaining the SSO session. |
26-
| x-ms-cpim-cache:{id}_n | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md), successful authentication | Used for maintaining the request state. |
27-
| x-ms-cpim-csrf | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Cross-Site Request Forgery token used for CRSF protection. |
28-
| x-ms-cpim-dc | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for Azure AD B2C network routing. |
29-
| x-ms-cpim-ctx | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Context |
30-
| x-ms-cpim-rp | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for storing membership data for the resource provider tenant. |
31-
| x-ms-cpim-rc | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for storing the relay cookie. |
37+
| `x-ms-cpim-admin` | main.b2cadmin.ext.azure.com | End of [browser session](session-behavior.md) | Holds user membership data across tenants. The tenants a user is a member of and level of membership (Admin or User). |
38+
| `x-ms-cpim-slice` | b2clogin.com, login.microsoftonline.com, branded domain | End of [browser session](session-behavior.md) | Used to route requests to the appropriate production instance. |
39+
| `x-ms-cpim-trans` | b2clogin.com, login.microsoftonline.com, branded domain | End of [browser session](session-behavior.md) | Used for tracking the transactions (number of authentication requests to Azure AD B2C) and the current transaction. |
40+
| `x-ms-cpim-sso:{Id}` | b2clogin.com, login.microsoftonline.com, branded domain | End of [browser session](session-behavior.md) | Used for maintaining the SSO session. |
41+
| `x-ms-cpim-cache:{id}_n` | b2clogin.com, login.microsoftonline.com, branded domain | End of [browser session](session-behavior.md), successful authentication | Used for maintaining the request state. |
42+
| `x-ms-cpim-csrf` | b2clogin.com, login.microsoftonline.com, branded domain | End of [browser session](session-behavior.md) | Cross-Site Request Forgery token used for CRSF protection. |
43+
| `x-ms-cpim-dc` | b2clogin.com, login.microsoftonline.com, branded domain | End of [browser session](session-behavior.md) | Used for Azure AD B2C network routing. |
44+
| `x-ms-cpim-ctx` | b2clogin.com, login.microsoftonline.com, branded domain | End of [browser session](session-behavior.md) | Context |
45+
| `x-ms-cpim-rp` | b2clogin.com, login.microsoftonline.com, branded domain | End of [browser session](session-behavior.md) | Used for storing membership data for the resource provider tenant. |
46+
| `x-ms-cpim-rc` | b2clogin.com, login.microsoftonline.com, branded domain | End of [browser session](session-behavior.md) | Used for storing the relay cookie. |

articles/active-directory-b2c/string-transformations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ The following example looks up the error message description based on the error
375375
<DataType>string</DataType>
376376
<UserInputType>Paragraph</UserInputType>
377377
<Restriction>
378-
<Enumeration Text="B2C_V1_90001" Value="You cant sign in because you are a minor" />
378+
<Enumeration Text="B2C_V1_90001" Value="You cannot sign in because you are a minor" />
379379
<Enumeration Text="B2C_V1_90002" Value="This action can only be performed by gold members" />
380380
<Enumeration Text="B2C_V1_90003" Value="You have not been enabled for this operation" />
381381
</Restriction>
@@ -399,7 +399,7 @@ The claims transformation looks up the text of the item and returns its value. I
399399
- Input claims:
400400
- **mapFromClaim**: B2C_V1_90001
401401
- Output claims:
402-
- **restrictionValueClaim**: You cant sign in because you are a minor.
402+
- **restrictionValueClaim**: You cannot sign in because you are a minor.
403403

404404
## LookupValue
405405

0 commit comments

Comments
 (0)