Skip to content

Commit 0bf0f9e

Browse files
committed
Merge branch '1925568-single-script-python' of https://github.com/laujan/azure-docs-pr into 1925568-single-script-python
2 parents dabaaad + 441238b commit 0bf0f9e

File tree

722 files changed

+7584
-3937
lines changed

Some content is hidden

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

722 files changed

+7584
-3937
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25208,6 +25208,11 @@
2520825208
"redirect_url": "/azure/azure-sql/managed-instance/scripts/create-configure-managed-instance-cli",
2520925209
"redirect_document_id": false
2521025210
},
25211+
{
25212+
"source_path_from_root": "/articles/azure-sql/managed-instance/azure-app-sync-network-configuration.md",
25213+
"redirect_url": "/azure/azure-sql/managed-instance/index.yml",
25214+
"redirect_document_id": false
25215+
},
2521125216
{
2521225217
"source_path_from_root": "/articles/sql-database/scripts/sql-database-copy-database-to-new-server-cli.md",
2521325218
"redirect_url": "/azure/azure-sql/database/scripts/copy-database-to-new-server-cli",

articles/active-directory/app-provisioning/skip-out-of-scope-deletions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Copy the updated text from Step 3 into the "Request Body".
7676

7777
Click on “Run Query”.
7878

79-
You should get the output as "Success – Status Code 204".
79+
You should get the output as "Success – Status Code 204". If you receive an error you may need to check that your account has Read/Write permissions for ServicePrincipalEndpoint. You can find this permission by clicking on the *Modify permissions* tab in Graph Explorer.
8080

8181
![PUT response](./media/skip-out-of-scope-deletions/skip-06.png)
8282

articles/active-directory/app-provisioning/use-scim-to-build-users-and-groups-endpoints.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ The default token validation code is configured to use an Azure AD token and req
9999

100100
After you deploy the SCIM endpoint, you can test to ensure that it's compliant with SCIM RFC. This example provides a set of tests in Postman that validate CRUD (create, read, update, and delete) operations on users and groups, filtering, updates to group membership, and disabling users.
101101

102-
The endpoints are in the `{host}/scim/` directory, and you can use standard HTTP requests to interact with them. To modify the `/scim/` route, see *TokenController.cs* in **SCIMReferenceCode** > **Microsoft.SCIM.WebHostSample** > **Controllers**.
102+
The endpoints are in the `{host}/scim/` directory, and you can use standard HTTP requests to interact with them. To modify the `/scim/` route, see *ControllerConstant.cs* in **AzureADProvisioningSCIMreference** > **ScimReferenceApi** > **Controllers**.
103103

104104
> [!NOTE]
105105
> You can only use HTTP endpoints for local tests. The Azure AD provisioning service requires that your endpoint support HTTPS.
@@ -141,4 +141,4 @@ To develop a SCIM-compliant user and group endpoint with interoperability for a
141141

142142
> [!div class="nextstepaction"]
143143
> [Tutorial: Develop and plan provisioning for a SCIM endpoint](use-scim-to-provision-users-and-groups.md)
144-
> [Tutorial: Configure provisioning for a gallery app](configure-automatic-user-provisioning-portal.md)
144+
> [Tutorial: Configure provisioning for a gallery app](configure-automatic-user-provisioning-portal.md)

articles/active-directory/app-proxy/application-proxy-high-availability-load-balancing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Connectors establish their connections based on principles for high availability
2828
![Diagram showing connections between users and connectors](media/application-proxy-high-availability-load-balancing/application-proxy-connections.png)
2929

3030
1. A user on a client device tries to access an on-premises application published through Application Proxy.
31-
2. The request goes through an Azure Load Balancer to determine which Application Proxy service instance should take the request. Per region, there are tens of instances available to accept the request. This method helps to evenly distribute the traffic across the service instances.
31+
2. The request goes through an Azure Load Balancer to determine which Application Proxy service instance should take the request. There are tens of instances available to accept the requests for all traffic in the region. This method helps to evenly distribute the traffic across the service instances.
3232
3. The request is sent to [Service Bus](../../service-bus-messaging/index.yml).
3333
4. Service Bus signals to an available connector. The connector then picks up the request from Service Bus.
3434
- In step 2, requests go to different Application Proxy service instances, so connections are more likely to be made with different connectors. As a result, connectors are almost evenly used within the group.
@@ -89,4 +89,4 @@ Refer to your software vendor's documentation to understand the load-balancing r
8989
- [Enable single-sign on](application-proxy-configure-single-sign-on-with-kcd.md)
9090
- [Enable Conditional Access](./application-proxy-integrate-with-sharepoint-server.md)
9191
- [Troubleshoot issues you're having with Application Proxy](application-proxy-troubleshoot.md)
92-
- [Learn how Azure AD architecture supports high availability](../fundamentals/active-directory-architecture.md)
92+
- [Learn how Azure AD architecture supports high availability](../fundamentals/active-directory-architecture.md)

articles/active-directory/azuread-dev/active-directory-authentication-libraries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The Azure Active Directory Authentication Library (ADAL) v1.0 enables applicatio
4141
| JavaScript |ADAL.js |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-js) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-js) |[Single-page app](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi) | |
4242
| iOS, macOS |ADAL |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc/releases) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc) |[iOS app](../develop/quickstart-v2-ios.md) | [Reference](http://cocoadocs.org/docsets/ADAL/2.5.1/)|
4343
| Android |ADAL |[Maven](https://search.maven.org/search?q=g:com.microsoft.aad+AND+a:adal&core=gav) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-android) |[Android app](../develop/quickstart-v2-android.md) | [JavaDocs](https://javadoc.io/doc/com.microsoft.aad/adal/)|
44-
| Node.js |ADAL |[npm](https://www.npmjs.com/package/adal-node) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-nodejs) | [Node.js web app](https://github.com/Azure-Samples/active-directory-node-webapp-openidconnect)|[Reference](/javascript/api/overview/azure/activedirectory) |
44+
| Node.js |ADAL |[npm](https://www.npmjs.com/package/adal-node) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-nodejs) | [Node.js web app](https://github.com/Azure-Samples/active-directory-node-webapp-openidconnect)|[Reference](/javascript/api/overview/azure/active-directory) |
4545
| Java |ADAL4J |[Maven](https://search.maven.org/#search%7Cga%7C1%7Ca%3Aadal4j%20g%3Acom.microsoft.azure) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-java) |[Java web app](https://github.com/Azure-Samples/active-directory-java-webapp-openidconnect) |[Reference](https://javadoc.io/doc/com.microsoft.azure/adal4j) |
4646
| Python |ADAL |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-python) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-python) |[Python web app](https://github.com/Azure-Samples/active-directory-python-webapp-graphapi) |[Reference](https://adal-python.readthedocs.io/) |
4747

articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-product-data-sources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ You can use the **Data Collectors** dashboard in CloudKnox Permissions Managemen
6262
1. Select the ellipses **(...)** at the end of the row in the table.
6363
1. Select **Edit Configuration**.
6464

65-
The **M-CIEM Onboarding - Summary** box displays.
65+
The **CloudKnox Onboarding - Summary** box displays.
6666

6767
1. Select **Edit** (the pencil icon) for each field you want to change.
6868
1. Select **Verify now & save**.

articles/active-directory/conditional-access/block-legacy-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.collection: M365-identity-device-management
1616
To give your users easy access to your cloud apps, Azure Active Directory (Azure AD) supports a broad variety of authentication protocols including legacy authentication. However, legacy authentication doesn't support multifactor authentication (MFA). MFA is in many environments a common requirement to address identity theft.
1717

1818
> [!NOTE]
19-
> Effective October 1, 2022, we will begin to permanently disable Basic Authentication for Exchange Online in all Microsoft 365 tenants regardless of usage, except for SMTP Authentication.
19+
> Effective October 1, 2022, we will begin to permanently disable Basic Authentication for Exchange Online in all Microsoft 365 tenants regardless of usage, except for SMTP Authentication. Read more [here](/exchange/clients-and-mobile-in-exchange-online/deprecation-of-basic-authentication-exchange-online)
2020
2121
Alex Weinert, Director of Identity Security at Microsoft, in his March 12, 2020 blog post [New tools to block legacy authentication in your organization](https://techcommunity.microsoft.com/t5/azure-active-directory-identity/new-tools-to-block-legacy-authentication-in-your-organization/ba-p/1225302#) emphasizes why organizations should block legacy authentication and what other tools Microsoft provides to accomplish this task:
2222

articles/active-directory/develop/consent-framework.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ms.service: active-directory
1010
ms.subservice: develop
1111
ms.topic: conceptual
1212
ms.workload: identity
13-
ms.date: 10/21/2020
13+
ms.date: 03/14/2022
1414
ms.author: ryanwi
15-
ms.reviewer: zachowd, lenalepa, jesakowi
16-
ms.custom: has-adal-ref
15+
ms.reviewer: phsignor, jesakowi
16+
ms.custom:
1717
---
1818

1919
# Azure Active Directory consent framework
@@ -32,17 +32,17 @@ The following steps show you how the consent experience works for both the appli
3232

3333
1. Assume you have a web client application that needs to request specific permissions to access a resource/API. You'll learn how to do this configuration in the next section, but essentially the Azure portal is used to declare permission requests at configuration time. Like other configuration settings, they become part of the application's Azure AD registration:
3434

35-
![Permissions to other applications](./media/consent-framework/permissions.png)
35+
:::image type="content" source="./media/consent-framework/permissions.png" alt-text="Permissions to other applications" lightbox="./media/consent-framework/permissions.png":::
3636

3737
1. Consider that your application’s permissions have been updated, the application is running, and a user is about to use it for the first time. First, the application needs to obtain an authorization code from Azure AD’s `/authorize` endpoint. The authorization code can then be used to acquire a new access and refresh token.
3838

3939
1. If the user is not already authenticated, Azure AD's `/authorize` endpoint prompts the user to sign in.
4040

41-
![User or administrator sign in to Azure AD](./media/consent-framework/usersignin.png)
41+
:::image type="content" source="./media/consent-framework/usersignin.png" alt-text="User or administrator sign in to Azure AD":::
4242

4343
1. After the user has signed in, Azure AD will determine if the user needs to be shown a consent page. This determination is based on whether the user (or their organization’s administrator) has already granted the application consent. If consent has not already been granted, Azure AD prompts the user for consent and displays the required permissions it needs to function. The set of permissions that are displayed in the consent dialog match the ones selected in the **Delegated permissions** in the Azure portal.
4444

45-
![Shows an example of permissions displayed in the consent dialog](./media/consent-framework/consent.png)
45+
:::image type="content" source="./media/consent-framework/consent.png" alt-text="Shows an example of permissions displayed in the consent dialog":::
4646

4747
1. After the user grants consent, an authorization code is returned to your application, which is redeemed to acquire an access token and refresh token. For more information about this flow, see [OAuth 2.0 authorization code flow](v2-oauth2-auth-code-flow.md).
4848

@@ -53,7 +53,7 @@ The following steps show you how the consent experience works for both the appli
5353
1. Go to the **API permissions** page for your application
5454
1. Click on the **Grant admin consent** button.
5555

56-
![Grant permissions for explicit admin consent](./media/consent-framework/grant-consent.png)
56+
:::image type="content" source="./media/consent-framework/grant-consent.png" alt-text="Grant permissions for explicit admin consent" lightbox="./media/consent-framework/grant-consent.png":::
5757

5858
> [!IMPORTANT]
5959
> Granting explicit consent using the **Grant permissions** button is currently required for single-page applications (SPA) that use MSAL.js. Otherwise, the application fails when the access token is requested.
248 KB
Loading
49.4 KB
Loading

0 commit comments

Comments
 (0)