Skip to content

Commit 27fa8d7

Browse files
committed
Merge branch 'main' into release-restorepoints-ga
2 parents c64adf8 + acf1bd4 commit 27fa8d7

File tree

350 files changed

+3858
-1149
lines changed

Some content is hidden

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

350 files changed

+3858
-1149
lines changed

articles/active-directory-b2c/string-transformations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Determines whether one string claim is equal to another. The result is a new boo
171171
| InputClaim | inputClaim1 | string | First claim type, which is to be compared. |
172172
| InputClaim | inputClaim2 | string | Second claim type, which is to be compared. |
173173
| InputParameter | operator | string | Possible values: `EQUAL` or `NOT EQUAL`. |
174-
| InputParameter | ignoreCase | boolean | Specifies whether this comparison should ignore the case of the strings being compared. |
174+
| InputParameter | ignoreCase | string | Specifies whether this comparison should ignore the case of the strings being compared. |
175175
| OutputClaim | outputClaim | boolean | The claim that is produced after this claims transformation has been invoked. |
176176

177177
### Example of CompareClaims
@@ -186,7 +186,7 @@ Use this claims transformation to check if a claim is equal to another claim. T
186186
</InputClaims>
187187
<InputParameters>
188188
<InputParameter Id="operator" DataType="string" Value="NOT EQUAL" />
189-
<InputParameter Id="ignoreCase" DataType="boolean" Value="true" />
189+
<InputParameter Id="ignoreCase" DataType="string" Value="true" />
190190
</InputParameters>
191191
<OutputClaims>
192192
<OutputClaim ClaimTypeReferenceId="SameEmailAddress" TransformationClaimType="outputClaim" />

articles/active-directory/develop/msal-client-application-configuration.md

Lines changed: 25 additions & 24 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/20/2020
12+
ms.date: 07/15/2022
1313
ms.author: marsma
1414
ms.reviewer: saeeda
1515
ms.custom: aaddev, has-adal-ref
@@ -33,12 +33,12 @@ The authority is a URL that indicates a directory that MSAL can request tokens f
3333

3434
Common authorities are:
3535

36-
| Common authority URLs | When to use |
37-
|--|--|
38-
| `https://login.microsoftonline.com/<tenant>/` | Sign in users of a specific organization only. The `<tenant>` in the URL is the tenant ID of the Azure Active Directory (Azure AD) tenant (a GUID), or its tenant domain. |
39-
| `https://login.microsoftonline.com/common/` | Sign in users with work and school accounts or personal Microsoft accounts. |
40-
| `https://login.microsoftonline.com/organizations/` | Sign in users with work and school accounts. |
41-
| `https://login.microsoftonline.com/consumers/` | Sign in users with personal Microsoft accounts (MSA) only. |
36+
| Common authority URLs | When to use |
37+
| -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
38+
| `https://login.microsoftonline.com/<tenant>/` | Sign in users of a specific organization only. The `<tenant>` in the URL is the tenant ID of the Azure Active Directory (Azure AD) tenant (a GUID), or its tenant domain. |
39+
| `https://login.microsoftonline.com/common/` | Sign in users with work and school accounts or personal Microsoft accounts. |
40+
| `https://login.microsoftonline.com/organizations/` | Sign in users with work and school accounts. |
41+
| `https://login.microsoftonline.com/consumers/` | Sign in users with personal Microsoft accounts (MSA) only. |
4242

4343
The authority you specify in your code needs to be consistent with the **Supported account types** you specified for the app in **App registrations** in the Azure portal.
4444

@@ -50,16 +50,16 @@ The authority can be:
5050

5151
Azure AD cloud authorities have two parts:
5252

53-
- The identity provider *instance*
54-
- The sign-in *audience* for the app
53+
- The identity provider _instance_
54+
- The sign-in _audience_ for the app
5555

5656
The instance and audience can be concatenated and provided as the authority URL. This diagram shows how the authority URL is composed:
5757

5858
![How the authority URL is composed](media/msal-client-application-configuration/authority.png)
5959

6060
## Cloud instance
6161

62-
The *instance* is used to specify if your app is signing users from the Azure public cloud or from national clouds. Using MSAL in your code, you can set the Azure cloud instance by using an enumeration or by passing the URL to the [national cloud instance](authentication-national-cloud.md#azure-ad-authentication-endpoints) as the `Instance` member (if you know it).
62+
The _instance_ is used to specify if your app is signing users from the Azure public cloud or from national clouds. Using MSAL in your code, you can set the Azure cloud instance by using an enumeration or by passing the URL to the [national cloud instance](authentication-national-cloud.md#azure-ad-authentication-endpoints) as the `Instance` member.
6363

6464
MSAL.NET will throw an explicit exception if both `Instance` and `AzureCloudInstance` are specified.
6565

@@ -100,7 +100,7 @@ Currently, the only way to get an app to sign in users with only personal Micros
100100

101101
## Client ID
102102

103-
The client ID is the unique application (client) ID assigned to your app by Azure AD when the app was registered.
103+
The client ID is the unique **Application (client) ID** assigned to your app by Azure AD when the app was registered.
104104

105105
## Redirect URI
106106

@@ -110,40 +110,41 @@ The redirect URI is the URI the identity provider will send the security tokens
110110

111111
If you're a public client app developer who's using MSAL:
112112

113-
- You'd want to use `.WithDefaultRedirectUri()` in desktop or UWP applications (MSAL.NET 4.1+). This method will set the public client application's redirect URI property to the default recommended redirect URI for public client applications.
113+
- You'd want to use `.WithDefaultRedirectUri()` in desktop or Universal Windows Platform (UWP) applications (MSAL.NET 4.1+). The `.WithDefaultRedirectUri()` method will set the public client application's redirect URI property to the default recommended redirect URI for public client applications.
114114

115-
| Platform | Redirect URI |
116-
|--|--|
117-
| Desktop app (.NET FW) | `https://login.microsoftonline.com/common/oauth2/nativeclient` |
118-
| UWP | value of `WebAuthenticationBroker.GetCurrentApplicationCallbackUri()`. This enables SSO with the browser by setting the value to the result of WebAuthenticationBroker.GetCurrentApplicationCallbackUri() which you need to register |
119-
| .NET Core | `https://localhost`. This enables the user to use the system browser for interactive authentication since .NET Core doesn't have a UI for the embedded web view at the moment. |
115+
| Platform | Redirect URI |
116+
| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
117+
| Desktop app (.NET FW) | `https://login.microsoftonline.com/common/oauth2/nativeclient` |
118+
| UWP | value of `WebAuthenticationBroker.GetCurrentApplicationCallbackUri()`. This enables single sign-on (SSO) with the browser by setting the value to the result of WebAuthenticationBroker.GetCurrentApplicationCallbackUri(), which you need to register |
119+
| .NET Core | `https://localhost` enables the user to use the system browser for interactive authentication since .NET Core doesn't have a UI for the embedded web view at the moment. |
120120

121-
- You don't need to add a redirect URI if you're building a Xamarin Android and iOS application that doesn't support the broker redirect URI. It is automatically set to `msal{ClientId}://auth` for Xamarin Android and iOS.
121+
- You don't need to add a redirect URI if you're building a Xamarin Android and iOS application that doesn't support the broker redirect URI. It's automatically set to `msal{ClientId}://auth` for Xamarin Android and iOS.
122122

123123
- Configure the redirect URI in [App registrations](https://aka.ms/appregistrations):
124124

125-
![Redirect URI in App registrations](media/msal-client-application-configuration/redirect-uri.png)
125+
![Redirect URI in App registrations](media/msal-client-application-configuration/redirect-uri.png)
126126

127127
You can override the redirect URI by using the `RedirectUri` property (for example, if you use brokers). Here are some examples of redirect URIs for that scenario:
128128

129129
- `RedirectUriOnAndroid` = "msauth-5a434691-ccb2-4fd1-b97b-b64bcfbc03fc://com.microsoft.identity.client.sample";
130130
- `RedirectUriOnIos` = $"msauth.{Bundle.ID}://auth";
131131

132-
For additional iOS details, see [Migrate iOS applications that use Microsoft Authenticator from ADAL.NET to MSAL.NET](msal-net-migration-ios-broker.md) and [Leveraging the broker on iOS](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/Leveraging-the-broker-on-iOS).
133-
For additional Android details, see [Brokered auth in Android](msal-android-single-sign-on.md).
132+
For more iOS details, see [Migrate iOS applications that use Microsoft Authenticator from ADAL.NET to MSAL.NET](msal-net-migration-ios-broker.md) and [Leveraging the broker on iOS](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/Leveraging-the-broker-on-iOS).
133+
For more Android details, see [Brokered auth in Android](msal-android-single-sign-on.md).
134134

135135
### Redirect URI for confidential client apps
136136

137-
For web apps, the redirect URI (or reply URL) is the URI that Azure AD will use to send the token back to the application. This URI can be the URL of the web app/web API if the confidential app is one of these. The redirect URI needs to be registered in app registration. This registration is especially important when you deploy an app that you've initially tested locally. You then need to add the reply URL of the deployed app in the application registration portal.
137+
For web apps, the redirect URI (or reply URL) is the URI that Azure AD will use to send the token back to the application. The URI can be the URL of the web app/web API if the confidential app is one of them. The redirect URI needs to be registered in app registration. The registration is especially important when you deploy an app that you've initially tested locally. You then need to add the reply URL of the deployed app in the application registration portal.
138138

139139
For daemon apps, you don't need to specify a redirect URI.
140140

141141
## Client secret
142142

143-
This option specifies the client secret for the confidential client app. This secret (app password) is provided by the application registration portal or provided to Azure AD during app registration with PowerShell AzureAD, PowerShell AzureRM, or Azure CLI.
143+
This option specifies the client secret for the confidential client app. The client secret (app password) is provided by the application registration portal or provided to Azure AD during app registration with PowerShell AzureAD, PowerShell AzureRM, or Azure CLI.
144144

145145
## Logging
146-
To help in debugging and authentication failure troubleshooting scenarios, the Microsoft Authentication Library provides built-in logging support. Logging is each library is covered in the following articles:
146+
147+
To help in debugging and authentication failure troubleshooting scenarios, the MSAL provides built-in logging support. Logging in each library is covered in the following articles:
147148

148149
:::row:::
149150
:::column:::
115 KB
Loading
34.5 KB
Loading
26.7 KB
Loading
66.3 KB
Loading
163 KB
Loading
Loading
Loading
36.3 KB
Loading

0 commit comments

Comments
 (0)