Skip to content

Commit e5e652d

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-preview-vmware
2 parents 15f8fa6 + 17dd176 commit e5e652d

File tree

335 files changed

+6871
-2327
lines changed

Some content is hidden

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

335 files changed

+6871
-2327
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52079,6 +52079,11 @@
5207952079
"source_path": "articles/sql-database/sql-database-auditing-and-threat-detection-powershell.md",
5208052080
"redirect_url": "/azure/sql-database/scripts/sql-database-auditing-and-threat-detection-powershell",
5208152081
"redirect_document_id": true
52082+
},
52083+
{
52084+
"source_path": "articles/media-services/azure-media-player/azure-media-player-license.md",
52085+
"redirect_url": "/legal/azure-media-player/azure-media-player-license",
52086+
"redirect_document_id": false
5208252087
}
5208352088
]
5208452089
}

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/develop/reference-aadsts-error-codes.md

Lines changed: 6 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.workload: identity
1111
ms.topic: reference
12-
ms.date: 04/07/2020
12+
ms.date: 04/30/2020
1313
ms.author: ryanwi
1414
ms.reviewer: hirsin
1515
ms.custom: aaddev
@@ -68,9 +68,9 @@ The `error` field has several possible values - review the protocol documentatio
6868
| `temporarily_unavailable` | The server is temporarily too busy to handle the request. | Retry the request. The client application might explain to the user that its response is delayed because of a temporary condition. |
6969

7070
## Lookup current error code information
71-
Error codes and messages are subject to change. For the most current info, take a look at the `https://login.microsoftonline.com/error` page to find AADSTS error descriptions, fixes, and some suggested workarounds.
71+
Error codes and messages are subject to change. For the most current info, take a look at the [https://login.microsoftonline.com/error](https://login.microsoftonline.com/error) page to find AADSTS error descriptions, fixes, and some suggested workarounds.
7272

73-
Search on the numeric part of the returned error code. For example, if you received the error code "AADSTS16000" then do a search in `https://login.microsoftonline.com/error` for "16000". You can also link directly to a specific error by adding the error code number to the URL: `https://login.microsoftonline.com/error?code=16000`.
73+
Search on the numeric part of the returned error code. For example, if you received the error code "AADSTS16000" then do a search in [https://login.microsoftonline.com/error](https://login.microsoftonline.com/error) for "16000". You can also link directly to a specific error by adding the error code number to the URL: [https://login.microsoftonline.com/error?code=16000](https://login.microsoftonline.com/error?code=16000).
7474

7575
## AADSTS error codes
7676

@@ -185,6 +185,7 @@ Search on the numeric part of the returned error code. For example, if you rece
185185
| AADSTS65001 | DelegationDoesNotExist - The user or administrator has not consented to use the application with ID X. Send an interactive authorization request for this user and resource. |
186186
| AADSTS65004 | UserDeclinedConsent - User declined to consent to access the app. Have the user retry the sign-in and consent to the app|
187187
| AADSTS65005 | MisconfiguredApplication - The app required resource access list does not contain apps discoverable by the resource or The client app has requested access to resource, which was not specified in its required resource access list or Graph service returned bad request or resource not found. If the app supports SAML, you may have configured the app with the wrong Identifier (Entity). Try out the resolution listed for SAML using the link below: [https://docs.microsoft.com/azure/active-directory/application-sign-in-problem-federated-sso-gallery#no-resource-in-requiredresourceaccess-list](https://docs.microsoft.com/azure/active-directory/application-sign-in-problem-federated-sso-gallery?/?WT.mc_id=DMC_AAD_Manage_Apps_Troubleshooting_Nav) |
188+
| AADSTS650052 | The app needs access to a service `(\"{name}\")` that your organization `\"{organization}\"` has not subscribed to or enabled. Contact your IT Admin to review the configuration of your service subscriptions. |
188189
| AADSTS67003 | ActorNotValidServiceIdentity |
189190
| AADSTS70000 | InvalidGrant - Authentication failed. The refresh token is not valid. Error may be due to the following reasons:<ul><li>Token binding header is empty</li><li>Token binding hash does not match</li></ul> |
190191
| AADSTS70001 | UnauthorizedClient - The application is disabled. |
@@ -202,6 +203,7 @@ Search on the numeric part of the returned error code. For example, if you rece
202203
| AADSTS75001 | BindingSerializationError - An error occurred during SAML message binding. |
203204
| AADSTS75003 | UnsupportedBindingError - The app returned an error related to unsupported binding (SAML protocol response cannot be sent via bindings other than HTTP POST). |
204205
| AADSTS75005 | Saml2MessageInvalid - Azure AD doesn’t support the SAML request sent by the app for SSO. |
206+
| AADSTS7500514 | A supported type of SAML response was not found. The supported response types are 'Response' (in XML namespace 'urn:oasis:names:tc:SAML:2.0:protocol') or 'Assertion' (in XML namespace 'urn:oasis:names:tc:SAML:2.0:assertion'). Application error - the developer will handle this error.|
205207
| AADSTS75008 | RequestDeniedError - The request from the app was denied since the SAML request had an unexpected destination. |
206208
| AADSTS75011 | NoMatchedAuthnContextInOutputClaims - The authentication method by which the user authenticated with the service doesn't match requested authentication method. |
207209
| AADSTS75016 | Saml2AuthenticationRequestInvalidNameIDPolicy - SAML2 Authentication Request has invalid NameIdPolicy. |
@@ -307,6 +309,7 @@ Search on the numeric part of the returned error code. For example, if you rece
307309
| AADSTS700020 | InteractionRequired - The access grant requires interaction. |
308310
| AADSTS700022 | InvalidMultipleResourcesScope - The provided value for the input parameter scope isn't valid because it contains more than one resource. |
309311
| AADSTS700023 | InvalidResourcelessScope - The provided value for the input parameter scope isn't valid when request an access token. |
312+
| AADSTS7000215 | Invalid client secret is provided. Developer error - the app is attempting to sign in without the necessary or correct authentication parameters.|
310313
| AADSTS7000222| InvalidClientSecretExpiredKeysProvided - The provided client secret keys are expired. Visit the Azure Portal to create new keys for your app, or consider using certificate credentials for added security: https://aka.ms/certCreds |
311314
| AADSTS700005 | InvalidGrantRedeemAgainstWrongTenant - Provided Authorization Code is intended to use against other tenant, thus rejected. OAuth2 Authorization Code must be redeemed against same tenant it was acquired for (/common or /{tenant-ID} as appropriate) |
312315
| AADSTS1000000 | UserNotBoundError - The Bind API requires the Azure AD user to also authenticate with an external IDP, which hasn't happened yet. |

0 commit comments

Comments
 (0)