Skip to content

Commit 67f36e6

Browse files
author
Muhammad Sehgal (Aquent LLC)
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into AzureMapStyles
Adds new supported map styles page for Azure Maps
2 parents 0bd99f7 + 36ebd92 commit 67f36e6

File tree

94 files changed

+556
-648
lines changed

Some content is hidden

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

94 files changed

+556
-648
lines changed

articles/active-directory/develop/quickstart-v1-integrate-apps-with-azure-ad.md

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ ms.devlang: na
1313
ms.topic: article
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 04/18/2018
16+
ms.date: 08/28/2018
1717
ms.author: celested
1818
ms.custom: aaddev
19-
ms.reviewer: luleon
19+
ms.reviewer: celested
2020
---
2121

2222
# Integrating applications with Azure Active Directory
@@ -91,12 +91,12 @@ The following steps show you how the consent experience works for both the appli
9191

9292
5. After the user grants consent, an authorization code is returned to your application, which is redeemed to acquire an access token and refresh token. For more information about this flow, see the [web Application to web API section in Authentication Scenarios for Azure AD](authentication-scenarios.md#web-application-to-web-api).
9393

94-
6. As an administrator, you can also consent to an application's delegated permissions on behalf of all the users in your tenant. Administrative consent prevents the consent dialog from appearing for every user in the tenant, and can be done in the [Azure portal](https://portal.azure.com) by users with the administrator role. From the **Settings** page for your application, click **Required Permissions** and click on the **Grant Permissions** button.
94+
6. As an administrator, you can also consent to an application's delegated permissions on behalf of all the users in your tenant. Administrative consent prevents the consent dialog from appearing for every user in the tenant, and can be done in the [Azure portal](https://portal.azure.com) by users with the administrator role. From the **Settings** page for your application, click **Required permissions** and click on the **Grant permissions** button.
9595

9696
![Grant permissions for explicit admin consent](./media/quickstart-v1-integrate-apps-with-azure-ad/grantpermissions.png)
9797

9898
> [!NOTE]
99-
> Granting explicit consent using the **Grant Permissions** button is currently required for single page applications (SPA) that use ADAL.js. Otherwise, the application fails when the access token is requested.
99+
> Granting explicit consent using the **Grant permissions** button is currently required for single page applications (SPA) that use ADAL.js. Otherwise, the application fails when the access token is requested.
100100
101101
### Configure a client application to access web APIs
102102
In order for a web/confidential client application to be able to participate in an authorization grant flow that requires authentication (and obtain an access token), it must establish secure credentials. The default authentication method supported by the Azure portal is client ID + secret key. This section covers the configuration steps required to provide the secret key with your client's credentials.
@@ -108,7 +108,7 @@ Additionally, before a client can access a web API exposed by a resource applica
108108
- Delegated Permissions: Your client application needs to access the web API as the signed-in user, but with access limited by the selected permission. This type of permission can be granted by a user unless the permission requires administrator consent.
109109

110110
> [!NOTE]
111-
> Adding a delegated permission to an application does not automatically grant consent to the users within the tenant. Users must still manually consent for the added delegated permissions at runtime, unless the administrator clicks the **Grant Permissions** button from the **Required Permissions** section of the application page in the Azure portal.
111+
> Adding a delegated permission to an application does not automatically grant consent to the users within the tenant. Users must still manually consent for the added delegated permissions at runtime, unless the administrator grants consent on behalf of all users.
112112
113113
#### To add application credentials, or permissions to access web APIs
114114
1. Sign in to the [Azure portal](https://portal.azure.com).
@@ -117,16 +117,18 @@ Additionally, before a client can access a web API exposed by a resource applica
117117

118118
![Update an application's registration](./media/quickstart-v1-integrate-apps-with-azure-ad/update-app-registration.png)
119119

120-
4. You are taken to the application's main registration page, which opens up the **Settings** page for the application. To add a secret key for your web application's credentials:
120+
4. You are taken to the application's main registration page, which opens up the **Settings** page for the application. To add a credential for your web application:
121121
- Click the **Keys** section on the **Settings** page.
122-
- Add a description for your key.
123-
- Select either a one or two year duration.
124-
- Click **Save**. The right-most column will contain the key value, after you save the configuration changes. **Be sure to copy the key** for use in your client application code, as it is not accessible once you leave this page.
125-
126-
![Update an application's registration - keys](./media/quickstart-v1-integrate-apps-with-azure-ad/update-app-registration-settings-keys.png)
122+
- To add a certificate:
123+
- Select **Upload Public Key**.
124+
- Select the file you'd like to upload. It must be one of the following file types: .cer, .pem, .crt.
125+
- To add a password:
126+
- Add a description for your key.
127+
- Select a duration.
128+
- Click **Save**. The right-most column will contain the key value, after you save the configuration changes. **Be sure to copy the key** for use in your client application code, as it is not accessible once you leave this page.
127129

128130
5. To add permission(s) to access resource APIs from your client
129-
- Click the **Required Permissions** section on the **Settings** page.
131+
- Click the **Required permissions** section on the **Settings** page.
130132
- Click the **Add** button.
131133
- Click **Select an API** to select the type of resources you want to pick from.
132134
- Browse through the list of available APIs or use the search box to select from the available resource applications in your directory that expose a web API. Click the resource you are interested in, then click **Select**.
@@ -138,11 +140,6 @@ Additionally, before a client can access a web API exposed by a resource applica
138140

139141
6. When finished, click the **Select** button on **Enable Access** page, then the **Done** button on the **Add API access** page. You are returned to the **Required permissions** page, where the new resource is added to the list of APIs.
140142

141-
> [!NOTE]
142-
> Clicking the **Done** button also automatically sets the permissions for your application in your directory based on the permissions to other applications that you configured. You can view these application permissions by looking at the application **Settings** page.
143-
>
144-
>
145-
146143
### Configuring a resource application to expose web APIs
147144

148145
You can develop a web API and make it available to client applications by exposing access [scopes](developer-glossary.md#scopes) and [roles](developer-glossary.md#roles). A correctly configured web API is made available just like the other Microsoft web APIs, including the Graph API and the Office 365 APIs. Access scopes and roles are exposed through your [application's manifest](developer-glossary.md#application-manifest), which is a JSON file that represents your application’s identity configuration.

articles/active-directory/privileged-identity-management/TOC.md

Lines changed: 0 additions & 50 deletions
This file was deleted.
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
- name: Privileged Identity Management documentation
2+
items:
3+
- name: Overview
4+
items:
5+
- name: What is Azure AD PIM?
6+
href: pim-configure.md
7+
- name: Concepts
8+
items:
9+
- name: Subscription requirements
10+
href: subscription-requirements.md
11+
- name: Directory roles you can manage
12+
href: pim-roles.md
13+
- name: Secure privileged access
14+
href: ../users-groups-roles/directory-admin-roles-secure.md?toc=%2fazure%2factive-directory%2fprivileged-identity-management%2ftoc.json
15+
- name: Overview dashboards
16+
href: pim-resource-roles-overview-dashboards.md
17+
- name: Email notifications
18+
href: pim-email-notifications.md
19+
- name: Assignment types
20+
href: pim-resource-roles-eligible-visibility.md
21+
- name: Security wizard
22+
href: pim-security-wizard.md
23+
- name: How-to guides
24+
expanded: true
25+
items:
26+
- name: Start using PIM
27+
href: pim-getting-started.md
28+
- name: Activate roles
29+
items:
30+
- name: Activate my directory roles
31+
href: pim-how-to-activate-role.md
32+
- name: Activate my resource roles
33+
href: pim-resource-roles-activate-your-roles.md
34+
- name: Configure PIM
35+
items:
36+
- name: Discover Azure resources
37+
href: pim-resource-roles-discover-resources.md
38+
- name: Grant access to others to manage PIM
39+
href: pim-how-to-give-access-to-pim.md
40+
- name: Enable subscription management
41+
href: pim-resource-roles-enable-subscription-management.md
42+
- name: Manage directory roles
43+
items:
44+
- name: Assign roles
45+
href: pim-how-to-add-role-to-user.md
46+
- name: Configure role settings
47+
href: pim-how-to-change-default-settings.md
48+
- name: Require MFA
49+
href: pim-how-to-require-mfa.md
50+
- name: Configure alerts
51+
href: pim-how-to-configure-security-alerts.md
52+
- name: Approve requests
53+
href: azure-ad-pim-approval-workflow.md
54+
- name: View audit history
55+
href: pim-how-to-use-audit-log.md
56+
- name: Manage resource roles
57+
items:
58+
- name: View who has access
59+
href: azure-pim-resource-rbac.md
60+
- name: Assign roles
61+
href: pim-resource-roles-assign-roles.md
62+
- name: Configure role settings
63+
href: pim-resource-roles-configure-role-settings.md
64+
- name: Require MFA
65+
href: pim-resource-roles-require-mfa.md
66+
- name: Configure alerts
67+
href: pim-resource-roles-configure-alerts.md
68+
- name: Approve requests
69+
href: pim-resource-roles-approval-workflow.md
70+
- name: Extend or renew roles
71+
href: pim-resource-roles-renew-extend.md
72+
- name: View audit history
73+
href: pim-resource-roles-use-the-audit-log.md
74+
- name: Use custom roles
75+
href: pim-resource-roles-custom-role-policy.md
76+
- name: Review access
77+
items:
78+
- name: Directory roles
79+
items:
80+
- name: Review my directory roles
81+
href: pim-how-to-perform-security-review.md
82+
- name: Start an access review
83+
href: pim-how-to-start-security-review.md
84+
- name: Complete an access review
85+
href: pim-how-to-complete-review.md
86+
- name: Resource roles
87+
items:
88+
- name: Review my resource roles
89+
href: pim-resource-roles-perform-access-review.md
90+
- name: Start an access review
91+
href: pim-resource-roles-start-access-review.md
92+
- name: Complete an access review
93+
href: pim-resource-roles-complete-access-review.md

0 commit comments

Comments
 (0)