Skip to content

Commit 99d5304

Browse files
authored
update my master (#30)
update my master
2 parents f03d032 + 0064777 commit 99d5304

File tree

21,238 files changed

+117508
-67096
lines changed

Some content is hidden

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

21,238 files changed

+117508
-67096
lines changed

.markdownlint.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"default": true,
3+
"MD001": false,
4+
"MD002": false,
5+
"MD003": false,
6+
"MD004": false,
7+
"MD005": false,
8+
"MD006": false,
9+
"MD007": false,
10+
"MD009": false,
11+
"MD010": false,
12+
"MD012": false,
13+
"MD013": false,
14+
"MD014": false,
15+
"MD018": false,
16+
"MD019": false,
17+
"MD020": false,
18+
"MD021": false,
19+
"MD022": false,
20+
"MD023": false,
21+
"MD024": false,
22+
"MD025": false,
23+
"MD026": false,
24+
"MD027": false,
25+
"MD028": false,
26+
"MD029": false,
27+
"MD030": false,
28+
"MD031": false,
29+
"MD032": false,
30+
"MD033": false,
31+
"MD034": false,
32+
"MD035": false,
33+
"MD036": false,
34+
"MD037": false,
35+
"MD040": false,
36+
"MD041": false,
37+
"MD042": false,
38+
"MD045": false,
39+
"MD046": false,
40+
"MD047": false
41+
}

.openpublishing.publish.config.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
"branch": "master",
4141
"branch_mapping": {}
4242
},
43+
{
44+
"path_to_root": "resourcemanager-templates",
45+
"url": "https://github.com/Azure/azure-docs-json-samples",
46+
"branch": "master",
47+
"branch_mapping": {}
48+
},
4349
{
4450
"path_to_root": "_themes",
4551
"url": "https://github.com/Microsoft/templates.docs.msft",
@@ -156,6 +162,12 @@
156162
"branch": "master",
157163
"branch_mapping": {}
158164
},
165+
{
166+
"path_to_root": "samples-anomaly-detector",
167+
"url": "https://github.com/Azure-Samples/anomalydetector",
168+
"branch": "master",
169+
"branch_mapping": {}
170+
},
159171
{
160172
"path_to_root": "api-management-policy-samples",
161173
"url": "https://github.com/Azure/api-management-policy-snippets",
@@ -376,7 +388,7 @@
376388
"need_generate_pdf_url_template": true,
377389
"targets": {
378390
"Pdf": {
379-
"template_folder": "_themes.pdf"
391+
"template_folder": "_themes.pdf"
380392
}
381393
}
382394
}

.openpublishing.redirection.json

Lines changed: 458 additions & 85 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ Follow the instructions provided in the [Install content authoring tools](https:
2626

2727
## License
2828

29-
Please refer to [LICENSE](.github/LICENSE), [LICENSE-CODE](.github/LICENSE-CODE) and [ThirdPartyNotices](.github/ThirdPartyNotices.md) for all Licensing information.
29+
Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
3030

3131
## Code of Conduct
3232

3333
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
3434
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.
35-

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ A web API can receive tokens from many types of clients, including web applicati
9494
6. The `access_token` and `refresh_token` are returned to the web server.
9595
7. The web API is called with the `access_token` in an authorization header.
9696
8. The web API validates the token.
97-
9. Secure data is returned to the web server.
97+
9. Secure data is returned to the web application.
9898

9999
To learn more about authorization codes, refresh tokens, and the steps for getting tokens, read about the [OAuth 2.0 protocol](active-directory-b2c-reference-oauth-code.md).
100100

articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw-secure-basic.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ After your RESTful service is protected by the client ID (username) and secret,
350350
## (Optional) Download the complete policy files and code
351351

352352
* After you complete the [Get started with custom policies](active-directory-b2c-get-started-custom.md) walkthrough, we recommend that you build your scenario by using your own custom policy files. For your reference, we have provided [Sample policy files](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/aadb2c-ief-rest-api-netfw-secure-basic).
353-
* You can download the complete code from [Sample Visual Studio solution for reference](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/aadb2c-ief-rest-api-netfw/Contoso.AADB2C.API).
353+
* You can download the complete code from [Sample Visual Studio solution for reference](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/aadb2c-ief-rest-api-netfw-secure-basic).
354354
355355
## Next steps
356356

357-
* [Use client certificates to secure your RESTful API](active-directory-b2c-custom-rest-api-netfw-secure-cert.md)
357+
* [Use client certificates to secure your RESTful API](active-directory-b2c-custom-rest-api-netfw-secure-cert.md)

articles/active-directory-b2c/active-directory-b2c-custom-setup-adfs2016-idp.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ By now, you have configured your policy so that Azure AD B2C knows how to commun
9898
2. Enable **Overwrite the policy if it exists**, and then browse to and select the *TrustFrameworkExtensions.xml* file.
9999
3. Click **Upload**.
100100

101+
> [!NOTE]
102+
> The Visual Studio code B2C extension uses "socialIdpUserId." A social policy is also required for ADFS.
103+
>
104+
101105
## Register the claims provider
102106

103107
At this point, the identity provider has been set up, but it’s not available in any of the sign-up or sign-in screens. To make it available, you create a duplicate of an existing template user journey, and then modify it so that it also has the ADFS identity provider.

articles/active-directory-b2c/active-directory-b2c-custom-setup-goog-idp.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This article shows you how to enable sign-in for users from a Google account by
2626

2727
## Register the application
2828

29-
To enable sign-in for users from a Google account, you need to create a Google application project.
29+
To enable sign-in for users from a Google account, you need to create a Google application project.
3030

3131
1. Sign in to the [Google Developers Console](https://console.developers.google.com/) with your account credentials.
3232
2. Enter a **Project Name**, click **Create**, and then make sure you are using the new project.
@@ -46,7 +46,7 @@ You need to store the client secret that you previously recorded in your Azure A
4646
1. Sign in to the [Azure portal](https://portal.azure.com/).
4747
2. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directory and subscription filter** in the top menu and choose the directory that contains your tenant.
4848
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
49-
4. On the Overview page, select **Identity Experience Framework - PREVIEW**.
49+
4. On the Overview page, select **Identity Experience Framework**.
5050
5. Select **Policy Keys** and then select **Add**.
5151
6. For **Options**, choose `Manual`.
5252
7. Enter a **Name** for the policy key. For example, `GoogleSecret`. The prefix `B2C_1A_` is added automatically to the name of your key.
@@ -56,7 +56,7 @@ You need to store the client secret that you previously recorded in your Azure A
5656

5757
## Add a claims provider
5858

59-
If you want users to sign in by using a Google account, you need to define the account as a claims provider that Azure AD B2C can communicate with through an endpoint. The endpoint provides a set of claims that are used by Azure AD B2C to verify that a specific user has authenticated.
59+
If you want users to sign in by using a Google account, you need to define the account as a claims provider that Azure AD B2C can communicate with through an endpoint. The endpoint provides a set of claims that are used by Azure AD B2C to verify that a specific user has authenticated.
6060

6161
You can define a Google account as a claims provider by adding it to the **ClaimsProviders** element in the extension file of your policy.
6262

@@ -148,7 +148,7 @@ Now that you have a button in place, you need to link it to an action. The actio
148148
```XML
149149
<ClaimsExchange Id="GoogleExchange" TechnicalProfileReferenceId="Google-OAuth" />
150150
```
151-
151+
152152
Update the value of **TechnicalProfileReferenceId** to the ID of the technical profile you created earlier. For example, `Google-OAuth`.
153153

154154
3. Save the *TrustFrameworkExtensions.xml* file and upload it again for verification.

0 commit comments

Comments
 (0)