Skip to content

Commit f5b3658

Browse files
authored
Merge pull request #112952 from mmacy/msid-adal-tracking-metadata
[msid] ms.custom: has-adal-ref
2 parents 3ebf54c + 745e114 commit f5b3658

File tree

38 files changed

+480
-471
lines changed

38 files changed

+480
-471
lines changed

articles/active-directory/authentication/active-directory-certificate-based-authentication-get-started.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ manager: daveba
1414
ms.reviewer: annaba
1515

1616
ms.collection: M365-identity-device-management
17+
ms.custom: has-adal-ref
1718
---
1819
# Get started with certificate-based authentication in Azure Active Directory
1920

@@ -42,7 +43,7 @@ To configure certificate-based authentication, the following statements must be
4243
- A client certificate for client authentication must have been issued to your client.
4344

4445
>[!IMPORTANT]
45-
>The maximum size of a CRL for Azure Active Directory to successfully download and cache is 20MB, and the time required to download the CRL must not exceed 10 seconds. If Azure Active Directory can't download a CRL, certificate based authentications using certificates issued by the corresponding CA will fail. Best practices to ensure CRL files are within size constraints are to keep certificate lifetimes to within reasonable limits and to clean up expired certificates.
46+
>The maximum size of a CRL for Azure Active Directory to successfully download and cache is 20MB, and the time required to download the CRL must not exceed 10 seconds. If Azure Active Directory can't download a CRL, certificate based authentications using certificates issued by the corresponding CA will fail. Best practices to ensure CRL files are within size constraints are to keep certificate lifetimes to within reasonable limits and to clean up expired certificates.
4647
4748
## Step 1: Select your device platform
4849

articles/active-directory/authentication/howto-mfa-nps-extension-errors.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ manager: daveba
1414
ms.reviewer: michmcla
1515

1616
ms.collection: M365-identity-device-management
17+
ms.custom: has-adal-ref
1718
---
1819
# Resolve error messages from the NPS extension for Azure Multi-Factor Authentication
1920

@@ -63,9 +64,9 @@ If you encounter errors with the NPS extension for Azure Multi-Factor Authentica
6364

6465
Sometimes, your users may get messages from Multi-Factor Authentication because their authentication request failed. These aren't errors in the product of configuration, but are intentional warnings explaining why an authentication request was denied.
6566

66-
| Error code | Error message | Recommended steps |
67+
| Error code | Error message | Recommended steps |
6768
| ---------- | ------------- | ----------------- |
68-
| **OathCodeIncorrect** | Wrong code entered\OATH Code Incorrect | The user entered the wrong code. Have them try again by requesting a new code or signing in again. |
69+
| **OathCodeIncorrect** | Wrong code entered\OATH Code Incorrect | The user entered the wrong code. Have them try again by requesting a new code or signing in again. |
6970
| **SMSAuthFailedMaxAllowedCodeRetryReached** | Maximum allowed code retry reached | The user failed the verification challenge too many times. Depending on your settings, they may need to be unblocked by an admin now. |
7071
| **SMSAuthFailedWrongCodeEntered** | Wrong code entered/Text Message OTP Incorrect | The user entered the wrong code. Have them try again by requesting a new code or signing in again. |
7172

articles/active-directory/b2b/code-samples.md

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: mimart
1212
author: msmimart
1313
manager: celestedg
1414
ms.reviewer: elisolMS
15-
ms.custom: "it-pro, seo-update-azuread-jan"
15+
ms.custom: it-pro, seo-update-azuread-jan, has-adal-ref
1616
ms.collection: M365-identity-device-management
1717
---
1818

@@ -23,7 +23,7 @@ You can bulk-invite external users to an organization from email addresses that
2323

2424
1. Prepare the .CSV file
2525
Create a new CSV file and name it invitations.csv. In this example, the file is saved in C:\data, and contains the following information:
26-
26+
2727
Name | InvitedUserEmailAddress
2828
--------------------- | --------------------------
2929
Gmail B2B Invitee | [email protected]
@@ -72,44 +72,44 @@ namespace SampleInviteApp
7272
/// Microsoft Graph resource.
7373
/// </summary>
7474
static readonly string GraphResource = "https://graph.microsoft.com";
75-
75+
7676
/// <summary>
7777
/// Microsoft Graph invite endpoint.
7878
/// </summary>
7979
static readonly string InviteEndPoint = "https://graph.microsoft.com/v1.0/invitations";
80-
80+
8181
/// <summary>
8282
///  Authentication endpoint to get token.
8383
/// </summary>
8484
static readonly string EstsLoginEndpoint = "https://login.microsoftonline.com";
85-
85+
8686
/// <summary>
8787
/// This is the tenantid of the tenant you want to invite users to.
8888
/// </summary>
8989
private static readonly string TenantID = "";
90-
90+
9191
/// <summary>
9292
/// This is the application id of the application that is registered in the above tenant.
9393
/// The required scopes are available in the below link.
9494
/// https://developer.microsoft.com/graph/docs/api-reference/v1.0/api/invitation_post
9595
/// </summary>
9696
private static readonly string TestAppClientId = "";
97-
97+
9898
/// <summary>
9999
/// Client secret of the application.
100100
/// </summary>
101101
private static readonly string TestAppClientSecret = @"";
102-
102+
103103
/// <summary>
104104
/// This is the email address of the user you want to invite.
105105
/// </summary>
106106
private static readonly string InvitedUserEmailAddress = @"";
107-
107+
108108
/// <summary>
109109
/// This is the display name of the user you want to invite.
110110
/// </summary>
111111
private static readonly string InvitedUserDisplayName = @"";
112-
112+
113113
/// <summary>
114114
/// Main method.
115115
/// </summary>
@@ -119,7 +119,7 @@ namespace SampleInviteApp
119119
Invitation invitation = CreateInvitation();
120120
SendInvitation(invitation);
121121
}
122-
122+
123123
/// <summary>
124124
/// Create the invitation object.
125125
/// </summary>
@@ -134,25 +134,25 @@ namespace SampleInviteApp
134134
invitation.SendInvitationMessage = true;
135135
return invitation;
136136
}
137-
137+
138138
/// <summary>
139139
/// Send the guest user invite request.
140140
/// </summary>
141141
/// <param name="invitation">Invitation object.</param>
142142
private static void SendInvitation(Invitation invitation)
143143
{
144144
string accessToken = GetAccessToken();
145-
145+
146146
HttpClient httpClient = GetHttpClient(accessToken);
147-
148-
// Make the invite call.
147+
148+
// Make the invite call.
149149
HttpContent content = new StringContent(JsonConvert.SerializeObject(invitation));
150150
content.Headers.Add("ContentType", "application/json");
151151
var postResponse = httpClient.PostAsync(InviteEndPoint, content).Result;
152152
string serverResponse = postResponse.Content.ReadAsStringAsync().Result;
153153
Console.WriteLine(serverResponse);
154154
}
155-
155+
156156
/// <summary>
157157
/// Get the HTTP client.
158158
/// </summary>
@@ -170,15 +170,15 @@ namespace SampleInviteApp
170170
httpClient.DefaultRequestHeaders.GetValues("client-request-id").Single());
171171
return httpClient;
172172
}
173-
173+
174174
/// <summary>
175175
/// Get the access token for our application to talk to Microsoft Graph.
176176
/// </summary>
177177
/// <returns>Returns the access token for our application to talk to Microsoft Graph.</returns>
178178
private static string GetAccessToken()
179179
{
180180
string accessToken = null;
181-
181+
182182
// Get the access token for our application to talk to Microsoft Graph.
183183
try
184184
{
@@ -194,10 +194,10 @@ namespace SampleInviteApp
194194
Console.WriteLine("An exception was thrown while fetching the token: {0}.", ex);
195195
throw;
196196
}
197-
197+
198198
return accessToken;
199199
}
200-
200+
201201
/// <summary>
202202
/// Invitation class.
203203
/// </summary>
@@ -207,17 +207,17 @@ namespace SampleInviteApp
207207
/// Gets or sets display name.
208208
/// </summary>
209209
public string InvitedUserDisplayName { get; set; }
210-
210+
211211
/// <summary>
212212
/// Gets or sets display name.
213213
/// </summary>
214214
public string InvitedUserEmailAddress { get; set; }
215-
215+
216216
/// <summary>
217217
/// Gets or sets a value indicating whether Invitation Manager should send the email to InvitedUser.
218218
/// </summary>
219219
public bool SendInvitationMessage { get; set; }
220-
220+
221221
/// <summary>
222222
/// Gets or sets invitation redirect URL
223223
/// </summary>
@@ -231,4 +231,3 @@ namespace SampleInviteApp
231231
## Next steps
232232

233233
- [What is Azure AD B2B collaboration?](what-is-b2b.md)
234-

articles/active-directory/develop/consent-framework.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure AD consent framework
2+
title: Azure AD consent framework
33
titleSuffix: Microsoft identity platform
44
description: Learn about the consent framework in Azure Active Directory and how it makes it easy to develop multi-tenant web and native client applications.
55
services: active-directory
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.date: 11/30/2018
1414
ms.author: ryanwi
1515
ms.reviewer: zachowd, lenalepa, jesakowi
16-
ms.custom: aaddev
16+
ms.custom: aaddev, has-adal-ref
1717
---
1818

1919
# Azure Active Directory consent framework

articles/active-directory/devices/troubleshoot-hybrid-join-windows-current.md

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ ms.reviewer: jairoc
1616
#Customer intent: As an IT admin, I want to fix issues with my hybrid Azure AD joined devices so that my users can use this feature.
1717

1818
ms.collection: M365-identity-device-management
19+
ms.custom: has-adal-ref
1920
---
20-
# Troubleshooting hybrid Azure Active Directory joined devices
21+
# Troubleshooting hybrid Azure Active Directory joined devices
2122

2223
The content of this article is applicable to devices running Windows 10 or Windows Server 2016.
2324

@@ -29,13 +30,13 @@ This article assumes that you have [configured hybrid Azure Active Directory joi
2930
- [Enterprise roaming of settings](../active-directory-windows-enterprise-state-roaming-overview.md)
3031
- [Windows Hello for Business](../active-directory-azureadjoin-passport-deployment.md)
3132

32-
This document provides troubleshooting guidance to resolve potential issues.
33+
This document provides troubleshooting guidance to resolve potential issues.
3334

3435
For Windows 10 and Windows Server 2016, hybrid Azure Active Directory join supports the Windows 10 November 2015 Update and above.
3536

3637
## Troubleshoot join failures
3738

38-
### Step 1: Retrieve the join status
39+
### Step 1: Retrieve the join status
3940

4041
**To retrieve the join status:**
4142

@@ -87,22 +88,22 @@ WamDefaultAuthority: organizations
8788
AzureAdPrt: YES
8889
```
8990

90-
### Step 2: Evaluate the join status
91+
### Step 2: Evaluate the join status
9192

9293
Review the following fields and make sure that they have the expected values:
9394

94-
#### DomainJoined : YES
95+
#### DomainJoined : YES
9596

96-
This field indicates whether the device is joined to an on-premises Active Directory or not. If the value is **NO**, the device cannot perform a hybrid Azure AD join.
97+
This field indicates whether the device is joined to an on-premises Active Directory or not. If the value is **NO**, the device cannot perform a hybrid Azure AD join.
9798

98-
#### WorkplaceJoined : NO
99+
#### WorkplaceJoined : NO
99100

100101
This field indicates whether the device is registered with Azure AD as a personal device (marked as *Workplace Joined*). This value should be **NO** for a domain-joined computer that is also hybrid Azure AD joined. If the value is **YES**, a work or school account was added prior to the completion of the hybrid Azure AD join. In this case, the account is ignored when using the Anniversary Update version of Windows 10 (1607).
101102

102-
#### AzureAdJoined : YES
103+
#### AzureAdJoined : YES
103104

104105
This field indicates whether the device is joined. The value will be **YES** if the device is either an Azure AD joined device or a hybrid Azure AD joined device.
105-
If the value is **NO**, the join to Azure AD has not completed yet.
106+
If the value is **NO**, the join to Azure AD has not completed yet.
106107

107108
Proceed to next steps for further troubleshooting.
108109

@@ -154,7 +155,7 @@ Possible reasons for failure:
154155
- A valid SCP object is required in the AD forest, to which the device belongs, that points to a verified domain name in Azure AD.
155156
- Details can be found in the section [Configure a Service Connection Point](hybrid-azuread-join-federated-domains.md#configure-hybrid-azure-ad-join).
156157
- Failure to connect and fetch the discovery metadata from the discovery endpoint.
157-
- The device should be able to access `https://enterpriseregistration.windows.net`, in the SYSTEM context, to discover the registration and authorization endpoints.
158+
- The device should be able to access `https://enterpriseregistration.windows.net`, in the SYSTEM context, to discover the registration and authorization endpoints.
158159
- If the on-premises environment requires an outbound proxy, the IT admin must ensure that the computer account of the device is able to discover and silently authenticate to the outbound proxy.
159160
- Failure to connect to user realm endpoint and perform realm discovery. (Windows 10 version 1809 and later only)
160161
- The device should be able to access `https://login.microsoftonline.com`, in the SYSTEM context, to perform realm discovery for the verified domain and determine the domain type (managed/federated).
@@ -172,7 +173,7 @@ Possible reasons for failure:
172173
- Reason: Operation timed out while performing Discovery.
173174
- Resolution: Ensure that `https://enterpriseregistration.windows.net` is accessible in the SYSTEM context. For more information, see the section [Network connectivity requirements](hybrid-azuread-join-managed-domains.md#prerequisites).
174175
- **DSREG_AUTOJOIN_USERREALM_DISCOVERY_FAILED** (0x801c0021/-2145648611)
175-
- Reason: Generic Realm Discovery failure. Failed to determine domain type (managed/federated) from STS.
176+
- Reason: Generic Realm Discovery failure. Failed to determine domain type (managed/federated) from STS.
176177
- Resolution: Find the suberror below to investigate further.
177178

178179
**Common suberror codes:**
@@ -259,7 +260,7 @@ Use Event Viewer logs to locate the error code, suberror code, server error code
259260

260261
- **ERROR_ADAL_PROTOCOL_NOT_SUPPORTED** (0xcaa90017/-894894057)
261262
- Reason: Authentication protocol is not WS-Trust.
262-
- Resolution: The on-premises identity provider must support WS-Trust
263+
- Resolution: The on-premises identity provider must support WS-Trust
263264
- **ERROR_ADAL_FAILED_TO_PARSE_XML** (0xcaa9002c/-894894036)
264265
- Reason: On-premises federation service did not return an XML response.
265266
- Resolution: Ensure MEX endpoint is returning a valid XML. Ensure proxy is not interfering and returning non-xml responses.
@@ -277,7 +278,7 @@ Use Event Viewer logs to locate the error code, suberror code, server error code
277278
- Resolution: Retry after sometime or try joining from an alternate stable network location.
278279
- **ERROR_ADAL_INTERNET_SECURE_FAILURE** (0xcaa82f8f/-894947441)
279280
- Reason: The Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL), certificate sent by the server could not be validated.
280-
- Resolution: Check the client time skew. Retry after sometime or try joining from an alternate stable network location.
281+
- Resolution: Check the client time skew. Retry after sometime or try joining from an alternate stable network location.
281282
- **ERROR_ADAL_INTERNET_CANNOT_CONNECT** (0xcaa82efd/-894947587)
282283
- Reason: The attempt to connect to `https://login.microsoftonline.com` failed.
283284
- Resolution: Check network connection to `https://login.microsoftonline.com`.
@@ -292,11 +293,11 @@ Use Event Viewer logs to locate the error code, suberror code, server error code
292293
- Resolution: Check the federation server settings. Look for the server error code in the authentication logs.
293294
- **ERROR_ADAL_WSTRUST_TOKEN_REQUEST_FAIL** (0xcaa90006/-894894074)
294295
- Reason: Received an error when trying to get access token from the token endpoint.
295-
- Resolution: Look for the underlying error in the ADAL log.
296+
- Resolution: Look for the underlying error in the ADAL log.
296297
- **ERROR_ADAL_OPERATION_PENDING** (0xcaa1002d/-895418323)
297298
- Reason: General ADAL failure
298299
- Resolution: Look for the suberror code or server error code from the authentication logs.
299-
300+
300301
#### Join Phase
301302

302303
Reasons for failure:
@@ -336,7 +337,7 @@ Use Event Viewer logs to locate the phase and errorcode for the join failures.
336337
- Reason: Received an error response from DRS with ErrorCode: "DirectoryError"
337338
- Resolution: Refer to the server error code for possible reasons and resolutions.
338339
- **DSREG_E_DEVICE_AUTHENTICATION_ERROR** (0x801c0002/-2145648638)
339-
- Reason: Received an error response from DRS with ErrorCode: "AuthenticationError" and ErrorSubCode is NOT "DeviceNotFound".
340+
- Reason: Received an error response from DRS with ErrorCode: "AuthenticationError" and ErrorSubCode is NOT "DeviceNotFound".
340341
- Resolution: Refer to the server error code for possible reasons and resolutions.
341342
- **DSREG_E_DEVICE_INTERNALSERVICE_ERROR** (0x801c0006/-2145648634)
342343
- Reason: Received an error response from DRS with ErrorCode: "DirectoryError"
@@ -348,7 +349,7 @@ Use Event Viewer logs to locate the phase and errorcode for the join failures.
348349
- Reason: TPM operation failed or was invalid
349350
- Resolution: Likely due to a bad sysprep image. Ensure the machine from which the sysprep image was created is not Azure AD joined, hybrid Azure AD joined, or Azure AD registered.
350351
- **TPM_E_PCP_INTERNAL_ERROR** (0x80290407/-2144795641)
351-
- Reason: Generic TPM error.
352+
- Reason: Generic TPM error.
352353
- Resolution: Disable TPM on devices with this error. Windows 10 version 1809 and higher automatically detects TPM failures and completes hybrid Azure AD join without using the TPM.
353354
- **TPM_E_NOTFIPS** (0x80280036/-2144862154)
354355
- Reason: TPM in FIPS mode not currently supported.
@@ -397,20 +398,20 @@ Download the file Auth.zip from [https://github.com/CSS-Windows/WindowsDiag/tree
397398

398399
## Troubleshoot Post-Join issues
399400

400-
### Retrieve the join status
401+
### Retrieve the join status
401402

402403
#### WamDefaultSet: YES and AzureADPrt: YES
403-
404-
These fields indicate whether the user has successfully authenticated to Azure AD when signing in to the device.
404+
405+
These fields indicate whether the user has successfully authenticated to Azure AD when signing in to the device.
405406
If the values are **NO**, it could be due:
406407

407408
- Bad storage key in the TPM associated with the device upon registration (check the KeySignTest while running elevated).
408409
- Alternate Login ID
409410
- HTTP Proxy not found
410411

411412
## Known issues
412-
- Under Settings -> Accounts -> Access Work or School, Hybrid Azure AD joined devices may show two different accounts, one for Azure AD and one for on-premises AD, when connected to mobile hotspots or external WiFi networks. This is only a UI issue and does not have any impact on functionality.
413-
413+
- Under Settings -> Accounts -> Access Work or School, Hybrid Azure AD joined devices may show two different accounts, one for Azure AD and one for on-premises AD, when connected to mobile hotspots or external WiFi networks. This is only a UI issue and does not have any impact on functionality.
414+
414415
## Next steps
415416

416417
Continue [troubleshooting devices using the dsregcmd command](troubleshoot-device-dsregcmd.md)

0 commit comments

Comments
 (0)