Skip to content

Commit aa1572c

Browse files
authored
Merge pull request #234546 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 2579c5a + a5b1fde commit aa1572c

File tree

6 files changed

+122
-51
lines changed

6 files changed

+122
-51
lines changed

articles/azure-maps/how-to-manage-authentication.md

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ custom.ms: subject-rbac-steps
1313

1414
# Manage authentication in Azure Maps
1515

16-
When you create an Azure Maps account, your client ID is automatically generated along with primary and secondary keys that are required for authentication when using [Azure Active Directory (Azure AD)](../active-directory/fundamentals/active-directory-whatis.md) or [Shared Key authentication](./azure-maps-authentication.md#shared-key-authentication).
16+
When you create an Azure Maps account, your client ID and shared keys are created automatically. These values are required for authentication when using either [Azure Active Directory (Azure AD)] or [Shared Key authentication].
1717

1818
## Prerequisites
1919

20-
Sign in to the [Azure portal](https://portal.azure.com). If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
21-
- A familiarization with [managed identities for Azure resources](../active-directory/managed-identities-azure-resources/overview.md). Be sure to understand the two [Managed identity types](../active-directory/managed-identities-azure-resources/overview.md#managed-identity-types) and how they differ.
22-
- [An Azure Maps account](quick-demo-map-app.md#create-an-azure-maps-account).
23-
- A familiarization with [Azure Maps Authentication](./azure-maps-authentication.md).
20+
Sign in to the [Azure portal]. If you don't have an Azure subscription, create a [free account] before you begin.
21+
22+
- A familiarization with [managed identities for Azure resources]. Be sure to understand the two [Managed identity types] and how they differ.
23+
- [An Azure Maps account].
24+
- A familiarization with [Azure Maps Authentication].
2425

2526
## View authentication details
2627

@@ -29,7 +30,7 @@ Sign in to the [Azure portal](https://portal.azure.com). If you don't have an Az
2930
3031
To view your Azure Maps authentication details:
3132

32-
1. Sign in to the [Azure portal](https://portal.azure.com).
33+
1. Sign in to the [Azure portal].
3334

3435
2. Select **All resources** in the **Azure services** section, then select your Azure Maps account.
3536

@@ -41,18 +42,18 @@ To view your Azure Maps authentication details:
4142

4243
## Choose an authentication category
4344

44-
Depending on your application needs, there are specific pathways to application security. Azure AD defines specific authentication categories to support a wide range of authentication flows. To choose the best category for your application, see [application categories](../active-directory/develop/authentication-flows-app-scenarios.md#application-categories).
45+
Depending on your application needs, there are specific pathways to application security. Azure AD defines specific authentication categories to support a wide range of authentication flows. To choose the best category for your application, see [application categories].
4546

4647
> [!NOTE]
4748
> Understanding categories and scenarios will help you secure your Azure Maps application, whether you use Azure Active Directory or shared key authentication.
4849
4950
## How to add and remove managed identities
5051

51-
To enable [Shared access signature (SAS) token authentication](./azure-maps-authentication.md#shared-access-signature-token-authentication) with the Azure Maps REST API you need to add a user-assigned managed identity to your Azure Maps account.
52+
To enable [Shared access signature (SAS) token authentication] with the Azure Maps REST API, you need to add a user-assigned managed identity to your Azure Maps account.
5253

5354
### Create a managed identity
5455

55-
You can create a user-assigned managed identity before or after creating a map account. You can add the managed identity through the portal, Azure management SDKs, or the Azure Resource Manager (ARM) template. To add a user-assigned managed identity through an ARM template, specify the resource identifier of the user-assigned managed identity. See example below:
56+
You can create a user-assigned managed identity before or after creating a map account. You can add the managed identity through the portal, Azure management SDKs, or the Azure Resource Manager (ARM) template. To add a user-assigned managed identity through an ARM template, specify the resource identifier of the user-assigned managed identity.
5657

5758
```json
5859
"identity": {
@@ -67,7 +68,7 @@ You can create a user-assigned managed identity before or after creating a map a
6768

6869
You can remove a system-assigned identity by disabling the feature through the portal or the Azure Resource Manager template in the same way that it was created. User-assigned identities can be removed individually. To remove all identities, set the identity type to `"None"`.
6970

70-
Removing a system-assigned identity in this way will also delete it from Azure AD. System-assigned identities are also automatically removed from Azure AD when the Azure Maps account is deleted.
71+
Removing a system-assigned identity in this way also deletes it from Azure AD. System-assigned identities are also automatically removed from Azure AD when the Azure Maps account is deleted.
7172

7273
To remove all identities by using the Azure Resource Manager template, update this section:
7374

@@ -79,20 +80,20 @@ To remove all identities by using the Azure Resource Manager template, update th
7980

8081
## Choose an authentication and authorization scenario
8182

82-
This table outlines common authentication and authorization scenarios in Azure Maps. Each scenario describes a type of app which can be used to access Azure Maps REST API. Use the links to learn detailed configuration information for each scenario.
83+
This table outlines common authentication and authorization scenarios in Azure Maps. Each scenario describes a type of app that can be used to access Azure Maps REST API. Use the links to learn detailed configuration information for each scenario.
8384

8485
> [!IMPORTANT]
8586
> For production applications, we recommend implementing Azure AD with Azure role-based access control (Azure RBAC).
8687
87-
| Scenario | Authentication | Authorization | Development effort | Operational effort |
88-
| ----------------------------------------------------------------------------------- | -------------- | ------------- | ------------------ | ------------------ |
89-
| [Trusted daemon app or non-interactive client app](./how-to-secure-daemon-app.md) | Shared Key | N/A | Medium | High |
90-
| [Trusted daemon or non-interactive client app](./how-to-secure-daemon-app.md) | Azure AD | High | Low | Medium |
91-
| [Web single page app with interactive single-sign-on](./how-to-secure-spa-users.md) | Azure AD | High | Medium | Medium |
92-
| [Web single page app with non-interactive sign-on](./how-to-secure-spa-app.md) | Azure AD | High | Medium | Medium |
93-
| [Web app, daemon app, or non-interactive sign-on app](./how-to-secure-sas-app.md) | SAS Token | High | Medium | Low |
94-
| [Web application with interactive single-sign-on](./how-to-secure-webapp-users.md) | Azure AD | High | High | Medium |
95-
| [IoT device or an input constrained application](./how-to-secure-device-code.md) | Azure AD | High | Medium | Medium |
88+
| Scenario | Authentication | Authorization | Development effort | Operational effort |
89+
| -----------------------------------------------------| -------------- | ------------- | ------------------ | ------------------ |
90+
| [Trusted daemon app or non-interactive client app] | Shared Key | N/A | Medium | High |
91+
| [Trusted daemon or non-interactive client app] | Azure AD | High | Low | Medium |
92+
| [Web single page app with interactive single-sign-on]| Azure AD | High | Medium | Medium |
93+
| [Web single page app with non-interactive sign-on] | Azure AD | High | Medium | Medium |
94+
| [Web app, daemon app, or non-interactive sign-on app]| SAS Token | High | Medium | Low |
95+
| [Web application with interactive single-sign-on] | Azure AD | High | High | Medium |
96+
| [IoT device or an input constrained application] | Azure AD | High | Medium | Medium |
9697

9798
## View built-in Azure Maps role definitions
9899

@@ -131,7 +132,7 @@ Request a token from the Azure AD token endpoint. In your Azure AD request, use
131132
| Azure public cloud | `https://login.microsoftonline.com` | `https://atlas.microsoft.com/` |
132133
| Azure Government cloud | `https://login.microsoftonline.us` | `https://atlas.microsoft.com/` |
133134

134-
For more information about requesting access tokens from Azure AD for users and service principals, see [Authentication scenarios for Azure AD](../active-directory/develop/authentication-vs-authorization.md). To view specific scenarios, see [the table of scenarios](./how-to-manage-authentication.md#choose-an-authentication-and-authorization-scenario).
135+
For more information about requesting access tokens from Azure AD for users and service principals, see [Authentication scenarios for Azure AD]. To view specific scenarios, see [the table of scenarios].
135136

136137
## Manage and rotate shared keys
137138

@@ -142,14 +143,14 @@ Your Azure Maps subscription keys are similar to a root password for your Azure
142143
143144
### Manually rotate subscription keys
144145

145-
To help keep your Azure Maps account secure, we recommend periodically rotating your subscription keys. If possible, use Azure Key Vault to manage your access keys. If you aren't using Key Vault, you'll need to manually rotate your keys.
146+
To help keep your Azure Maps account secure, we recommend periodically rotating your subscription keys. If possible, use Azure Key Vault to manage your access keys. If you aren't using Key Vault, you need to manually rotate your keys.
146147

147148
Two subscription keys are assigned so that you can rotate your keys. Having two keys ensures that your application maintains access to Azure Maps throughout the process.
148149

149150
To rotate your Azure Maps subscription keys in the Azure portal:
150151

151152
1. Update your application code to reference the secondary key for the Azure Maps account and deploy.
152-
2. In the [Azure portal](https://portal.azure.com/), navigate to your Azure Maps account.
153+
2. In the [Azure portal], navigate to your Azure Maps account.
153154
3. Under **Settings**, select **Authentication**.
154155
4. To regenerate the primary key for your Azure Maps account, select the **Regenerate** button next to the primary key.
155156
5. Update your application code to reference the new primary key and deploy.
@@ -163,9 +164,31 @@ To rotate your Azure Maps subscription keys in the Azure portal:
163164
Find the API usage metrics for your Azure Maps account:
164165

165166
> [!div class="nextstepaction"]
166-
> [View usage metrics](how-to-view-api-usage.md)
167+
> [View usage metrics]
167168
168169
Explore samples that show how to integrate Azure AD with Azure Maps:
169170

170171
> [!div class="nextstepaction"]
171-
> [Azure AD authentication samples](https://github.com/Azure-Samples/Azure-Maps-AzureAD-Samples)
172+
> [Azure AD authentication samples]
173+
174+
[Azure portal]: https://portal.azure.com/
175+
[Azure AD authentication samples]: https://github.com/Azure-Samples/Azure-Maps-AzureAD-Samples
176+
[View usage metrics]: how-to-view-api-usage.md
177+
[Authentication scenarios for Azure AD]: ../active-directory/develop/authentication-vs-authorization.md
178+
[the table of scenarios]: how-to-manage-authentication.md#choose-an-authentication-and-authorization-scenario
179+
[Trusted daemon app or non-interactive client app]: how-to-secure-daemon-app.md
180+
[Trusted daemon or non-interactive client app]: how-to-secure-daemon-app.md
181+
[Web single page app with interactive single-sign-on]: how-to-secure-spa-users.md
182+
[Web single page app with non-interactive sign-on]: how-to-secure-spa-app.md
183+
[Web app, daemon app, or non-interactive sign-on app]: how-to-secure-sas-app.md
184+
[Web application with interactive single-sign-on]: how-to-secure-webapp-users.md
185+
[IoT device or an input constrained application]: how-to-secure-device-code.md
186+
[Shared access signature (SAS) token authentication]: azure-maps-authentication.md#shared-access-signature-token-authentication
187+
[application categories]: ../active-directory/develop/authentication-flows-app-scenarios.md#application-categories
188+
[Azure Active Directory (Azure AD)]: ../active-directory/fundamentals/active-directory-whatis.md
189+
[Shared Key authentication]: azure-maps-authentication.md#shared-key-authentication
190+
[free account]: https://azure.microsoft.com/free/
191+
[managed identities for Azure resources]: ../active-directory/managed-identities-azure-resources/overview.md
192+
[Managed identity types]: ../active-directory/managed-identities-azure-resources/overview.md#managed-identity-types
193+
[An Azure Maps account]: quick-demo-map-app.md#create-an-azure-maps-account
194+
[Azure Maps Authentication]: azure-maps-authentication.md

articles/azure-maps/how-to-manage-creator.md

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Manage Microsoft Azure Maps Creator
3-
description: In this article, you'll learn how to manage Microsoft Azure Maps Creator.
3+
description: This article demonstrates how to manage Microsoft Azure Maps Creator.
44
author: eriklindeman
55
ms.author: eriklind
66
ms.date: 01/20/2022
@@ -11,13 +11,13 @@ services: azure-maps
1111

1212
# Manage Azure Maps Creator
1313

14-
You can use Azure Maps Creator to create private indoor map data. Using the Azure Maps API and the Indoor Maps module, you can develop interactive and dynamic indoor map web applications. For pricing information, see the *Creator* section in [Azure Maps pricing](https://aka.ms/CreatorPricing).
14+
You can use Azure Maps Creator to create private indoor map data. Using the Azure Maps API and the Indoor Maps module, you can develop interactive and dynamic indoor map web applications. For pricing information, see the *Creator* section in [Azure Maps pricing].
1515

1616
This article takes you through the steps to create and delete a Creator resource in an Azure Maps account.
1717

1818
## Create Creator resource
1919

20-
1. Sign in to the [Azure portal](https://portal.azure.com)
20+
1. Sign in to the [Azure portal].
2121

2222
2. Navigate to the Azure portal menu. Select **All resources**, and then select your Azure Maps account.
2323

@@ -51,26 +51,26 @@ To delete the Creator resource:
5151
5252
:::image type="content" source="./media/how-to-manage-creator/creator-delete.png" alt-text="A screenshot of the Azure Maps Creator Resource page with the delete button highlighted.":::
5353

54-
3. You'll be asked to confirm deletion by typing in the name of your Creator resource. After the resource is deleted, you see a confirmation page that looks like the following:
54+
3. You're prompted to confirm deletion by typing in the name of your Creator resource. After the resource is deleted, you see a confirmation page that looks like the following example:
5555

5656
:::image type="content" source="./media/how-to-manage-creator/creator-confirm-delete.png" alt-text="A screenshot of the Azure Maps Creator Resource deletion confirmation page.":::
5757

5858
## Authentication
5959

6060
Creator inherits Azure Maps Access Control (IAM) settings. All API calls for data access must be sent with authentication and authorization rules.
6161

62-
Creator usage data is incorporated in your Azure Maps usage charts and activity log. For more information, see [Manage authentication in Azure Maps](./how-to-manage-authentication.md).
62+
Creator usage data is incorporated in your Azure Maps usage charts and activity log. For more information, see [Manage authentication in Azure Maps].
6363

6464
>[!Important]
6565
>We recommend using:
6666
>
67-
> * Azure Active Directory (Azure AD) in all solutions that are built with an Azure Maps account using Creator services. For more information, on Azure AD, see [Azure AD authentication](azure-maps-authentication.md#azure-ad-authentication).
67+
> * Azure Active Directory (Azure AD) in all solutions that are built with an Azure Maps account using Creator services. For more information, on Azure AD, see [Azure AD authentication].
6868
>
69-
>* Role-based access control settings (RBAC). Using these settings, map makers can act as the Azure Maps Data Contributor role, and Creator map data users can act as the Azure Maps Data Reader role. For more information, see [Authorization with role-based access control](azure-maps-authentication.md#authorization-with-role-based-access-control).
69+
>* Role-based access control settings (RBAC). Using these settings, map makers can act as the Azure Maps Data Contributor role, and Creator map data users can act as the Azure Maps Data Reader role. For more information, see [Authorization with role-based access control].
7070
7171
## Access to Creator services
7272

73-
Creator services and services that use data hosted in Creator (for example, Render service), are accessible at a geographical URL. The geographical URL is determined by the location selected during creation. For example, if Creator is created in a region in the United States geographical location, all calls to the Conversion service must be submitted to `us.atlas.microsoft.com/conversions`. To view mappings of region to geographical location, [see Creator service geographic scope](creator-geographic-scope.md).
73+
Creator services and services that use data hosted in Creator (for example, Render service), are accessible at a geographical URL. The geographical URL determines the location selected during creation. For example, if Creator is created in a region in the United States geographical location, all calls to the Conversion service must be submitted to `us.atlas.microsoft.com/conversions`. To view mappings of region to geographical location, [see Creator service geographic scope].
7474

7575
Also, all data imported into Creator should be uploaded into the same geographical location as the Creator resource. For example, if Creator is provisioned in the United States, all raw data should be uploaded via `us.atlas.microsoft.com/mapData/upload`.
7676

@@ -79,27 +79,42 @@ Also, all data imported into Creator should be uploaded into the same geographic
7979
Introduction to Creator services for indoor mapping:
8080

8181
> [!div class="nextstepaction"]
82-
> [Data upload](creator-indoor-maps.md#upload-a-drawing-package)
82+
> [Data upload]
8383
8484
> [!div class="nextstepaction"]
85-
> [Data conversion](creator-indoor-maps.md#convert-a-drawing-package)
85+
> [Data conversion]
8686
8787
> [!div class="nextstepaction"]
88-
> [Dataset](creator-indoor-maps.md#datasets)
88+
> [Dataset]
8989
9090
> [!div class="nextstepaction"]
91-
> [Tileset](creator-indoor-maps.md#tilesets)
91+
> [Tileset]
9292
9393
> [!div class="nextstepaction"]
94-
> [Feature State set](creator-indoor-maps.md#feature-statesets)
94+
> [Feature State set]
9595
9696
Learn how to use the Creator services to render indoor maps in your application:
9797

9898
> [!div class="nextstepaction"]
99-
> [Azure Maps Creator tutorial](tutorial-creator-indoor-maps.md)
99+
> [Azure Maps Creator tutorial]
100100
101101
> [!div class="nextstepaction"]
102-
> [Indoor map dynamic styling](indoor-map-dynamic-styling.md)
102+
> [Indoor map dynamic styling]
103103
104104
> [!div class="nextstepaction"]
105-
> [Use the Indoor Maps module](how-to-use-indoor-module.md)
105+
> [Use the Indoor Maps module]
106+
107+
[Authorization with role-based access control]: azure-maps-authentication.md#authorization-with-role-based-access-control
108+
[Azure AD authentication]: azure-maps-authentication.md#azure-ad-authentication
109+
[Azure Maps Creator tutorial]: tutorial-creator-indoor-maps.md
110+
[Azure Maps pricing]: https://aka.ms/CreatorPricing
111+
[Azure portal]: https://portal.azure.com
112+
[Data conversion]: creator-indoor-maps.md#convert-a-drawing-package
113+
[Data upload]: creator-indoor-maps.md#upload-a-drawing-package
114+
[Dataset]: creator-indoor-maps.md#datasets
115+
[Feature State set]: creator-indoor-maps.md#feature-statesets
116+
[Indoor map dynamic styling]: indoor-map-dynamic-styling.md
117+
[Manage authentication in Azure Maps]: how-to-manage-authentication.md
118+
[see Creator service geographic scope]: creator-geographic-scope.md
119+
[Tileset]: creator-indoor-maps.md#tilesets
120+
[Use the Indoor Maps module]: how-to-use-indoor-module.md

0 commit comments

Comments
 (0)