Skip to content

Commit 8e37668

Browse files
timwarner-msfttimwarner-msft
authored
Merge branch 'main' into timwarner-bin0706
2 parents 1fbd737 + 6707ef3 commit 8e37668

File tree

396 files changed

+7330
-1714
lines changed

Some content is hidden

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

396 files changed

+7330
-1714
lines changed

‎.openpublishing.publish.config.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,12 @@
932932
"branch": "v3",
933933
"branch_mapping": {}
934934
},
935+
{
936+
"path_to_root": "azure-cosmos-db-table-dotnet-v12",
937+
"url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",
938+
"branch": "v12",
939+
"branch_mapping": {}
940+
},
935941
{
936942
"path_to_root": "azure-cosmos-mongodb-dotnet",
937943
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
@@ -956,6 +962,7 @@
956962
".openpublishing.redirection.json",
957963
".openpublishing.redirection.azure-arc-data.json",
958964
".openpublishing.redirection.active-directory.json",
965+
".openpublishing.redirection.azure-attestation.json",
959966
".openpublishing.redirection.azure-blob.json",
960967
"articles/data-factory/.openpublishing.redirection.data-factory.json",
961968
".openpublishing.redirection.defender-for-cloud.json",

‎.openpublishing.redirection.azure-attestation.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/attestation/audit-logs.md",
5+
"redirect_url": "/azure/attestation/view-logs",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,11 @@
321321
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
322322
"redirect_document_id": false
323323
},
324+
{
325+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-action-rules.md" ,
326+
"redirect_url": "/azure/azure-monitor/alerts/alerts-processing-rules",
327+
"redirect_document_id": false
328+
},
324329
{
325330
"source_path_from_root": "/articles/azure-monitor/insights/data-explorer.md" ,
326331
"redirect_url": "/azure/data-explorer/data-explorer-insights",

‎.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/virtual-machines/linux/find-unattached-nics.md",
5+
"redirect_url": "/previous-versions/azure/virtual-machines/linux/find-unattached-nics",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/germany/germany-developer-guide.md",
510
"redirect_url": "/previous-versions/azure/germany/germany-developer-guide",
@@ -40232,6 +40237,16 @@
4023240237
"source_path_from_root": "/articles/azure-monitor/insights/sql-insights-troubleshoot.md",
4023340238
"redirect_url": "/azure/azure-sql/database/sql-insights-troubleshoot",
4023440239
"redirect_document_id": false
40240+
},
40241+
{
40242+
"source_path_from_root": "/articles/virtual-machines/windows/connect-logon.md",
40243+
"redirect_url": "/articles/virtual-machines/windows/connect-rdp",
40244+
"redirect_document_id": false
40245+
},
40246+
{
40247+
"source_path_from_root": "/articles/virtual-machines/windows/winrm.md",
40248+
"redirect_url": "/articles/virtual-machines/windows/connect-winrm",
40249+
"redirect_document_id": false
4023540250
}
4023640251
]
4023740252
}

‎articles/active-directory-b2c/TOC.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,14 @@
168168
href: enable-authentication-angular-spa-app.md
169169
- name: Authentication options
170170
href: enable-authentication-angular-spa-app-options.md
171+
- name: React single-page application
172+
items:
173+
- name: Configure a sample React app
174+
href: configure-authentication-sample-react-spa-app.md
175+
- name: Enable authentication in your React app
176+
href: enable-authentication-react-spa-app.md
177+
- name: Authentication options
178+
href: enable-authentication-react-spa-app-options.md
171179
- name: Android mobile app
172180
items:
173181
- name: Configure a sample Android app

‎articles/active-directory-b2c/configure-a-sample-node-web-app.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 06/08/2022
11+
ms.date: 07/07/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
---
@@ -32,19 +32,13 @@ In this article, you’ll do the following tasks:
3232

3333
## Step 1: Configure your user flows
3434

35-
[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)] Repeat the steps to create three separate user flows as follows:
36-
37-
- A combined **Sign in and sign up** user flow, such as `susi`. This user flow also supports the **Forgot your password** experience.
38-
- A **Profile editing** user flow, such as `edit_profile`.
39-
- A **Password reset** user flow, such as `reset_password`.
40-
41-
Azure AD B2C prepends `B2C_1_` to the user flow name. For example, `susi` becomes `B2C_1_susi`.
35+
[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)]
4236

4337
## Step 2: Register a web application
4438

4539
To enable your application sign in with Azure AD B2C, register your app in the Azure AD B2C directory. The app registration establishes a trust relationship between the app and Azure AD B2C.
4640

47-
During app registration, you'll specify the *Redirect URI*. The redirect URI is the endpoint to which the user is redirected by Azure AD B2C after they authenticate with Azure AD B2C. The app registration process generates an *Application ID*, also known as the *client ID*, that uniquely identifies your app. After your app is registered, Azure AD B2C uses both the application ID and the redirect URI to create authentication requests.
41+
During app registration, you'll specify the *Redirect URI*. The redirect URI is the endpoint to which the user is redirected by Azure AD B2C after they authenticate with Azure AD B2C. The app registration process generates an *Application ID*, also known as the *client ID*, that uniquely identifies your app. After your app is registered, Azure AD B2C uses both the application ID, and the redirect URI to create authentication requests.
4842

4943
### Step 2.1: Register the app
5044

@@ -119,7 +113,7 @@ Open your web app in a code editor such as Visual Studio Code. Under the project
119113
|`EDIT_PROFILE_POLICY_AUTHORITY`|The **Profile editing** user flow authority such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<profile-edit-user-flow-name>`. Replace `<your-tenant-name>` with the name of your tenant and `<reset-password-user-flow-name>` with the name of your reset password user flow such as `B2C_1_edit_profile_node_app`. |
120114
|`AUTHORITY_DOMAIN`| The Azure AD B2C authority domain such as `https://<your-tenant-name>.b2clogin.com`. Replace `<your-tenant-name>` with the name of your tenant.|
121115
|`APP_REDIRECT_URI`| The application redirect URI where Azure AD B2C will return authentication responses (tokens). It matches the **Redirect URI** you set while registering your app in Azure portal, and it must be publicly accessible. Leave the value as is.|
122-
|`LOGOUT_ENDPOINT`| The Azure AD B2C sign out endpoint such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>/oauth2/v2.0/logout?post_logout_redirect_uri=http://localhost:3000`. Replace `<your-tenant-name>` with the name of your tenant and `<sign-in-sign-up-user-flow-name>` with the name of your Sign in and Sign up user flow such as `B2C_1_susi`.|
116+
|`LOGOUT_ENDPOINT`| The Azure AD B2C sign-out endpoint such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>/oauth2/v2.0/logout?post_logout_redirect_uri=http://localhost:3000`. Replace `<your-tenant-name>` with the name of your tenant and `<sign-in-sign-up-user-flow-name>` with the name of your Sign in and Sign up user flow such as `B2C_1_susi`.|
123117

124118
Your final configuration file should look like the following sample:
125119

‎articles/active-directory-b2c/configure-authentication-in-sample-node-web-app-with-api.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 06/08/2022
12+
ms.date: 07/07/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
@@ -65,13 +65,7 @@ The application registrations and the application architecture are described in
6565

6666
## Step 1: Configure your user flow
6767

68-
[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)] Repeat the steps to create three separate user flows as follows:
69-
70-
- A combined **Sign in and sign up** user flow, such as `susi`. This user flow also supports the **Forgot your password** experience.
71-
- A **Profile editing** user flow, such as `edit_profile`.
72-
- A **Password reset** user flow, such as `reset_password`.
73-
74-
Azure AD B2C prepends `B2C_1_` to the user flow name. For example, `susi` becomes `B2C_1_susi`.
68+
[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)]
7569

7670
## Step 2: Register your web app and API
7771

0 commit comments

Comments
 (0)