Skip to content

Commit 298c95e

Browse files
authored
Merge branch 'master' into patch-11
2 parents e314e72 + c97abbb commit 298c95e

File tree

1,017 files changed

+15236
-10549
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,017 files changed

+15236
-10549
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: 154 additions & 4 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
{
@@ -14710,7 +14775,7 @@
1471014775
{
1471114776
"source_path": "articles/machine-learning/studio/algorithm-choice.md",
1471214777
"redirect_url": "/azure/machine-learning/how-to-select-algorithms",
14713-
"redirect_document_id": false
14778+
"redirect_document_id": true
1471414779
},
1471514780
{
1471614781
"source_path": "articles/machine-learning/machine-learning-algorithm-parameters-optimize.md",
@@ -28431,6 +28496,11 @@
2843128496
"redirect_url": "/azure/hdinsight/domain-joined/apache-domain-joined-configure-using-azure-adds",
2843228497
"redirect_document_id": false
2843328498
},
28499+
{
28500+
"source_path": "articles/hdinsight/domain-joined/domain-joined-zeppelin-signin.md",
28501+
"redirect_url": "/azure/hdinsight/domain-joined/hdinsight-security-overview",
28502+
"redirect_document_id": false
28503+
},
2843428504
{
2843528505
"source_path": "articles/hdinsight/hdinsight-domain-joined-introduction.md",
2843628506
"redirect_url": "/azure/hdinsight/domain-joined/apache-domain-joined-introduction",
@@ -31018,7 +31088,7 @@
3101831088
},
3101931089
{
3102031090
"source_path": "articles/operations-management-suite/operations-management-suite-service-map-configure.md",
31021-
"redirect_url": "/azure/monitoring/monitoring-service-map-configure",
31091+
"redirect_url": "/azure/azure-monitor/insights/service-map#enable-service-map",
3102231092
"redirect_document_id": false
3102331093
},
3102431094
{
@@ -33793,7 +33863,17 @@
3379333863
},
3379433864
{
3379533865
"source_path": "articles/cognitive-services/entitylinking/index.md",
33796-
"redirect_url": "/azure/cognitive-services/entitylinking/home",
33866+
"redirect_url": "/azure/cognitive-services/text-analytics",
33867+
"redirect_document_id": false
33868+
},
33869+
{
33870+
"source_path": "articles/cognitive-services/entitylinking/GettingStarted.md",
33871+
"redirect_url": "/azure/cognitive-services/text-analytics",
33872+
"redirect_document_id": false
33873+
},
33874+
{
33875+
"source_path": "articles/cognitive-services/entitylinking/Home.md",
33876+
"redirect_url": "/azure/cognitive-services/text-analytics",
3379733877
"redirect_document_id": false
3379833878
},
3379933879
{
@@ -33806,6 +33886,41 @@
3380633886
"redirect_url": "/azure/cognitive-services/LinguisticAnalysisAPI/Home",
3380733887
"redirect_document_id": false
3380833888
},
33889+
{
33890+
"source_path": "articles/cognitive-services/LinguisticAnalysisAPI/AnalyzeMethod.md",
33891+
"redirect_url": "/azure/machine-learning/studio-module-reference/text-analytics",
33892+
"redirect_document_id": false
33893+
},
33894+
{
33895+
"source_path": "articles/cognitive-services/LinguisticAnalysisAPI/Analyzer-Names.md",
33896+
"redirect_url": "/azure/machine-learning/studio-module-reference/text-analytics",
33897+
"redirect_document_id": false
33898+
},
33899+
{
33900+
"source_path": "articles/cognitive-services/LinguisticAnalysisAPI/AnalyzersMethod.md",
33901+
"redirect_url": "/azure/machine-learning/studio-module-reference/text-analytics",
33902+
"redirect_document_id": false
33903+
},
33904+
{
33905+
"source_path": "articles/cognitive-services/LinguisticAnalysisAPI/Constituency-Parsing.md",
33906+
"redirect_url": "/azure/machine-learning/studio-module-reference/text-analytics",
33907+
"redirect_document_id": false
33908+
},
33909+
{
33910+
"source_path": "articles/cognitive-services/LinguisticAnalysisAPI/Home.md",
33911+
"redirect_url": "/azure/machine-learning/studio-module-reference/text-analytics",
33912+
"redirect_document_id": false
33913+
},
33914+
{
33915+
"source_path": "articles/cognitive-services/LinguisticAnalysisAPI/POS-tagging.md",
33916+
"redirect_url": "/azure/machine-learning/studio-module-reference/text-analytics",
33917+
"redirect_document_id": false
33918+
},
33919+
{
33920+
"source_path": "articles/cognitive-services/LinguisticAnalysisAPI/Sentences-and-Tokens.md",
33921+
"redirect_url": "/azure/machine-learning/studio-module-reference/text-analytics",
33922+
"redirect_document_id": false
33923+
},
3380933924
{
3381033925
"source_path": "articles/cognitive-services/Recommendations/index.md",
3381133926
"redirect_url": "/azure/cognitive-services/Recommendations/overview",
@@ -33821,6 +33936,11 @@
3382133936
"redirect_url": "/azure/cognitive-services/Web-Language-Model/Home",
3382233937
"redirect_document_id": false
3382333938
},
33939+
{
33940+
"source_path": "articles/cognitive-services/Web-Language-Model/Home.md",
33941+
"redirect_url": "/azure/machine-learning/studio-module-reference/text-analytics",
33942+
"redirect_document_id": false
33943+
},
3382433944
{
3382533945
"source_path": "articles/data-factory/v1/index.md",
3382633946
"redirect_url": "/azure/data-factory/v1/data-factory-introduction",
@@ -38185,6 +38305,11 @@
3818538305
"redirect_url": "/azure/azure-monitor/insights/service-map-scom",
3818638306
"redirect_document_id": false
3818738307
},
38308+
{
38309+
"source_path": "articles/monitoring/monitoring-service-map-configure.md",
38310+
"redirect_url": "/azure/azure-monitor/insights/service-map#enable-service-map",
38311+
"redirect_document_id": false
38312+
},
3818838313
{
3818938314
"source_path": "articles/cognitive-services/video-indexer/connect-to-azure.md",
3819038315
"redirect_url": "/azure/media-services/video-indexer/connect-to-azure",
@@ -45100,6 +45225,16 @@
4510045225
"redirect_url": "/azure/storage/common/storage-security-guide",
4510145226
"redirect_document_id": false
4510245227
},
45228+
{
45229+
"source_path": "articles/storage/blobs/data-lake-storage-quickstart-create-account.md",
45230+
"redirect_url": "/azure/storage/common/storage-account-create",
45231+
"redirect_document_id": false
45232+
},
45233+
{
45234+
"source_path": "articles/storage/blobs/data-lake-storage-how-to-set-permissions-storage-explorer.md",
45235+
"redirect_url": "/azure/storage/blobs/data-lake-storage-explorer",
45236+
"redirect_document_id": false
45237+
},
4510345238
{
4510445239
"source_path": "articles/security/fundamentals/global-admin.md",
4510545240
"redirect_url": "/azure/active-directory/authentication/multi-factor-authentication",
@@ -46629,6 +46764,21 @@
4662946764
"source_path": "articles/healthcare-apis/tutorial-3-connect-to-endpoint.md",
4663046765
"redirect_url": "/azure/healthcare-apis/tutorial-web-app-fhir-server",
4663146766
"redirect_document_id": false
46767+
},
46768+
{
46769+
"source_path": "articles/healthcare-apis/tutorial-1-decision-flow.md",
46770+
"redirect_url": "/azure/healthcare-apis/fhir-app-registration",
46771+
"redirect_document_id": false
46772+
},
46773+
{
46774+
"source_path": "articles/healthcare-apis/overview-open-source-server.md",
46775+
"redirect_url": "/azure/healthcare-apis/overview",
46776+
"redirect_document_id": false
46777+
},
46778+
{
46779+
"source_path": "articles/mysql/concepts-aad-authentication.md",
46780+
"redirect_url": "/azure/mysql/concepts-azure-ad-authentication",
46781+
"redirect_document_id": false
4663246782
}
4663346783
]
4663446784
}

articles/active-directory-b2c/active-directory-b2c-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ In an Azure AD tenant, users that belong to the tenant sign-in with an email add
3535

3636
In an Azure AD B2C tenant, most apps want the user to sign-in with any arbitrary email address (for example, [email protected], [email protected], [email protected], or [email protected]). This type of account is a local account. We also support arbitrary user names as local accounts (for example, joe, bob, sarah, or jim). You can choose one of these two local account types when configuring identity providers for Azure AD B2C in the Azure portal. In your Azure AD B2C tenant, select **Identity providers**, select **Local account**, and then select **Username**.
3737

38-
User accounts for applications must always be created through a sign-up user flow, sign-up or sign-in user flow, or by using the Azure AD Graph API. User accounts created in the Azure portal are only used for administering the tenant.
38+
User accounts for applications can be created through a sign-up user flow, sign-up or sign-in user flow, the Microsoft Graph API, or in the Azure portal.
3939

4040
### Which social identity providers do you support now? Which ones do you plan to support in the future?
4141

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-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. |

0 commit comments

Comments
 (0)