Skip to content

Commit 7c94986

Browse files
davidsmatlakdavidsmatlak
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-fixesbrokenlinks
2 parents d7a3ec5 + 768a914 commit 7c94986

File tree

14 files changed

+161
-125
lines changed

14 files changed

+161
-125
lines changed

‎articles/active-directory-b2c/phone-factor-technical-profile.md

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 03/26/2020
12+
ms.date: 03/31/2020
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
---
@@ -20,12 +20,11 @@ ms.subservice: B2C
2020

2121
Azure Active Directory B2C (Azure AD B2C) provides support for enrolling and verifying phone numbers. This technical profile:
2222

23-
- Provides a user interface to interact with the user.
24-
- Uses content definition to control the look and feel.
25-
- Supports both phone calls and text messages to validate the phone number.
23+
- Provides a user interface to interact with the user to verify, or enroll a phone number.
24+
- Supports phone calls and text messages to validate the phone number.
2625
- Supports multiple phone numbers. The user can select one of the phone numbers to verify.
27-
- If a phone number is provided, the phone factor user interface asks the user to verify the phone number. If not provided, it asks the user to enroll a new phone number.
28-
- Returns a claim indicating whether the user provided a new phone number. You can use this claim to decide whether the phone number should be persisted to the Azure AD user profile.
26+
- Returns a claim indicating whether the user provided a new phone number. You can use this claim to decide whether the phone number should be persisted to the Azure AD B2C user profile.
27+
- Uses a [content definition](contentdefinitions.md) to control the look and feel.
2928

3029
## Protocol
3130

@@ -41,19 +40,25 @@ The following example shows a phone factor technical profile for enrollment and
4140
</TechnicalProfile>
4241
```
4342

44-
## Input claims
43+
## Input claims transformations
4544

46-
The InputClaims element must contain following claims. You can also map the name of your claim to the name defined in the phone factor technical profile.
45+
The InputClaimsTransformations element may contain a collection of input claims transformations that are used to modify the input claims, or generate new ones. The following input claims transformation generates a `UserId` claim that is used later in the input claims collection.
4746

48-
```XML
49-
<InputClaims>
50-
<!--A unique identifier of the user. The partner claim type must be set to `UserId`. -->
51-
<InputClaim ClaimTypeReferenceId="userIdForMFA" PartnerClaimType="UserId" />
52-
<!--A claim that contains the phone number. If the claim is empty, Azure AD B2C asks the user to enroll a new phone number. Otherwise, it asks the user to verify the phone number. -->
53-
<InputClaim ClaimTypeReferenceId="strongAuthenticationPhoneNumber" />
54-
</InputClaims>
47+
```xml
48+
<InputClaimsTransformations>
49+
<InputClaimsTransformation ReferenceId="CreateUserIdForMFA" />
50+
</InputClaimsTransformations>
5551
```
5652

53+
## Input claims
54+
55+
The InputClaims element must contain the following claims. You can also map the name of your claim to the name defined in the phone factor technical profile.
56+
57+
| Data type| Required | Description |
58+
| --------- | -------- | ----------- |
59+
| string| Yes | A unique identifier for the user. The claim name, or PartnerClaimType must be set to `UserId`. This claim should not contain personal identifiable information.|
60+
| string| Yes | List of claim types. Each claim contains one phone number. If any of the input claims do not contain a phone number, the user will be asked to enroll and verify a new phone number. The validated phone number is returned as an output claim. If one of the input claims contain a phone number, the user is asked to verify it. If multiple input claims contain a phone number, the user is asked to choose and verify one of the phone numbers. |
61+
5762
The following example demonstrates using multiple phone numbers. For more information, see [sample policy](https://github.com/azure-ad-b2c/samples/tree/master/policies/mfa-add-secondarymfa).
5863

5964
```XML
@@ -64,22 +69,16 @@ The following example demonstrates using multiple phone numbers. For more inform
6469
</InputClaims>
6570
```
6671

67-
The InputClaimsTransformations element may contain a collection of InputClaimsTransformation elements that are used to modify the input claims or generate new ones before presenting them to the phone factor page.
68-
6972
## Output claims
7073

7174
The OutputClaims element contains a list of claims returned by the phone factor technical profile.
7275

73-
```xml
74-
<OutputClaims>
75-
<!-- The verified phone number. The partner claim type must be set to `Verified.OfficePhone`. -->
76-
<OutputClaim ClaimTypeReferenceId="Verified.strongAuthenticationPhoneNumber" PartnerClaimType="Verified.OfficePhone" />
77-
<!-- Indicates whether the new phone number has been entered by the user. The partner claim type must be set to `newPhoneNumberEntered`. -->
78-
<OutputClaim ClaimTypeReferenceId="newPhoneNumberEntered" PartnerClaimType="newPhoneNumberEntered" />
79-
</OutputClaims>
80-
```
76+
| Data type| Required | Description |
77+
| -------- | ----------- |----------- |
78+
| boolean | Yes | Indicates whether the new phone number has been entered by the user. The claim name, or PartnerClaimType must be set to `newPhoneNumberEntered`|
79+
| string| Yes | The verified phone number. The claim name, or PartnerClaimType must be set to `Verified.OfficePhone`.|
8180

82-
The OutputClaimsTransformations element may contain a collection of OutputClaimsTransformation elements that are used to modify the output claims or generate new ones.
81+
The OutputClaimsTransformations element may contain a collection of OutputClaimsTransformation elements that are used to modify the output claims, or generate new ones.
8382

8483
## Cryptographic keys
8584

@@ -91,7 +90,9 @@ The **CryptographicKeys** element is not used.
9190
| Attribute | Required | Description |
9291
| --------- | -------- | ----------- |
9392
| ContentDefinitionReferenceId | Yes | The identifier of the [content definition](contentdefinitions.md) associated with this technical profile. |
94-
| ManualPhoneNumberEntryAllowed| No | Specify whether or not a user is allowed to manually enter a phone number. Possible values: `true` or `false` (default).|
93+
| ManualPhoneNumberEntryAllowed| No | Specify whether or not a user is allowed to manually enter a phone number. Possible values: `true`, or `false` (default).|
94+
| setting.authenticationMode | No | The method to validate the phone number. Possible values: `sms`, `phone`, or `mixed` (default).|
95+
| setting.autodial| No| Specify whether the technical profile should auto dial or auto send an SMS. Possible values: `true`, or `false` (default). Auto dial requires the `setting.authenticationMode` metadata be set to `sms`, or `phone`. The input claims collection must have a single phone number. |
9596

9697
### UI elements
9798

@@ -100,4 +101,3 @@ The phone factor authentication page user interface elements can be [localized](
100101
## Next steps
101102

102103
- Check the [social and local accounts with MFA](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/SocialAndLocalAccountsWithMfa) starter pack.
103-

‎articles/active-directory/governance/entitlement-management-catalog-create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Create & manage resources in entitlement management - Azure AD
2+
title: Create & manage a catalog of resources in entitlement management - Azure AD
33
description: Learn how to create a new container of resources and access packages in Azure Active Directory entitlement management.
44
services: active-directory
55
documentationCenter: ''

‎articles/azure-government/documentation-government-ase-disa-cap.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ However, since DISA advertises a default route out the ExpressRoute circuit, the
3636
You will need to create new routes in the UDR for the management addresses in order to keep the ASE healthy. For Azure Government ranges see [App Service Environment management addresses](https://docs.microsoft.com/azure/app-service/environment/management-addresses
3737
)
3838

39-
Rule 1: 23.97.29.209 --> Internet
40-
Rule 2: 23.97.0.17 --> Internet
41-
Rule 3: 23.97.16.184 --> Internet
42-
Rule 4: 13.72.180.105 --> Internet
43-
Rule 5: 13.72.53.37 --> Internet
39+
* Rule 1: 23.97.29.209 --> Internet
40+
* Rule 2: 23.97.0.17 --> Internet
41+
* Rule 3: 23.97.16.184 --> Internet
42+
* Rule 4: 13.72.180.105 --> Internet
43+
* Rule 5: 13.72.53.37 --> Internet
4444

4545
Make sure the UDR is applied to the subnet your ASE is deployed to.
4646

@@ -56,16 +56,16 @@ The images below describe the default NSG rules created during the ASE creation.
5656

5757
### Service Endpoints
5858

59-
Depending what storage you are using you will be required to enable Service Endpoints for SQL and Azure Storage to access them without going back down to the DISA BCAP. You also need to enable EventHub Service Endpoint for ASE logs.
59+
Depending on the storage you use, you will be required to enable Service Endpoints for SQL and Azure Storage to access them without going back down to the DISA BCAP. You also need to enable EventHub Service Endpoint for ASE logs. [Learn more](https://docs.microsoft.com/azure/app-service/environment/network-info#service-endpoints).
6060

6161
## FAQs
6262

63-
* Some configuration changes may take some time to take effect. Allow for several hours for changes to routing, NSGs, ASE Health, etc. to propagate and take effect, or optionally you can reboot the ASE.
63+
Some configuration changes may take some time to take effect. Allow for several hours for changes to routing, NSGs, ASE Health, etc. to propagate and take effect, or optionally you can reboot the ASE.
6464

6565
## Resource manager template sample
6666

6767
> [!NOTE]
68-
>In order to deploy non-RFC 1918 IP addresses in the portal you must pre-stage the VNet and Subnet for the ASE. You can use a Resource Manager Template to deploy the ASE with non-RFC1918 IPs as well.
68+
> In order to deploy non-RFC 1918 IP addresses in the portal you must pre-stage the VNet and Subnet for the ASE. You can use a Resource Manager Template to deploy the ASE with non-RFC1918 IPs as well.
6969
7070
<a href="https://portal.azure.us/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2FApp-Service-Environment-AzFirewall%2Fazuredeploy.json" target="_blank">
7171

‎articles/cosmos-db/mongodb-change-streams.md

Lines changed: 58 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,45 @@
11
---
2-
title: Change streams in Azure Cosmos DB’s API for MongoDB
3-
description: Learn how to use change streams n Azure Cosmos DB’s API for MongoDB to get the changes made to your data.
4-
author: srchi
2+
title: Change streams in Azure Cosmos DB's API for MongoDB
3+
description: Learn how to use change streams in Azure Cosmos DB's API for MongoDB to get the changes made to your data.
4+
author: timsander1
55
ms.service: cosmos-db
66
ms.subservice: cosmosdb-mongo
77
ms.topic: conceptual
8-
ms.date: 11/16/2019
9-
ms.author: srchi
8+
ms.date: 03/30/2020
9+
ms.author: tisande
1010
---
1111

12-
# Change streams in Azure Cosmos DB’s API for MongoDB
12+
# Change streams in Azure Cosmos DB's API for MongoDB
1313

14-
[Change feed](change-feed.md) support in Azure Cosmos DB’s API for MongoDB is available by using the change streams API. By using the change streams API, your applications can get the changes made to the collection or to the items in a single shard. Later you can take further actions based on the results. Changes to the items in the collection are captured in the order of their modification time and the sort order is guaranteed per shard key.
14+
[Change feed](change-feed.md) support in Azure Cosmos DB's API for MongoDB is available by using the change streams API. By using the change streams API, your applications can get the changes made to the collection or to the items in a single shard. Later you can take further actions based on the results. Changes to the items in the collection are captured in the order of their modification time and the sort order is guaranteed per shard key.
1515

1616
> [!NOTE]
17-
> To use change streams, create the account with version 3.6 of Azure Cosmos DB's API for MongoDB, or a later version. If you run the change stream examples against an earlier version, you might see the `Unrecognized pipeline stage name: $changeStream` error.
17+
> To use change streams, create the account with version 3.6 of Azure Cosmos DB's API for MongoDB, or a later version. If you run the change stream examples against an earlier version, you might see the `Unrecognized pipeline stage name: $changeStream` error.
1818
19-
The following example shows how to get change streams on all the items in the collection. This example creates a cursor to watch items when they are inserted, updated, or replaced. The $match stage, $project stage, and fullDocument option are required to get the change streams. Watching for delete operations using change streams is currently not supported. As a workaround, you can add a soft marker on the items that are being deleted. For example, you can add an attribute in the item called "deleted" and set it to "true" and set a TTL on the item, so that you can automatically delete it as well as track it.
19+
## Current limitations
20+
21+
The following limitations are applicable when using change streams:
22+
23+
* The `operationType` and `updateDescription` properties are not yet supported in the output document.
24+
* The `insert`, `update`, and `replace` operations types are currently supported. Delete operation or other events are not yet supported.
25+
26+
Due to these limitations, the $match stage, $project stage, and fullDocument options are required as shown in the previous examples.
27+
28+
Unlike the change feed in Azure Cosmos DB's SQL API, there is not a separate [Change Feed Processor Library](change-feed-processor.md) to consume change streams or a need for a leases container. There is not currently support for [Azure Functions triggers](change-feed-functions.md) to process change streams.
29+
30+
## Error handling
31+
32+
The following error codes and messages are supported when using change streams:
33+
34+
* **HTTP error code 16500** - When the change stream is throttled, it returns an empty page.
35+
36+
* **NamespaceNotFound (OperationType Invalidate)** - If you run change stream on the collection that does not exist or if the collection is dropped, then a `NamespaceNotFound` error is returned. Because the `operationType` property can't be returned in the output document, instead of the `operationType Invalidate` error, the `NamespaceNotFound` error is returned.
37+
38+
## Examples
39+
40+
The following example shows how to get change streams on all the items in the collection. This example creates a cursor to watch items when they are inserted, updated, or replaced. The `$match` stage, `$project` stage, and `fullDocument` option are required to get the change streams. Watching for delete operations using change streams is currently not supported. As a workaround, you can add a soft marker on the items that are being deleted. For example, you can add an attribute in the item called "deleted." When you'd like to delete the item, you can set "deleted" to `true` and set a TTL on the item. Since updating "deleted" to `true` is an update, this change will be visible in the change stream.
41+
42+
### JavaScript:
2043

2144
```javascript
2245
var cursor = db.coll.watch(
@@ -33,13 +56,36 @@ while (!cursor.isExhausted()) {
3356
}
3457
```
3558

36-
The following example shows how to get changes to the items in a single shard. This example gets the changes of items that have shard key equal to "a" and the shard key value equal to "1".
59+
### C#:
60+
61+
```csharp
62+
var pipeline = new EmptyPipelineDefinition<ChangeStreamDocument<BsonDocument>>()
63+
.Match(change => change.OperationType == ChangeStreamOperationType.Insert || change.OperationType == ChangeStreamOperationType.Update || change.OperationType == ChangeStreamOperationType.Replace)
64+
.AppendStage<ChangeStreamDocument<BsonDocument>, ChangeStreamDocument<BsonDocument>, BsonDocument>(
65+
"{ $project: { '_id': 1, 'fullDocument': 1, 'ns': 1, 'documentKey': 1 }}");
66+
67+
var options = new ChangeStreamOptions{
68+
FullDocument = ChangeStreamFullDocumentOption.UpdateLookup
69+
};
70+
71+
var enumerator = coll.Watch(pipeline, options).ToEnumerable().GetEnumerator();
72+
73+
while (enumerator.MoveNext()){
74+
Console.WriteLine(enumerator.Current);
75+
}
76+
77+
enumerator.Dispose();
78+
```
79+
80+
## Changes within a single shard
81+
82+
The following example shows how to get changes to the items within a single shard. This example gets the changes of items that have shard key equal to "a" and the shard key value equal to "1". It is possible to have different clients reading changes from different shards in parallel.
3783

3884
```javascript
3985
var cursor = db.coll.watch(
4086
[
41-
{
42-
$match: {
87+
{
88+
$match: {
4389
$and: [
4490
{ "fullDocument.a": 1 },
4591
{ "operationType": { $in: ["insert", "update", "replace"] } }
@@ -52,23 +98,6 @@ var cursor = db.coll.watch(
5298

5399
```
54100

55-
## Current limitations
56-
57-
The following limitations are applicable when using change streams:
58-
59-
* The `operationType` and `updateDescription` properties are not yet supported in the output document.
60-
* The `insert`, `update`, and `replace` operations types are currently supported. Delete operation or other events are not yet supported.
61-
62-
Due to these limitations, the $match stage, $project stage, and fullDocument options are required as shown in the previous examples.
63-
64-
## Error handling
65-
66-
The following error codes and messages are supported when using change streams:
67-
68-
* **HTTP error code 429** - When the change stream is throttled, it returns an empty page.
69-
70-
* **NamespaceNotFound (OperationType Invalidate)** - If you run change stream on the collection that does not exist or if the collection is dropped, then a `NamespaceNotFound` error is returned. Because the `operationType` property can't be returned in the output document, instead of the `operationType Invalidate` error, the `NamespaceNotFound` error is returned.
71-
72101
## Next steps
73102

74103
* [Use time to live to expire data automatically in Azure Cosmos DB's API for MongoDB](mongodb-time-to-live.md)

‎articles/cost-management-billing/manage/mpa-request-ownership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Azure Marketplace products which are available for subscriptions that are manage
135135

136136
### Azure Reservations transfer
137137

138-
Azure Reservations don't automatically move with subscriptions.Either you can keep the Reservation in EAfor other subscriptions or [cancel the Reservation](https://docs.microsoft.com/azure/cost-management-billing/reservations/exchange-and-refund-azure-reservations) and parnter can repurchase in CSP.
138+
Azure Reservations don't automatically move with subscriptions. Either you can keep the Reservation in EAfor other subscriptions or [cancel the Reservation](https://docs.microsoft.com/azure/cost-management-billing/reservations/exchange-and-refund-azure-reservations) and partner can repurchase in CSP.
139139

140140
### Access to Azure services
141141

0 commit comments

Comments
 (0)