Skip to content

Commit 3d0378b

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into aks-nodepool-resize-workaround
2 parents c30a271 + 2d84066 commit 3d0378b

File tree

1,735 files changed

+26645
-11896
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,735 files changed

+26645
-11896
lines changed

.openpublishing.publish.config.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
"branch": "master",
7676
"branch_mapping": {}
7777
},
78+
{
79+
"path_to_root": "azure_storage-snippets",
80+
"url": "https://github.com/Azure-Samples/AzureStorageSnippets",
81+
"branch": "master",
82+
"branch_mapping": {}
83+
},
7884
{
7985
"path_to_root": "azure_cli_scripts",
8086
"url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -884,6 +890,8 @@
884890
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
885891
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
886892
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
887-
"articles/mysql/.openpublishing.redirection.mysql.json"
893+
"articles/mysql/.openpublishing.redirection.mysql.json",
894+
"articles/container-apps/.openpublishing.redirection.container-apps.json",
895+
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
888896
]
889897
}

.openpublishing.redirection.json

Lines changed: 11 additions & 351 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,29 @@
22

33
Thank you for taking the time to contribute to the Microsoft Azure documentation.
44

5-
This guide covers some general topics related to contribution and refers to the [contributors guide](/contribute) for more detailed explanations when required.
5+
This guide covers some general topics related to contribution and refers to the [contributor guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
66

77
## Code of Conduct
88

99
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
10-
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/), or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
10+
11+
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
1112

1213
## How can I contribute?
1314

14-
There are many ways to contribute to the documentation, review the sections below to find out which one is right for you.
15+
There are many ways to contribute to the documentation. Review the following sections to find out which one is right for you.
1516

16-
### Reporting Bugs and Suggesting Enhancements
17+
### Reporting bugs and suggesting enhancements
1718

1819
Please use the Feedback tool at the bottom of any article to submit bugs and suggestions.
1920

2021
![Feedback Tool](media/feedback-tool.png)
2122

2223
### Editing in GitHub
2324

24-
Follow the guidance for [Quick edits to existing documents](/contribute/#quick-edits-to-existing-documents) in our contributors guide.
25+
Follow the guidance for [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributor guide.
26+
27+
### Pull requests
2528

26-
### Pull Request
29+
Review the guidance for [pull requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) and the contribution workflow in our contributor guide.
2730

28-
Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.

articles/active-directory-b2c/azure-monitor.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.topic: how-to
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
14-
ms.date: 02/09/2022
14+
ms.date: 02/23/2022
1515
---
1616

1717
# Monitor Azure AD B2C with Azure Monitor
@@ -147,7 +147,9 @@ After you've deployed the template and waited a few minutes for the resource pro
147147
1. Sign in to the [Azure portal](https://portal.azure.com) with your **Azure AD B2C** administrative account. This account must be a member of the security group you specified in the [Delegate resource management](#3-delegate-resource-management) step.
148148
1. Select the **Directories + subscriptions** icon in the portal toolbar.
149149
1. On the **Portal settings | Directories + subscriptions** page, in the **Directory name** list, find your Azure AD directory that contains the Azure subscription and the _azure-ad-b2c-monitor_ resource group you created, and then select **Switch**.
150-
1. Verify that you've selected the correct directory and subscription.
150+
1. Verify that you've selected the correct directory and your Azure subscription is listed and selected in the **Default subscription filter**.
151+
152+
![Screenshot of the default subscription filter](./media/azure-monitor/default-subscription-filter.png)
151153

152154
## 5. Configure diagnostic settings
153155

@@ -178,6 +180,10 @@ To configure monitoring settings for Azure AD B2C activity logs:
178180
1. Check the box for each destination to send the logs. Select **Configure** to specify their settings **as described in the following table**.
179181
1. Select **Send to Log Analytics**, and then select the **Name of workspace** you created earlier (`AzureAdB2C`).
180182
1. Select **AuditLogs** and **SignInLogs**.
183+
184+
> [!NOTE]
185+
> Only the **AuditLogs** and **SignInLogs** diagnostic settings are currently supported for Azure AD B2C tenants.
186+
181187
1. Select **Save**.
182188

183189
> [!NOTE]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ Open your web app in a code editor such as Visual Studio Code. Under the `call-p
151151
|---------|---------|
152152
|`APP_CLIENT_ID`|The **Application (client) ID** for the web app you registered in [step 2.3](#step-23-register-the-web-app). |
153153
|`APP_CLIENT_SECRET`|The client secret for the web app you created in [step 2.4](#step-24-create-a-client-secret) |
154-
|`SIGN_UP_SIGN_IN_POLICY_AUTHORITY`|The **Sign in and sign up** user flow authority for the user flow you created in [step 1](#step-1-configure-your-user-flow) such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>`. 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_node_app`. Learn how to [Get your tenant name](tenant-management.md#get-your-tenant-name). |
154+
|`SIGN_UP_SIGN_IN_POLICY_AUTHORITY`|The **Sign in and sign up** user flow authority for the user flow you created in [step 1](#step-1-configure-your-user-flow) such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>`. 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`. Learn how to [Get your tenant name](tenant-management.md#get-your-tenant-name). |
155155
|`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.|
156156
|`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. This URL need to be publicly accessible. Leave the value as is.|
157-
|`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_node_app`.|
157+
|`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`.|
158158

159159
After the update, your final configuration file should look similar to the following sample:
160160

@@ -186,7 +186,7 @@ To get the web API sample code, do one of the following:
186186
187187
- For `clientID`, use the **Application (Client) ID** for the web API you created in [step 2.1](#step-21-register-the-web-api-application).
188188
189-
- For `policyName`, use the name of the **Sing in and sign up** user flow you created in [step 1](#step-1-configure-your-user-flow) such as `B2C_1_susi_node_app`.
189+
- For `policyName`, use the name of the **Sing in and sign up** user flow you created in [step 1](#step-1-configure-your-user-flow) such as `B2C_1_susi`.
190190
191191
After the update, your code should look similar to the following sample:
192192

articles/active-directory-b2c/identity-provider-azure-ad-multi-tenant.md

Lines changed: 2 additions & 2 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: 10/21/2021
12+
ms.date: 02/25/2022
1313
ms.custom: project-no-code
1414
ms.author: kengaderdus
1515
ms.subservice: B2C
@@ -167,7 +167,7 @@ To obtain the values, look at the OpenID Connect discovery metadata for each of
167167
168168
Perform these steps for each Azure AD tenant that should be used to sign in:
169169
170-
1. Open your browser and go to the OpenID Connect metadata URL for the tenant. Find the **issuer** object and record its value. It should look similar to `https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/.well-known/openid-configuration`.
170+
1. Open your browser and go to the OpenID Connect metadata URL for the tenant. Find the `issuer` object and record its value. It should look similar to `https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0`.
171171
1. Copy and paste the value into the **ValidTokenIssuerPrefixes** key. Separate multiple issuers with a comma. An example with two issuers appears in the previous `ClaimsProvider` XML sample.
172172
173173
[!INCLUDE [active-directory-b2c-add-identity-provider-to-user-journey](../../includes/active-directory-b2c-add-identity-provider-to-user-journey.md)]
35.5 KB
Loading

articles/active-directory-b2c/oauth2-error-technical-profile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 01/25/2022
12+
ms.date: 02/25/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
1616

1717
# Define an OAuth2 custom error technical profile in an Azure Active Directory B2C custom policy
1818

19-
This article describes how to handle an OAuth2 custom error with Azure Active Directory B2C (Azure AD B2C). Use this technical profile if something logic goes wrong within your policy. The technical profile returns error to your OAuth2 or OpenId Connect relying party application.
19+
This article describes how to handle an OAuth2 custom error with Azure Active Directory B2C (Azure AD B2C). Use this technical profile if something logic goes wrong within your policy. The technical profile returns error to your OAuth2 or OpenId Connect relying party application. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/technical-profiles/oauth2-error) of the OAuth2 custom error technical profile.
2020

2121
To handle custom OAuth2 error message:
2222

@@ -89,7 +89,7 @@ The CryptographicKeys element contains the following key:
8989

9090
## Invoke the technical profile
9191

92-
You can call the OAuth2 error technical profile from a user journey, or sub journey. Set the [orchestration step](userjourneys.md#orchestrationsteps) type to `SendClaims` with a reference to your OAuth2 error technical profile.
92+
You can call the OAuth2 error technical profile from a [user journey](userjourneys.md), or [sub journey](subjourneys.md) (type of `transfer`). Set the [orchestration step](userjourneys.md#orchestrationsteps) type to `SendClaims` with a reference to your OAuth2 error technical profile.
9393

9494
If your user journey or sub journey already has another `SendClaims` orchestration step, set the `DefaultCpimIssuerTechnicalProfileReferenceId` attribute to the token issuer technical profile.
9595

articles/active-directory-b2c/partner-experian.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The Experian integration includes the following components:
4747

4848
- Experian – The Experian service takes inputs provided by the user and verifies the user's identity
4949

50-
- Custom Rest API – This API implements the integration between Azure AD B2C and the Experian service.
50+
- Custom REST API – This API implements the integration between Azure AD B2C and the Experian service.
5151

5252
The following architecture diagram shows the implementation.
5353

@@ -87,7 +87,7 @@ The Experian API call is protected by a client certificate. This client certific
8787

8888
### Part 3 - Configure the API
8989

90-
Application settings can be [configured in the App service in Azure](../app-service/configure-common.md#configure-app-settings). With this method, settings can be securely configured without checking them into a repository. You'll need to provide the following settings to the Rest API:
90+
Application settings can be [configured in the App service in Azure](../app-service/configure-common.md#configure-app-settings). With this method, settings can be securely configured without checking them into a repository. You'll need to provide the following settings to the REST API:
9191

9292
| Application settings | Source | Notes |
9393
| :-------- | :------------| :-----------|

articles/active-directory-b2c/partner-hypr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ To get started, you'll need:
2727

2828
- A HYPR cloud tenant, get a free [trial account](https://get.hypr.com/free-trial).
2929

30-
- A user's mobile device registered using the HYPR Rest APIs or the HYPR Device Manager in your HYPR tenant. For example, you can use the [HYPR Java SDK](https://docs.hypr.com/integratinghypr/docs/hypr-java-web-sdk) to accomplish this task.
30+
- A user's mobile device registered using the HYPR REST APIs or the HYPR Device Manager in your HYPR tenant. For example, you can use the [HYPR Java SDK](https://docs.hypr.com/integratinghypr/docs/hypr-java-web-sdk) to accomplish this task.
3131

3232
## Scenario description
3333

@@ -39,7 +39,7 @@ The HYRP integration includes the following components:
3939

4040
- The HYPR mobile app - The HYPR mobile app can be used to execute this sample if prefer not to use the mobile SDKs in your own mobile applications.
4141

42-
- HYPR Rest APIs - You can use the HYPR APIs to do both user device registration and authentication. These APIs can be found [here](https://apidocs.hypr.com).
42+
- HYPR REST APIs - You can use the HYPR APIs to do both user device registration and authentication. These APIs can be found [here](https://apidocs.hypr.com).
4343

4444
The following architecture diagram shows the implementation.
4545

0 commit comments

Comments
 (0)