Skip to content

Commit dfc7ca5

Browse files
authored
Merge branch 'main' into auth-migration
2 parents f49794d + e440a33 commit dfc7ca5

15 files changed

+376
-34
lines changed

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/authentication/concept-authentication-methods-manage.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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
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/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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
services: storage, app-service-web
3+
author: rwike77
4+
manager: CelesteDG
5+
ms.service: app-service
6+
ms.topic: include
7+
ms.workload: identity
8+
ms.date: 03/09/2023
9+
ms.author: ryanwi
10+
ms.reviewer: stsoneff
11+
ms.devlang: azurecli
12+
ms.custom: azureday1
13+
ms.subservice: web-apps
14+
---
15+
16+
In the preceding steps, you created Azure resources in a resource group.
17+
18+
1. Delete the resource group by running the following command in the Cloud Shell. This command may take a minute to run.
19+
20+
21+
```azurecli-interactive
22+
az group delete --name myAuthResourceGroup
23+
```
24+
25+
26+
1. Use the authentication apps' **Client ID**, you previously found and made note of in the `Enable authentication and authorization` sections for the backend and frontend apps.
27+
1. Delete app registrations for both frontend and backend apps.
28+
29+
```azurecli-interactive
30+
# delete app - do this for both frontend and backend client ids
31+
az ad app delete <client-id>
32+
```
22.1 KB
Loading
Loading
Loading
22.2 KB
Loading

articles/app-service/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
href: tutorial-connect-app-access-microsoft-graph-as-user-javascript.md
125125
- name: App to app authentication
126126
href: tutorial-auth-aad.md
127-
128-
127+
- name: App to app to another Azure service
128+
href: tutorial-connect-app-app-graph-javascript.md
129129
- name: Isolate network traffic
130130
href: tutorial-networking-isolate-vnet.md
131131
- name: Host a RESTful API

0 commit comments

Comments
 (0)