Skip to content

Commit 6eae210

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-support-case-art
2 parents b04d940 + 703e0d5 commit 6eae210

File tree

485 files changed

+4353
-1536
lines changed

Some content is hidden

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

485 files changed

+4353
-1536
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/cloud-infrastructure-entitlement-management/usage-analytics-users.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Filters can be applied in one, two, or all three categories depending on the typ
108108

109109
1. From the **Authorization System Type** dropdown, select the authorization system you want to use: **AWS**, **Azure**, or **GCP**.
110110
1. From the **Authorization System** dropdown, select from a **List** of accounts and **Folders**.
111-
1. From the **Identity Subtype**, select the type of user: **All**, **ED**, **Local**, or **Cross Account**.
111+
1. From the **Identity Subtype**, select the type of user: **All**, **ED** (Enterprise Directory), **Local**, or **Cross Account**.
112112
1. Select **Apply** to run your query and display the information you selected.
113113

114114
Select **Reset filter** to discard your changes.
@@ -158,4 +158,4 @@ You can filter user details by type of user, user role, app, or service used, or
158158
- To view assigned permissions and usage of the group and the group members, see [View analytic information about groups](usage-analytics-groups.md).
159159
- To view active resources, see [View analytic information about active resources](usage-analytics-active-resources.md).
160160
- To view the permission usage of access keys for a given user, see [View analytic information about access keys](usage-analytics-access-keys.md).
161-
- To view assigned permissions and usage of the serverless functions, see [View analytic information about serverless functions](usage-analytics-serverless-functions.md).
161+
- To view assigned permissions and usage of the serverless functions, see [View analytic information about serverless functions](usage-analytics-serverless-functions.md).

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:::

articles/active-directory/develop/msal-node-migration.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.custom: has-adal-ref
2121

2222
## Prerequisites
2323

24-
- Node version 10, 12 or 14. See the [note on version support](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-node#node-version-support)
24+
- Node version 10, 12, 14, 16 or 18. See the [note on version support](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-node#node-version-support)
2525

2626
## Update app registration settings
2727

@@ -373,16 +373,19 @@ const cca = new msal.ConfidentialClientApplication(config);
373373

374374
const refreshTokenRequest = {
375375
refreshToken: "", // your previous refresh token here
376-
scopes: ["user.read"],
376+
scopes: ["https://graph.microsoft.com/.default"],
377+
forceCache: true,
377378
};
378379

379380
cca.acquireTokenByRefreshToken(refreshTokenRequest).then((response) => {
380-
console.log(JSON.stringify(response));
381+
console.log(response);
381382
}).catch((error) => {
382-
console.log(JSON.stringify(error));
383+
console.log(error);
383384
});
384385
```
385386

387+
For more information, please refer to the [ADAL Node to MSAL Node migration sample](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-node-samples/refresh-token).
388+
386389
> [!NOTE]
387390
> We recommend you to destroy the older ADAL Node token cache once you utilize the still valid refresh tokens to get a new set of tokens using the MSAL Node's `acquireTokenByRefreshToken` method as shown above.
388391
@@ -419,7 +422,7 @@ var adal = require('adal-node');
419422
// Authentication parameters
420423
var clientId = 'Enter_the_Application_Id_Here';
421424
var clientSecret = 'Enter_the_Client_Secret_Here';
422-
var tenant = 'common';
425+
var tenant = 'Enter_the_Tenant_Info_Here';
423426
var authorityUrl = 'https://login.microsoftonline.com/' + tenant;
424427
var redirectUri = 'http://localhost:3000/redirect';
425428
var resource = 'https://graph.microsoft.com';
@@ -501,7 +504,7 @@ const msal = require('@azure/msal-node');
501504
const config = {
502505
auth: {
503506
clientId: "Enter_the_Application_Id_Here",
504-
authority: "https://login.microsoftonline.com/common",
507+
authority: "https://login.microsoftonline.com/Enter_the_Tenant_Info_Here",
505508
clientSecret: "Enter_the_Client_Secret_Here"
506509
},
507510
system: {

articles/active-directory/fundamentals/active-directory-access-create-new-tenant.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
title: Quickstart - Access & create new tenant - Azure AD
33
description: Instructions about how to find Azure Active Directory and how to create a new tenant for your organization.
44
services: active-directory
5-
author: ajburnle
6-
manager: karenhoran
5+
author: barclayn
6+
manager: rkarlin
77
ms.service: active-directory
88
ms.subservice: fundamentals
99
ms.workload: identity
1010
ms.topic: quickstart
1111
ms.date: 12/22/2021
12-
ms.author: ajburnle
12+
ms.author: barclayn
1313
ms.custom: it-pro, seodec18, fasttrack-edit, mode-other
1414
ms.collection: M365-identity-device-management
1515
---

articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
title: Add or remove group owners - Azure Active Directory | Microsoft Docs
33
description: Instructions about how to add or remove group owners using Azure Active Directory.
44
services: active-directory
5-
author: ajburnle
6-
manager: karenhoran
5+
author: barclayn
6+
manager: rkarlin
77

88
ms.service: active-directory
99
ms.workload: identity
1010
ms.subservice: fundamentals
1111
ms.topic: how-to
1212
ms.date: 09/11/2018
13-
ms.author: ajburnle
13+
ms.author: barclayn
1414
ms.custom: "it-pro, seodec18"
1515
ms.collection: M365-identity-device-management
1616
---

articles/active-directory/fundamentals/active-directory-architecture.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
title: Architecture overview - Azure Active Directory | Microsoft Docs
33
description: Learn what an Azure Active Directory tenant is and how to manage Azure using Azure Active Directory.
44
services: active-directory
5-
author: ajburnle
6-
manager: karenhoran
5+
author: barclayn
6+
manager: rkarlin
77

88
ms.service: active-directory
99
ms.subservice: fundamentals
1010
ms.workload: identity
1111
ms.topic: conceptual
1212
ms.date: 07/08/2022
13-
ms.author: ajburnle
13+
ms.author: barclayn
1414
ms.reviewer: jeffsta
1515
ms.custom: "it-pro, seodec18"
1616
ms.collection: M365-identity-device-management

articles/active-directory/fundamentals/active-directory-compare-azure-ad-to-ad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Compare Active Directory to Azure Active Directory
33
description: This document compares Active Directory Domain Services (ADDS) to Azure Active Directory (AD). It outlines key concepts in both identity solutions and explains how it's different or similar.
44
services: active-directory
55
author: martincoetzer
6-
manager: karenhoran
6+
manager: rkarlin
77
tags: azuread
88
ms.service: active-directory
99
ms.topic: conceptual

articles/active-directory/fundamentals/active-directory-data-storage-australia-newzealand.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: Customer data storage for Australian and New Zealand customers - Azure AD
33
description: Learn about where Azure Active Directory stores customer-related data for its Australian and New Zealand customers.
44
services: active-directory
5-
author: ajburnle
6-
manager: karenhoran
7-
ms.author: ajburnle
5+
author: barclayn
6+
manager: rkarlin
7+
ms.author: barclayn
88

99
ms.service: active-directory
1010
ms.subservice: fundamentals

articles/active-directory/fundamentals/active-directory-data-storage-australia.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
title: Identity data storage for Australian and New Zealand customers - Azure AD
33
description: Learn about where Azure Active Directory stores identity-related data for its Australian and New Zealand customers.
44
services: active-directory
5-
author: ajburnle
6-
manager: karenhoran
7-
ms.author: ajburnle
5+
author: barclayn
6+
manager: rkarlin
7+
ms.author: barclayn
88

99
ms.service: active-directory
1010
ms.subservice: fundamentals

0 commit comments

Comments
 (0)