Skip to content

Commit 21654d4

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into static-ip-json-upload
2 parents 693edf4 + 94a8f84 commit 21654d4

File tree

352 files changed

+8058
-2113
lines changed

Some content is hidden

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

352 files changed

+8058
-2113
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
5+
"redirect_url": "/azure/azure-monitor/getting-started",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/azure-monitor/change/change-analysis-query.md",
10+
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-monitor/change/tutorial-outages.md",
15+
"redirect_url": "/azure/azure-monitor/change/change-analysis-track-outages",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/azure-monitor/change/change-analysis-custom-filters.md",
20+
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path_from_root": "/articles/azure-monitor/change/change-analysis-powershell.md",
525
"redirect_url": "/azure/azure-monitor/change/change-analysis",

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29549,6 +29549,11 @@
2954929549
"source_path": "articles/azure-cache-for-redis/redis-cache-insights-overview.md",
2955029550
"redirect_url": "/azure/azure-cache-for-redis/cache-insights-overview",
2955129551
"redirect_document_id": false
29552+
},
29553+
{
29554+
"source_path": "articles/dotnet-develop-multitenant-applications.md",
29555+
"redirect_URL": "/azure/architecture/guide/multitenant/overview",
29556+
"redirect_document_id": false
2955229557
}
2955329558
]
2955429559
}

articles/active-directory/develop/msal-android-single-sign-on.md

Lines changed: 41 additions & 39 deletions
Large diffs are not rendered by default.
Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Use redirect URIs with MSAL (iOS/macOS)
3-
description: Learn about the differences between the Microsoft Authentication Library for ObjectiveC (MSAL for iOS and macOS) and Azure AD Authentication Library for ObjectiveC (ADAL.ObjC) and how to migrate between them.
3+
description: Learn about the differences between the Microsoft Authentication Library for Objective-C (MSAL for iOS and macOS) and Azure AD Authentication Library for Objective-C (ADAL.ObjC) and how to migrate between them.
44
services: active-directory
55
author: henrymbuguakiarie
66
manager: CelesteDG
@@ -9,73 +9,73 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.topic: how-to
1111
ms.workload: identity
12-
ms.date: 08/28/2019
12+
ms.date: 01/18/2023
1313
ms.author: henrymbugua
1414
ms.reviewer: jak
1515
ms.custom: aaddev, has-adal-ref
1616
#Customer intent: As an application developer, I want to learn about how to use redirect URIs.
1717
---
1818

19-
# Using redirect URIs with the Microsoft authentication library for iOS and macOS
19+
# Using redirect URIs with the Microsoft Authentication Library (MSAL) for iOS and macOS
2020

2121
When a user authenticates, Azure Active Directory (Azure AD) sends the token to the app by using the redirect URI registered with the Azure AD application.
2222

23-
The Microsoft Authentication library (MSAL) requires that the redirect URI be registered with the Azure AD app in a specific format. MSAL uses a default redirect URI, if you don't specify one. The format is `msauth.[Your_Bundle_Id]://auth`.
23+
The MSAL requires that the redirect URI be registered with the Azure AD app in a specific format. MSAL uses a default redirect URI, if you don't specify one. The format is `msauth.[Your_Bundle_Id]://auth`.
2424

2525
The default redirect URI format works for most apps and scenarios, including brokered authentication and system web view. Use the default format whenever possible.
2626

27-
However, you may need to change the redirect URI for advanced scenarios, as described below.
27+
However, you may need to change the redirect URI for advanced scenarios, as described in the following section.
2828

2929
## Scenarios that require a different redirect URI
3030

31-
### Cross-app single sign on (SSO)
31+
### Cross-app single sign-on (SSO)
3232

33-
For the Microsoft Identity platform to share tokens across apps, each app needs to have the same client ID or application ID. This is the unique identifier provided when you registered your app in the portal (not the application bundle ID that you register per app with Apple).
33+
For the Microsoft identity platform to share tokens across apps, each app needs to have the same client ID or application ID. The client ID is the unique identifier provided when you registered your app in the Azure portal (not the application bundle ID that you register per app with Apple).
3434

3535
The redirect URIs need to be different for each iOS app. This allows the Microsoft identity service to uniquely identify different apps that share an application ID. Each application can have multiple redirect URIs registered in the Azure portal. Each app in your suite will have a different redirect URI. For example:
3636

3737
Given the following application registration in the Azure portal:
3838

39-
* Client ID: `ABCDE-12345` (this is a single client ID)
40-
* RedirectUris: `msauth.com.contoso.app1://auth`, `msauth.com.contoso.app2://auth`, `msauth.com.contoso.app3://auth`
39+
- Client ID: `ABCDE-12345`
40+
- RedirectUris: `msauth.com.contoso.app1://auth`, `msauth.com.contoso.app2://auth`, `msauth.com.contoso.app3://auth`
4141

4242
App1 uses redirect `msauth.com.contoso.app1://auth`.\
4343
App2 uses `msauth.com.contoso.app2://auth`.\
4444
App3 uses `msauth.com.contoso.app3://auth`.
4545

4646
### Migrating from ADAL to MSAL
4747

48-
When migrating code that used the Azure AD Authentication Library (ADAL) to MSAL, you may already have a redirect URI configured for your app. You can continue using the same redirect URI as long as your ADAL app was configured to support brokered scenarios and your redirect URI satisfies the MSAL redirect URI format requirements.
48+
When migrating code that used the Azure Active Directory Authentication Library (ADAL) to MSAL, you may already have a redirect URI configured for your app. You can continue using the same redirect URI as long as your ADAL app was configured to support brokered scenarios and your redirect URI satisfies the MSAL redirect URI format requirements.
4949

5050
## MSAL redirect URI format requirements
5151

52-
* The MSAL redirect URI must be in the form `<scheme>://host`
52+
- The MSAL redirect URI must be in the form `<scheme>://host`
5353

54-
Where `<scheme>` is a unique string that identifies your app. It's primarily based on the Bundle Identifier of your application to guarantee uniqueness. For example, if your app's Bundle ID is `com.contoso.myapp`, your redirect URI would be in the form: `msauth.com.contoso.myapp://auth`.
54+
Where `<scheme>` is a unique string that identifies your app. It's primarily based on the Bundle Identifier of your application to guarantee uniqueness. For example, if your app's Bundle ID is `com.contoso.myapp`, your redirect URI would be in the form: `msauth.com.contoso.myapp://auth`.
5555

56-
If you're migrating from ADAL, your redirect URI will likely have this format: `<scheme>://[Your_Bundle_Id]`, where `scheme` is a unique string. This format will continue to work when you use MSAL.
56+
If you're migrating from ADAL, your redirect URI will likely have this format: `<scheme>://[Your_Bundle_Id]`, where `scheme` is a unique string. The format will continue to work when you use MSAL.
5757

58-
* `<scheme>` must be registered in your app's Info.plist under `CFBundleURLTypes > CFBundleURLSchemes`. In this example, Info.plist has been opened as source code:
58+
- `<scheme>` must be registered in your app's Info.plist under `CFBundleURLTypes > CFBundleURLSchemes`. In this example, Info.plist has been opened as source code:
5959

60-
```xml
61-
<key>CFBundleURLTypes</key>
62-
<array>
63-
<dict>
64-
<key>CFBundleURLSchemes</key>
65-
<array>
66-
<string>msauth.[BUNDLE_ID]</string>
67-
</array>
68-
</dict>
69-
</array>
70-
```
60+
```xml
61+
<key>CFBundleURLTypes</key>
62+
<array>
63+
<dict>
64+
<key>CFBundleURLSchemes</key>
65+
<array>
66+
<string>msauth.[BUNDLE_ID]</string>
67+
</array>
68+
</dict>
69+
</array>
70+
```
7171

7272
MSAL will verify if your redirect URI registers correctly, and return an error if it's not.
73-
74-
* If you want to use universal links as a redirect URI, the `<scheme>` must be `https` and doesn't need to be declared in `CFBundleURLSchemes`. Instead, configure the app and domain per Apple's instructions at [Universal Links for Developers](https://developer.apple.com/ios/universal-links/) and call the `handleMSALResponse:sourceApplication:` method of `MSALPublicClientApplication` when your application is opened through a universal link.
73+
74+
- If you want to use universal links as a redirect URI, the `<scheme>` must be `https` and doesn't need to be declared in `CFBundleURLSchemes`. Instead, configure the app and domain per Apple's instructions at [Universal Links for Developers](https://developer.apple.com/ios/universal-links/) and call the `handleMSALResponse:sourceApplication:` method of `MSALPublicClientApplication` when your application is opened through a universal link.
7575

7676
## Use a custom redirect URI
7777

78-
To use a custom redirect URI, pass the `redirectUri` parameter to `MSALPublicClientApplicationConfig` and pass that object to `MSALPublicClientApplication` when you initialize the object. If the redirect URI is invalid, the initializer will return `nil` and set the `redirectURIError`with additional information. For example:
78+
To use a custom redirect URI, pass the `redirectUri` parameter to `MSALPublicClientApplicationConfig` and pass that object to `MSALPublicClientApplication` when you initialize the object. If the redirect URI is invalid, the initializer will return `nil` and set the `redirectURIError`with additional information. For example:
7979

8080
Objective-C:
8181

@@ -97,14 +97,12 @@ let config = MSALPublicClientApplicationConfig(clientId: "your-client-id",
9797
authority: authority)
9898
do {
9999
let application = try MSALPublicClientApplication(configuration: config)
100-
// continue on with application
100+
// continue on with application
101101
} catch let error as NSError {
102102
// handle error here
103-
}
103+
}
104104
```
105105

106-
107-
108106
## Handle the URL opened event
109107

110108
Your application should call MSAL when it receives any response through URL schemes or universal links. Call the `handleMSALResponse:sourceApplication:` method of `MSALPublicClientApplication` when your application is opened. Here's an example for custom schemes:
@@ -116,7 +114,7 @@ Objective-C:
116114
openURL:(NSURL *)url
117115
options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
118116
{
119-
return [MSALPublicClientApplication handleMSALResponse:url
117+
return [MSALPublicClientApplication handleMSALResponse:url
120118
sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]];
121119
}
122120
```
@@ -129,8 +127,6 @@ func application(_ app: UIApplication, open url: URL, options: [UIApplication.Op
129127
}
130128
```
131129

132-
133-
134130
## Next steps
135131

136132
Learn more about [Authentication flows and application scenarios](authentication-flows-app-scenarios.md)

articles/active-directory/external-identities/leave-the-organization.md

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22

3-
title: Leave an organization - Azure Active Directory
4-
titleSuffix: Azure External Identities
3+
title: Leave an organization as a guest user
4+
titleSuffix: Azure Active Directory External Identities
55
description: Shows how an Azure AD B2B guest user can leave an organization by using the Access Panel.
66

77
services: active-directory
88
ms.service: active-directory
99
ms.subservice: B2B
1010
ms.topic: how-to
11-
ms.date: 12/16/2022
11+
ms.date: 01/17/2023
1212

13-
ms.author: cmulligan
14-
author: csmulligan
13+
ms.author: cmulligan
14+
author: csmulligan
1515
manager: celestedg
1616

1717
ms.collection: engagement-fy23, M365-identity-device-management
@@ -22,18 +22,22 @@ adobe-target: true
2222

2323
# Leave an organization as an external user
2424

25-
As an Azure Active Directory (Azure AD) [B2B collaboration](what-is-b2b.md) or [B2B direct connect](b2b-direct-connect-overview.md) user, you can leave an organization at any time if you no longer need to use apps from that organization, or maintain any association.
25+
As an Azure Active Directory (Azure AD) B2B collaboration or B2B direct connect user, you can leave an organization at any time if you no longer need to use apps from that organization, or maintain any association.
2626

27-
You can usually leave an organization on your own without having to contact an administrator. However, in some cases this option won't be available and you'll need to contact your tenant admin, who can delete your account in the external organization. This article is intended for administrators. If you're a user looking for information about how to manage and leave an organization, see the [Manage organizations article.](https://support.microsoft.com/account-billing/manage-organizations-for-a-work-or-school-account-in-the-my-account-portal-a9b65a70-fec5-4a1a-8e00-09f99ebdea17)
27+
## Before you begin
2828

29-
[!INCLUDE [GDPR-related guidance](../../../includes/gdpr-dsr-and-stp-note.md)]
29+
You can usually leave an organization on your own without having to contact an administrator. However, in some cases this option won't be available and you'll need to contact your tenant admin, who can delete your account in the external organization. This article is intended for administrators. If you're a user looking for information about how to manage and leave an organization, see the [Manage organizations article.](https://support.microsoft.com/account-billing/manage-organizations-for-a-work-or-school-account-in-the-my-account-portal-a9b65a70-fec5-4a1a-8e00-09f99ebdea17)
3030

3131
## What organizations do I belong to?
3232

3333
1. To view the organizations you belong to, first open your **My Account** page. You either have a work or school account created by an organization or a personal account such as for Xbox, Hotmail, or Outlook.com.
3434

3535
- If you're using a work or school account, go to https://myaccount.microsoft.com and sign in.
36-
- If you're using a personal account or email one-time passcode, you'll need to use a My Account URL that includes your tenant name or tenant ID, for example: https://myaccount.microsoft.com?tenantId=wingtiptoys.onmicrosoft.com or https://myaccount.microsoft.com?tenantId=ab123456-cd12-ef12-gh12-ijk123456789.
36+
- If you're using a personal account or email one-time passcode, you'll need to use a My Account URL that includes your tenant name or tenant ID.
37+
For example:
38+
https://myaccount.microsoft.com?tenantId=wingtiptoys.onmicrosoft.com
39+
or
40+
https://myaccount.microsoft.com?tenantId=ab123456-cd12-ef12-gh12-ijk123456789.
3741

3842
1. Select **Organizations** from the left navigation pane or select the **Manage organizations** link from the **Organizations** block.
3943

@@ -66,7 +70,6 @@ In the **Home organization** section, there's no link to **Leave** your organiza
6670

6771
For the external organizations listed under **Other organizations you collaborate with**, you might not be able to leave on your own, for example when:
6872

69-
7073
- the organization you want to leave doesn’t allow users to leave by themselves
7174
- your account has been disabled
7275

@@ -88,7 +91,6 @@ Administrators can use the **External user leave settings** to control whether e
8891
- **Yes**: Users can leave the organization themselves without approval from your admin or privacy contact.
8992
- **No**: Users can't leave your organization themselves. They'll see a message guiding them to contact your admin, or privacy contact to request removal from your organization.
9093

91-
9294
:::image type="content" source="media/leave-the-organization/external-user-leave-settings.png" alt-text="Screenshot showing External user leave settings in the portal.":::
9395

9496
### Account removal
@@ -105,12 +107,12 @@ If desired, a tenant administrator can permanently delete the account at any tim
105107

106108
1. Select the check box next to a deleted user, and then select **Delete permanently**.
107109

108-
Permanent deletion can be initiated by the admin, or it happens at the end of the soft deletion period. Permanent deletion can take up to an extra 30 days for data removal ([learn more](/compliance/regulatory/gdpr-dsr-azure#step-5-delete)).
110+
Permanent deletion can be initiated by the admin, or it happens at the end of the soft deletion period. Permanent deletion can take up to an extra 30 days for data removal.
111+
112+
For B2B direct connect users, data removal begins as soon as the user selects **Leave** in the confirmation message and can take up to 30 days to complete.
109113

110-
> [!NOTE]
111-
> For B2B direct connect users, data removal begins as soon as the user selects **Leave** in the confirmation message and can take up to 30 days to complete ([learn more](/compliance/regulatory/gdpr-dsr-azure#delete-a-users-data-when-there-is-no-account-in-the-azure-tenant)).
112114

113115
## Next steps
114116

115-
- Learn more about [Azure AD B2B collaboration](what-is-b2b.md) and [Azure AD B2B direct connect](b2b-direct-connect-overview.md)
116-
- [Use audit logs and access reviews](auditing-and-reporting.md)
117+
- Learn more about [user deletion](/compliance/regulatory/gdpr-dsr-azure#step-5-delete) and about how to delete a user's data when there's [no account in the Azure tenant](/compliance/regulatory/gdpr-dsr-azure#delete-a-users-data-when-there-is-no-account-in-the-azure-tenant).
118+
- For more information about GDPR, see the GDPR section of the [Service Trust portal](https://servicetrust.microsoft.com/ViewPage/GDPRGetStarted).

0 commit comments

Comments
 (0)