Skip to content

Commit dd60a45

Browse files
committed
Merge branch 'main' into release-rename-iot-fundamentals-to-iot
2 parents 42605c0 + 86ef004 commit dd60a45

File tree

168 files changed

+3982
-1448
lines changed

Some content is hidden

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

168 files changed

+3982
-1448
lines changed

.openpublishing.redirection.azure-resource-manager.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1600,6 +1600,11 @@
16001600
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-portal",
16011601
"redirect_document_id": false
16021602
},
1603+
{
1604+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/publish-portal.md",
1605+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1606+
"redirect_document_id": false
1607+
},
16031608
{
16041609
"source_path_from_root": "/articles/managed-applications/publish-service-catalog-app.md",
16051610
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1881,4 +1886,4 @@
18811886
"redirect_document_id": false
18821887
}
18831888
]
1884-
}
1889+
}

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/tables/table-storage-design-encrypt-data.md",
5+
"redirect_url": "/previous-versions/azure/storage/tables/table-storage-design-encrypt-data",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/databox-online/azure-stack-edge-zero-touch-provisioning.md",
510
"redirect_url": "/azure/databox-online/azure-stack-edge-powershell-based-configuration",

articles/active-directory/app-provisioning/application-provisioning-config-problem-scim-compatibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ Following the steps below will delete your existing customappsso job and create
269269

270270
11. In the results of the last step, copy the full "ID" string that begins with "scim". Optionally, reapply your old attribute-mappings by running the command below, replacing [new-job-id] with the new job ID you copied, and entering the JSON output from step #7 as the request body.
271271

272-
`POST https://graph.microsoft.com/beta/servicePrincipals/[object-id]/synchronization/jobs/[new-job-id]/schema`
272+
`PUT https://graph.microsoft.com/beta/servicePrincipals/[object-id]/synchronization/jobs/[new-job-id]/schema`
273273
`{ <your-schema-json-here> }`
274274

275275
12. Return to the first web browser window, and select the **Provisioning** tab for your application.

articles/active-directory/app-proxy/application-proxy-deployment-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ The following design elements should increase the success of your pilot implemen
144144
* Restrict visibility of the pilot application’s icon to a pilot group by hiding its launch icon form the Azure MyApps portal. When ready for production you can scope the app to its respective targeted audience, either in the same pre-production tenant, or by also publishing the application in your production tenant.
145145

146146
**Single sign-on settings**:
147-
Some SSO settings have specific dependencies that can take time to set up, so avoid change control delays by ensuring dependencies are addressed ahead of time. This includes domain joining connector hosts to perform SSO using Kerberos Constrained Delegation (KCD) and taking care of other time-consuming activities. For example, Setting up a PING Access instance, if needing header-based SSO.
147+
Some SSO settings have specific dependencies that can take time to set up, so avoid change control delays by ensuring dependencies are addressed ahead of time. This includes domain joining connector hosts to perform SSO using Kerberos Constrained Delegation (KCD) and taking care of other time-consuming activities.
148148

149149
**TLS Between Connector Host and Target Application**: Security is paramount, so TLS between the connector host and target applications should always be used. Particularly if the web application is configured for forms-based authentication (FBA), as user credentials are then effectively transmitted in clear text.
150150

articles/active-directory/authentication/concept-authentication-methods-manage.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 01/10/2023
9+
ms.date: 03/22/2023
1010

1111
ms.author: justinha
1212
author: justinha
@@ -38,9 +38,6 @@ To manage the Authentication methods policy, click **Security** > **Authenticati
3838

3939
Only the [converged registration experience](concept-registration-mfa-sspr-combined.md) is aware of the Authentication methods policy. Users in scope of the Authentication methods policy but not the converged registration experience won't see the correct methods to register.
4040

41-
>[!NOTE]
42-
>Some pieces of the Authentication methods policy experience are in preview. This includes management of Email OTP, third party software OATH tokens, SMS, and voice call as noted in the portal. Also, use of the authentication methods policy alone with the legacy MFA and SSPR polices disabled is a preview experience.
43-
4441
## Legacy MFA and SSPR policies
4542

4643
Two other policies, located in **Multifactor authentication** settings and **Password reset** settings, provide a legacy way to manage some authentication methods for all users in the tenant. You can't control who uses an enabled authentication method, or how the method can be used. A [Global Administrator](../roles/permissions-reference.md#global-administrator) is needed to manage these policies.
@@ -76,7 +73,7 @@ For users who are enabled for **Mobile phone** for SSPR, the independent control
7673

7774
Similarly, let's suppose you enable **Voice calls** for a group. After you enable it, you find that even users who aren't group members can sign-in with a voice call. In this case, it's likely those users are enabled for **Mobile phone** in the legacy SSPR policy or **Call to phone** in the legacy MFA policy.
7875

79-
## Migration between policies (preview)
76+
## Migration between policies
8077

8178
The Authentication methods policy provides a migration path toward unified administration of all authentication methods. All desired methods can be enabled in the Authentication methods policy. Methods in the legacy MFA and SSPR policies can be disabled. Migration has three settings to let you move at your own pace, and avoid problems with sign-in or SSPR during the transition. After migration is complete, you'll centralize control over authentication methods for both sign-in and SSPR in a single place, and the legacy MFA and SSPR policies will be disabled.
8279

@@ -107,8 +104,7 @@ Tenants are set to either Pre-migration or Migration in Progress by default, dep
107104
> In the future, both of these features will be integrated with the Authentication methods policy.
108105
109106
## Known issues and limitations
110-
- Some customers may see the control to enable Voice call grayed out due to a licensing requirement, despite having a premium license. This is a known issue that we are actively working to fix.
111-
- As a part of the public preview we removed the ability to target individual users. Previously targeted users will remain in the policy but we recommend moving them to a targeted group.
107+
- In recent updates we removed the ability to target individual users. Previously targeted users will remain in the policy but we recommend moving them to a targeted group.
112108

113109
## Next steps
114110

articles/active-directory/authentication/concept-sspr-howitworks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 01/29/2023
9+
ms.date: 03/22/2023
1010

1111
ms.author: justinha
1212
author: justinha
@@ -165,7 +165,7 @@ To improve awareness of password events, SSPR lets you configure notifications f
165165

166166
### Notify users on password resets
167167

168-
If this option is set to **Yes**, users resetting their password receive an email notifying them that their password has been changed. The email is sent via the SSPR portal to their primary and alternate email addresses that are stored in Azure AD. No one else is notified of the reset event.
168+
If this option is set to **Yes**, users resetting their password receive an email notifying them that their password has been changed. The email is sent via the SSPR portal to their primary and alternate email addresses that are stored in Azure AD. If no primary or alternate email address is defined SSPR will attempt email notification via the users User Principal Name (UPN). No one else is notified of the reset event.
169169

170170
### Notify all admins when other admins reset their passwords
171171

articles/active-directory/authentication/how-to-authentication-methods-manage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: How to migrate to the Authentication methods policy (preview)
2+
title: How to migrate to the Authentication methods policy
33
description: Learn about how to centrally manage multifactor authentication (MFA) and self-service password reset (SSPR) settings in the Authentication methods policy.
44

55
services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: conceptual
9-
ms.date: 01/07/2023
9+
ms.date: 03/22/2023
1010

1111
ms.author: justinha
1212
author: justinha
@@ -18,7 +18,7 @@ ms.custom: contperf-fy20q4
1818

1919
# Customer intent: As an identity administrator, I want to understand what authentication options are available in Azure AD and how I can manage them.
2020
---
21-
# How to migrate MFA and SSPR policy settings to the Authentication methods policy for Azure AD (preview)
21+
# How to migrate MFA and SSPR policy settings to the Authentication methods policy for Azure AD
2222

2323
You can migrate Azure Active Directory (Azure AD) [legacy policy settings](concept-authentication-methods-manage.md#legacy-mfa-and-sspr-policies) that separately control multifactor authentication (MFA) and self-service password reset (SSPR) to unified management with the [Authentication methods policy](./concept-authentication-methods-manage.md).
2424

articles/active-directory/authentication/howto-authentication-passwordless-phone.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Users can register for passwordless phone sign-in directly within the Microsoft
8585
1. Acquire a [Temporary Access Pass](../authentication/howto-authentication-temporary-access-pass.md) from your Admin or Organization.
8686
2. Download and install the Microsoft Authenticator app on your mobile device.
8787
3. Open Microsoft Authenticator and click **Add account** and then choose **Work or school account.**
88-
4. Choose **Sign in."
88+
4. Choose **Sign in**.
8989
5. Follow the instructions to sign-in with your account using the Temporary Access Pass provided by your Admin or Organization.
9090
6. Once signed-in, continue following the additional steps to set up phone sign-in.
9191

articles/active-directory/develop/msal-error-handling-python.md

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.topic: conceptual
1111
ms.workload: identity
12-
ms.date: 11/26/2020
12+
ms.date: 03/16/2023
1313
ms.author: dmwendia
1414
ms.reviewer: saeeda, rayluo
1515
ms.custom: aaddev
@@ -25,9 +25,34 @@ In MSAL for Python, most errors are conveyed as a return value from the API call
2525
* A successful response contains the `"access_token"` key. The format of the response is defined by the OAuth2 protocol. For more information, see [5.1 Successful Response](https://tools.ietf.org/html/rfc6749#section-5.1)
2626
* An error response contains `"error"` and usually `"error_description"`. The format of the response is defined by the OAuth2 protocol. For more information, see [5.2 Error Response](https://tools.ietf.org/html/rfc6749#section-5.2)
2727

28-
When an error is returned, the `"error_description"` key contains a human-readable message; which in turn typically contains a Microsoft identity platform error code. For details about the various error codes, see [Authentication and authorization error codes](./reference-aadsts-error-codes.md).
28+
When an error is returned, the `"error"` key contains a machine-readable code. If the `"error"` is, for example, an `"interaction_required"`, you may prompt the user to provide additional information to complete the authentication process. If the `"error"` is `"invalid_grant"`, you may prompt the user to reenter their credentials. The following snippet is an example of error handling in MSAL for Python.
2929

30-
In MSAL for Python, exceptions are rare because most errors are handled by returning an error value. The `ValueError` exception is only thrown when there is an issue with how you are attempting to use the library, such as when API parameter(s) are malformed.
30+
```python
31+
32+
from msal import ConfidentialClientApplication
33+
34+
authority_url = "https://login.microsoftonline.com/your_tenant_id"
35+
client_id = "your_client_id"
36+
client_secret = "your_client_secret"
37+
scopes = ["https://graph.microsoft.com/.default"]
38+
39+
app = ConfidentialClientApplication(client_id, authority=authority_url, client_credential=client_secret)
40+
41+
result = app.acquire_token_silent(scopes=scopes, account=None)
42+
43+
if not result:
44+
result = app.acquire_token_silent(scopes=scopes)
45+
46+
if "access_token" in result:
47+
print("Access token: %s" % result["access_token"])
48+
else:
49+
print("Error: %s" % result.get("error"))
50+
51+
```
52+
53+
When an error is returned, the `"error_description"` key also contains a human-readable message, and there is typically also an `"error_code"` key which contains a machine-readable Microsoft identity platform error code. For more information about the various Microsoft identity platform error codes, see [Authentication and authorization error codes](./reference-aadsts-error-codes.md).
54+
55+
In MSAL for Python, exceptions are rare because most errors are handled by returning an error value. The `ValueError` exception is only thrown when there's an issue with how you're attempting to use the library, such as when API parameter(s) are malformed.
3156

3257
[!INCLUDE [Active directory error handling claims challenges](../../../includes/active-directory-develop-error-handling-claims-challenges.md)]
3358

articles/aks/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@
221221
href: free-standard-pricing-tiers.md
222222
- name: Use Draft (preview)
223223
href: draft.md
224+
- name: Use Draft and the DevX extension for Visual Studio Code (preview)
225+
href: draft-devx-extension-aks.md
224226
- name: Use proximity placement groups
225227
href: reduce-latency-ppg.md
226228
- name: Upgrade the node image

0 commit comments

Comments
 (0)