Skip to content

Commit c02b207

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 8e79fbd + 8226266 commit c02b207

File tree

597 files changed

+11585
-5766
lines changed

Some content is hidden

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

597 files changed

+11585
-5766
lines changed

.openpublishing.redirection.healthcare-apis.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,15 +586,19 @@
586586
"redirect_document_id": false
587587
},
588588
{ "source_path_from_root": "/articles/healthcare-apis/iot/iot-data-flow.md",
589-
"redirect_url": "/azure/healthcare-apis/iot/understand-service",
589+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-data-processing-stages",
590590
"redirect_document_id": false
591591
},
592592
{ "source_path_from_root": "/articles/healthcare-apis/iot/data-flow.md",
593-
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-message-processing-stages",
593+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-data-processing-stages",
594594
"redirect_document_id": false
595595
},
596596
{ "source_path_from_root": "/articles/healthcare-apis/iot/understand-service.md",
597-
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-message-processing-stages",
597+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-data-processing-stages",
598+
"redirect_document_id": false
599+
},
600+
{ "source_path_from_root": "/articles/healthcare-apis/iot/overview-of-device-message-processing-stages.md",
601+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-data-processing-stages",
598602
"redirect_document_id": false
599603
},
600604
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-device-mappings.md",
@@ -654,7 +658,11 @@
654658
"redirect_document_id": false
655659
},
656660
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings.md",
657-
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontenttemplate-mappings",
661+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings",
662+
"redirect_document_id": false
663+
},
664+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iotjsonpathcontenttemplate-mappings.md",
665+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontent-mappings",
658666
"redirect_document_id": false
659667
},
660668
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-button.md",

articles/active-directory-b2c/custom-policies-series-call-rest-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ You need to deploy an app, which will serve as your external app. Your custom po
8888
"code" : "errorCode",
8989
"requestId": "requestId",
9090
"userMessage" : "The access code you entered is incorrect. Please try again.",
91-
"developerMessage" : `The The provided code ${req.body.accessCode} does not match the expected code for user.`,
91+
"developerMessage" : `The provided code ${req.body.accessCode} does not match the expected code for user.`,
9292
"moreInfo" :"https://docs.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
9393
};
9494
res.status(409).send(errorResponse);
@@ -133,7 +133,7 @@ You need to deploy an app, which will serve as your external app. Your custom po
133133
"code": "errorCode",
134134
"requestId": "requestId",
135135
"userMessage": "The access code you entered is incorrect. Please try again.",
136-
"developerMessage": "The The provided code 54321 does not match the expected code for user.",
136+
"developerMessage": "The provided code 54321 does not match the expected code for user.",
137137
"moreInfo": "https://docs.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
138138
}
139139
```

articles/active-directory-b2c/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ summary: >
77
brand: azure
88

99
metadata:
10-
title: Azure Active Directory B2C documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
11-
description: Learn how to use Azure Active Directory B2C to customize and control how customers sign up, sign in, and manage their profiles when using your applications. # Required; article description that is displayed in search results. < 160 chars.
10+
title: Azure Active Directory B2C documentation
11+
description: Learn how to use Azure Active Directory B2C to customize and control how customers sign up, sign in, and manage their profiles when using your applications.
1212
services: active-directory-b2c
1313
ms.service: active-directory
1414
ms.subservice: B2C

articles/active-directory/app-provisioning/how-provisioning-works.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ originalUserPrincipalName = alias_theirdomain#EXT#@yourdomain
8888

8989
## Provisioning cycles: Initial and incremental
9090

91-
When Azure AD is the source system, the provisioning service uses the [Use delta query to track changes in Microsoft Graph data](/graph/delta-query-overview) to monitor users and groups. The provisioning service runs an initial cycle against the source system and target system, followed by periodic incremental cycles.
91+
When Azure AD is the source system, the provisioning service uses the [delta query to track changes in Microsoft Graph data](/graph/delta-query-overview) to monitor users and groups. The provisioning service runs an initial cycle against the source system and target system, followed by periodic incremental cycles.
9292

9393
### Initial cycle
9494

articles/active-directory/authentication/howto-sspr-deployment.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ To quickly see SSPR in action and then come back to understand additional deploy
3838
> [!div class="nextstepaction"]
3939
> [Enable self-service password reset (SSPR)](tutorial-enable-sspr.md)
4040
41+
> [!TIP]
42+
> As a companion to this article, we recommend using the [Plan your self-service password reset deployment guide](https://go.microsoft.com/fwlink/?linkid=2221501) when signed in to the Microsoft 365 Admin Center. This guide will customize your experience based on your environment. To review best practices without signing in and activating automated setup features, go to the [M365 Setup portal](https://go.microsoft.com/fwlink/?linkid=2221600).
43+
4144
## Learn about SSPR
4245

4346
Learn more about SSPR. See [How it works: Azure AD self-service password reset](./concept-sspr-howitworks.md).

articles/active-directory/develop/application-model.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ For an identity provider to know that a user has access to a particular app, bot
2828
* Decide if you want to allow users to sign in only if they belong to your organization. This architecture is known as a single-tenant application. Or, you can allow users to sign in by using any work or school account, which is known as a multi-tenant application. You can also allow personal Microsoft accounts or a social account from LinkedIn, Google, and so on.
2929
* Request scope permissions. For example, you can request the "user.read" scope, which grants permission to read the profile of the signed-in user.
3030
* Define scopes that define access to your web API. Typically, when an app wants to access your API, it will need to request permissions to the scopes you define.
31-
* Share a secret with the Microsoft identity platform that proves the app's identity. Using a secret is relevant in the case where the app is a confidential client application. A confidential client application is an application that can hold credentials securely. A trusted back-end server is required to store the credentials.
31+
* Share a secret with the Microsoft identity platform that proves the app's identity. Using a secret is relevant in the case where the app is a confidential client application. A confidential [client application](developer-glossary.md#client-application) is an application that can hold credentials securely, like a [web client](developer-glossary.md#web-client). A trusted back-end server is required to store the credentials.
3232

33-
After the app is registered, it's given a unique identifier that it shares with the Microsoft identity platform when it requests tokens. If the app is a [confidential client application](developer-glossary.md#client-application), it will also share the secret or the public key depending on whether certificates or secrets were used.
33+
After the app is registered, it's given a unique identifier that it shares with the Microsoft identity platform when it requests tokens. If the app is a confidential client application, it will also share the secret or the public key depending on whether certificates or secrets were used.
3434

3535
The Microsoft identity platform represents applications by using a model that fulfills two main functions:
3636

@@ -44,14 +44,14 @@ The Microsoft identity platform:
4444
* Provides infrastructure for implementing app provisioning within the app developer's tenant, and to any other Azure AD tenant.
4545
* Handles user consent during token request time and facilitates the dynamic provisioning of apps across tenants.
4646

47-
*Consent* is the process of a resource owner granting authorization for a client application to access protected resources, under specific permissions, on behalf of the resource owner. The Microsoft identity platform enables:
47+
[*Consent*](developer-glossary.md#consent) is the process of a resource owner granting authorization for a client application to access protected resources, under specific permissions, on behalf of the resource owner. The Microsoft identity platform enables:
4848

4949
* Users and administrators to dynamically grant or deny consent for the app to access resources on their behalf.
5050
* Administrators to ultimately decide what apps are allowed to do and which users can use specific apps, and how the directory resources are accessed.
5151

5252
## Multi-tenant apps
5353

54-
In the Microsoft identity platform, an [application object](developer-glossary.md#application-object) describes an application. At deployment time, the Microsoft identity platform uses the application object as a blueprint to create a [service principal](developer-glossary.md#service-principal-object), which represents a concrete instance of an application within a directory or tenant. The service principal defines what the app can actually do in a specific target directory, who can use it, what resources it has access to, and so on. The Microsoft identity platform creates a service principal from an application object through [consent](developer-glossary.md#consent).
54+
In the Microsoft identity platform, an [application object](developer-glossary.md#application-object) describes an application. At deployment time, the Microsoft identity platform uses the application object as a blueprint to create a [service principal](developer-glossary.md#service-principal-object), which represents a concrete instance of an application within a directory or tenant. The service principal defines what the app can actually do in a specific target directory, who can use it, what resources it has access to, and so on. The Microsoft identity platform creates a service principal from an application object through consent.
5555

5656
The following diagram shows a simplified Microsoft identity platform provisioning flow driven by consent. It shows two tenants: *A* and *B*.
5757

articles/active-directory/develop/reference-aadsts-error-codes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ The `error` field has several possible values - review the protocol documentatio
165165
| AADSTS50143 | Session mismatch - Session is invalid because user tenant doesn't match the domain hint due to different resource. [Open a support ticket](../fundamentals/active-directory-troubleshooting-support-howto.md) with Correlation ID, Request ID, and Error code to get more details. |
166166
| AADSTS50144 | InvalidPasswordExpiredOnPremPassword - User's Active Directory password has expired. Generate a new password for the user or have the user use the self-service reset tool to reset their password. |
167167
| AADSTS50146 | MissingCustomSigningKey - This app is required to be configured with an app-specific signing key. It is either not configured with one, or the key has expired or isn't yet valid. Please contact the owner of the application. |
168+
| AADSTS501461 | AcceptMappedClaims is only supported for a token audience matching the application GUID or an audience within the tenant's verified domains. Either change the resource identifier, or use an application-specific signing key. |
168169
| AADSTS50147 | MissingCodeChallenge - The size of the code challenge parameter isn't valid. |
169170
| AADSTS501481 | The Code_Verifier doesn't match the code_challenge supplied in the authorization request.|
170171
| AADSTS501491 | InvalidCodeChallengeMethodInvalidSize - Invalid size of Code_Challenge parameter.|
@@ -183,7 +184,7 @@ The `error` field has several possible values - review the protocol documentatio
183184
| AADSTS50194 | Application '{appId}'({appName}) isn't configured as a multi-tenant application. Usage of the /common endpoint isn't supported for such applications created after '{time}'. Use a tenant-specific endpoint or configure the application to be multi-tenant. |
184185
| AADSTS50196 | LoopDetected - A client loop has been detected. Check the app’s logic to ensure that token caching is implemented, and that error conditions are handled correctly. The app has made too many of the same request in too short a period, indicating that it is in a faulty state or is abusively requesting tokens. |
185186
| AADSTS50197 | ConflictingIdentities - The user could not be found. Try signing in again. |
186-
| AADSTS50199 | CmsiInterrupt - For security reasons, user confirmation is required for this request. Because this is an "interaction_required" error, the client should do interactive auth. This occurs because a system webview has been used to request a token for a native application - the user must be prompted to ask if this was actually the app they meant to sign into. To avoid this prompt, the redirect URI should be part of the following safe list: <br />http://<br />https://<br />chrome-extension:// (desktop Chrome browser only) |
187+
| AADSTS50199 | CmsiInterrupt - For security reasons, user confirmation is required for this request. Interrupt is shown for all scheme redirects in mobile browsers. <br />No action required. The user was asked to confirm that this app is the application they intended to sign into. <br />This is a security feature that helps prevent spoofing attacks. This occurs because a system webview has been used to request a token for a native application. <br />To avoid this prompt, the redirect URI should be part of the following safe list: <br />http://<br />https://<br />chrome-extension:// (desktop Chrome browser only) |
187188
| AADSTS51000 | RequiredFeatureNotEnabled - The feature is disabled. |
188189
| AADSTS51001 | DomainHintMustbePresent - Domain hint must be present with on-premises security identifier or on-premises UPN. |
189190
| AADSTS1000104| XCB2BResourceCloudNotAllowedOnIdentityTenant - Resource cloud {resourceCloud} isn't allowed on identity tenant {identityTenant}. {resourceCloud} - cloud instance which owns the resource. {identityTenant} - is the tenant where signing-in identity is originated from. |

articles/active-directory/develop/reference-app-manifest.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: develop
99
ms.topic: reference
1010
ms.workload: identity
11-
ms.date: 05/19/2022
11+
ms.date: 04/13/2023
1212
ms.author: ryanwi
1313
ms.custom: aaddev
1414
ms.reviewer: sureshja
@@ -260,9 +260,9 @@ Example:
260260
"keyCredentials": [
261261
{
262262
"customKeyIdentifier":null,
263-
"endDate":"2018-09-13T00:00:00Z",
263+
"endDateTime":"2018-09-13T00:00:00Z",
264264
"keyId":"<guid>",
265-
"startDate":"2017-09-12T00:00:00Z",
265+
"startDateTime":"2017-09-12T00:00:00Z",
266266
"type":"AsymmetricX509Cert",
267267
"usage":"Verify",
268268
"value":null
@@ -425,10 +425,12 @@ Example:
425425
"passwordCredentials": [
426426
{
427427
"customKeyIdentifier": null,
428-
"endDate": "2018-10-19T17:59:59.6521653Z",
428+
"displayName": "Generated by App Service",
429+
"endDateTime": "2022-10-19T17:59:59.6521653Z",
430+
"hint": "Nsn",
429431
"keyId": "<guid>",
430-
"startDate":"2016-10-19T17:59:59.6521653Z",
431-
"value":null
432+
"secretText": null,
433+
"startDateTime":"2022-10-19T17:59:59.6521653Z"
432434
}
433435
],
434436
```
@@ -638,4 +640,4 @@ Use the following comments section to provide feedback that helps refine and sha
638640
[IMPLICIT-GRANT]:v1-oauth2-implicit-grant-flow.md
639641
[INTEGRATING-APPLICATIONS-AAD]: ./quickstart-register-app.md
640642
[O365-PERM-DETAILS]: /graph/permissions-reference
641-
[RBAC-CLOUD-APPS-AZUREAD]: http://www.dushyantgill.com/blog/2014/12/10/roles-based-access-control-in-cloud-applications-using-azure-ad/
643+
[RBAC-CLOUD-APPS-AZUREAD]: http://www.dushyantgill.com/blog/2014/12/10/roles-based-access-control-in-cloud-applications-using-azure-ad/

0 commit comments

Comments
 (0)