Skip to content

Commit f1ca7fd

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-pim-toc-mvc
2 parents 38b09fd + 8fbc78d commit f1ca7fd

File tree

111 files changed

+870
-198
lines changed

Some content is hidden

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

111 files changed

+870
-198
lines changed

articles/active-directory/active-directory-saas-app-provisioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ For scenario-based guidance on how to troubleshoot automatic user provisioning,
230230

231231
> [!VIDEO https://www.youtube.com/embed/MAy8s5WSe3A]
232232
233-
For an example step-by-step deployment plan for outbound user provisioning to an application, see the [Identity Deployment Guide for User Provisioning](https://aka.ms/userprovisioningdeploymentplan)/
233+
For an example step-by-step deployment plan for outbound user provisioning to an application, see the [Identity Deployment Guide for User Provisioning](https://aka.ms/userprovisioningdeploymentplan).
234234

235235

236236
## Related articles

articles/active-directory/active-directory-tou.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ The following procedure describes how to add a Terms of use language.
160160

161161
1. Select the Terms of use you want to edit.
162162

163-
1. In the the details pane, click the **Languages** tab.
163+
1. In the details pane, click the **Languages** tab.
164164

165165
![Add TOU](media/active-directory-tou/languages-tou.png)
166166

articles/active-directory/connect/active-directory-aadconnect-upgrade-previous-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ These steps also work to move from Azure AD Sync or a solution with FIM + Azure
6363

6464
### Use a swing migration to upgrade
6565
1. If you use Azure AD Connect on both servers and plan to only make a configuration change, make sure that your active server and staging server are both using the same version. That makes it easier to compare differences later. If you're upgrading from Azure AD Sync, then these servers have different versions. If you're upgrading from an older version of Azure AD Connect, it's a good idea to start with the two servers that are using the same version, but it's not required.
66-
2. If you've made a custom configuration and your staging server doesn't have it, follow the steps under [Move a custom configuration from the active server to the staging server](#move-custom-configuration-from-active-to-staging-server).
66+
2. If you've made a custom configuration and your staging server doesn't have it, follow the steps under [Move a custom configuration from the active server to the staging server](#move-a-custom-configuration-from-the-active-server-to-the-staging-server).
6767
3. If you're upgrading from an earlier release of Azure AD Connect, upgrade the staging server to the latest version. If you're moving from Azure AD Sync, then install Azure AD Connect on your staging server.
6868
4. Let the sync engine run full import and full synchronization on your staging server.
6969
5. Verify that the new configuration didn't cause any unexpected changes by using the steps under "Verify" in [Verify the configuration of a server](active-directory-aadconnectsync-operations.md#verify-the-configuration-of-a-server). If something isn't as expected, correct it, run the import and sync, and verify the data until it looks good, by following the steps.

articles/active-directory/managed-service-identity/qs-configure-template-windows-vm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ If you have a VM that no longer needs a managed service identity:
353353

354354
1. Whether you sign in to Azure locally or via the Azure portal, use an account that is associated with the Azure subscription that contains the VM.
355355

356-
2. Load the template into an [editor](#azure-resource-manager-templates) and locate the `Microsoft.Compute/virtualMachines` resource of interest within the `resources` section. If you have a VM that only has user assigned identity, you can disable it by changing the the identity type to `None`.
356+
2. Load the template into an [editor](#azure-resource-manager-templates) and locate the `Microsoft.Compute/virtualMachines` resource of interest within the `resources` section. If you have a VM that only has user assigned identity, you can disable it by changing the identity type to `None`.
357357

358358
The following example shows you how remove all user assigned identities from a VM with no system assigned identities:
359359

@@ -376,7 +376,7 @@ If you have a VM that no longer needs a managed service identity:
376376

377377
**Microsoft.Compute/virtualMachines API version 2017-12-01**
378378

379-
To remove a a single user assigned identity from a VM, remove it from the `identityIds` array.
379+
To remove a single user assigned identity from a VM, remove it from the `identityIds` array.
380380

381381
If you have a system assigned identity, keep it in the in the `type` value under the `identity` value.
382382

articles/active-directory/managed-service-identity/qs-configure-template-windows-vmss.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ If you have a virtual machine scale set that no longer needs a managed service i
318318

319319
1. Whether you sign in to Azure locally or via the Azure portal, use an account that is associated with the Azure subscription that contains the virtual machine scale set.
320320

321-
2. Load the template into an [editor](#azure-resource-manager-templates) and locate the `Microsoft.Compute/virtualMachineScaleSets` resource of interest within the `resources` section. If you have a virtual machine scale set that only has user assigned identity, you can disable it by changing the the identity type to `None`.
321+
2. Load the template into an [editor](#azure-resource-manager-templates) and locate the `Microsoft.Compute/virtualMachineScaleSets` resource of interest within the `resources` section. If you have a virtual machine scale set that only has user assigned identity, you can disable it by changing the identity type to `None`.
322322

323323
The following example shows you how remove all user assigned identities from a VM with no system assigned identities:
324324

@@ -335,7 +335,7 @@ If you have a virtual machine scale set that no longer needs a managed service i
335335

336336
**Microsoft.Compute/virtualMachineScaleSets API version 2018-06-01**
337337

338-
To remove a a single user assigned identity from a virtual machine scale set, remove it from the `userAssignedIdentities` dictionary.
338+
To remove a single user assigned identity from a virtual machine scale set, remove it from the `userAssignedIdentities` dictionary.
339339

340340
If you have a system assigned identity, keep it in the in the `type` value under the `identity` value.
341341

articles/active-directory/saas-apps/klue-tutorial.md

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
16-
ms.date: 07/13/2017
16+
ms.date: 08/28/2018
1717
ms.author: jeedes
1818

1919
---
@@ -45,13 +45,15 @@ To test the steps in this tutorial, you should follow these recommendations:
4545
- If you don't have an Azure AD trial environment, you can get a one-month trial [here](https://azure.microsoft.com/pricing/free-trial/).
4646

4747
## Scenario description
48+
4849
In this tutorial, you test Azure AD single sign-on in a test environment.
4950
The scenario outlined in this tutorial consists of two main building blocks:
5051

5152
1. Adding Klue from the gallery
52-
1. Configuring and testing Azure AD single sign-on
53+
2. Configuring and testing Azure AD single sign-on
5354

5455
## Adding Klue from the gallery
56+
5557
To configure the integration of Klue into Azure AD, you need to add Klue from the gallery to your list of managed SaaS apps.
5658

5759
**To add Klue from the gallery, perform the following steps:**
@@ -60,23 +62,24 @@ To configure the integration of Klue into Azure AD, you need to add Klue from th
6062

6163
![Active Directory][1]
6264

63-
1. Navigate to **Enterprise applications**. Then go to **All applications**.
65+
2. Navigate to **Enterprise applications**. Then go to **All applications**.
6466

6567
![Applications][2]
66-
67-
1. To add new application, click **New application** button on the top of dialog.
68+
69+
3. To add new application, click **New application** button on the top of dialog.
6870

6971
![Applications][3]
7072

71-
1. In the search box, type **Klue**.
73+
4. In the search box, type **Klue**.
7274

7375
![Creating an Azure AD test user](./media/klue-tutorial/tutorial_klue_search.png)
7476

75-
1. In the results panel, select **Klue**, and then click **Add** button to add the application.
77+
5. In the results panel, select **Klue**, and then click **Add** button to add the application.
7678

7779
![Creating an Azure AD test user](./media/klue-tutorial/tutorial_klue_addfromgallery.png)
7880

7981
## Configuring and testing Azure AD single sign-on
82+
8083
In this section, you configure and test Azure AD single sign-on with Klue based on a test user called "Britta Simon".
8184

8285
For single sign-on to work, Azure AD needs to know what the counterpart user in Klue is to a user in Azure AD. In other words, a link relationship between an Azure AD user and the related user in Klue needs to be established.
@@ -86,10 +89,10 @@ In Klue, assign the value of the **user name** in Azure AD as the value of the *
8689
To configure and test Azure AD single sign-on with Klue, you need to complete the following building blocks:
8790

8891
1. **[Configuring Azure AD Single Sign-On](#configuring-azure-ad-single-sign-on)** - to enable your users to use this feature.
89-
1. **[Creating an Azure AD test user](#creating-an-azure-ad-test-user)** - to test Azure AD single sign-on with Britta Simon.
90-
1. **[Creating a Klue test user](#creating-a-klue-test-user)** - to have a counterpart of Britta Simon in Klue that is linked to the Azure AD representation of user.
91-
1. **[Assigning the Azure AD test user](#assigning-the-azure-ad-test-user)** - to enable Britta Simon to use Azure AD single sign-on.
92-
1. **[Testing Single Sign-On](#testing-single-sign-on)** - to verify whether the configuration works.
92+
2. **[Creating an Azure AD test user](#creating-an-azure-ad-test-user)** - to test Azure AD single sign-on with Britta Simon.
93+
3. **[Creating a Klue test user](#creating-a-klue-test-user)** - to have a counterpart of Britta Simon in Klue that is linked to the Azure AD representation of user.
94+
4. **[Assigning the Azure AD test user](#assigning-the-azure-ad-test-user)** - to enable Britta Simon to use Azure AD single sign-on.
95+
5. **[Testing Single Sign-On](#testing-single-sign-on)** - to verify whether the configuration works.
9396

9497
### Configuring Azure AD single sign-on
9598

@@ -101,39 +104,39 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
101104

102105
![Configure Single Sign-On][4]
103106

104-
1. On the **Single sign-on** dialog, select **Mode** as **SAML-based Sign-on** to enable single sign-on.
105-
107+
2. On the **Single sign-on** dialog, select **Mode** as **SAML-based Sign-on** to enable single sign-on.
108+
106109
![Configure Single Sign-On](./media/klue-tutorial/tutorial_klue_samlbase.png)
107110

108-
1. On the **Klue Domain and URLs** section, If you wish to configure the application in **IDP** initiated mode:
111+
3. On the **Klue Domain and URLs** section, If you wish to configure the application in **IDP** initiated mode:
109112

110113
![Configure Single Sign-On](./media/klue-tutorial/tutorial_klue_url1.png)
111114

112115
a. In the **Identifier** textbox, type a URL using the following pattern: `urn:klue:<Customer ID>`
113116

114117
b. In the **Reply URL** textbox, type a URL using the following pattern: `https://app.klue.com/account/auth/saml/<Customer UUID>/callback`
115118

116-
1. Check **Show advanced URL settings**. If you wish to configure the application in **SP** initiated mode:
119+
4. Check **Show advanced URL settings**. If you wish to configure the application in **SP** initiated mode:
117120

118121
![Configure Single Sign-On](./media/klue-tutorial/tutorial_klue_url2.png)
119122

120123
In the **Sign-on URL** textbox, type a URL using the following pattern: `https://app.klue.com/account/auth/saml/<Customer UUID>/`
121-
122-
> [!NOTE]
124+
125+
> [!NOTE]
123126
> These values are not real. Update these values with the actual Reply URL, Identifier, and Sign-On URL. Contact [Klue Client support team](mailto:[email protected]) to get these values.
124127

125-
1. The Klue application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. You can manage the values of these attributes from the "**User Attributes**" section on application integration page.
128+
5. The Klue application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. You can manage the values of these attributes from the "**User Attributes**" section on application integration page.
126129

127130
![Configure Single Sign-On](./media/klue-tutorial/attribute.png)
128131

129-
1. In the **User Attributes** section on the **Single sign-on** dialog, configure SAML token attribute as shown in the preceding image and perform the following steps:
130-
132+
6. In the **User Attributes** section on the **Single sign-on** dialog, configure SAML token attribute as shown in the preceding image and perform the following steps:
133+
131134
| Attribute Name | Attribute Value |
132135
| ------------------- | -------------------- |
133136
| first_name | user.givenname |
134137
| last_name | user.surname |
135138
| email | user.userprincipalname|
136-
139+
137140
a. Click **Add attribute** to open the **Add Attribute** dialog.
138141

139142
![Configure Single Sign-On](./media/klue-tutorial/tutorial_attribute_04.png)
@@ -143,27 +146,28 @@ In this section, you enable Azure AD single sign-on in the Azure portal and conf
143146
b. In the **Name** textbox, type the attribute name shown for that row.
144147

145148
c. From the **Value** list, type the attribute value shown for that row.
146-
149+
147150
d. Click **Ok**.
148151

149-
1. On the **SAML Signing Certificate** section, click **Certificate(Base64)** and then save the certificate file on your computer.
152+
> [!NOTE]
153+
> Please leave the **Namespace** value blank.
154+
155+
7. On the **SAML Signing Certificate** section, click **Certificate(Base64)** and then save the certificate file on your computer.
150156

151157
![Configure Single Sign-On](./media/klue-tutorial/tutorial_klue_certificate.png)
152158

153-
1. Click **Save** button.
159+
8. Click **Save** button.
154160

155161
![Configure Single Sign-On](./media/klue-tutorial/tutorial_general_400.png)
156-
157-
1. On the **Klue Configuration** section, click **Configure Klue** to open **Configure sign-on** window. Copy the **SAML Entity ID and SAML Single Sign-On Service URL** from the **Quick Reference section.**
158162

159-
![Configure Single Sign-On](./media/klue-tutorial/tutorial_klue_configure.png)
163+
9. On the **Klue Configuration** section, click **Configure Klue** to open **Configure sign-on** window. Copy the **SAML Entity ID and SAML Single Sign-On Service URL** from the **Quick Reference section.**
160164

161-
1. To configure single sign-on on **Klue** side, you need to send the downloaded **Certificate(Base64), SAML Single Sign-On Service URL, and SAML Entity ID** to [Klue support team](mailto:support@klue.com).
165+
![Configure Single Sign-On](./media/klue-tutorial/tutorial_klue_configure.png)
162166

163-
> [!TIP]
164-
> You can now read a concise version of these instructions inside the [Azure portal](https://portal.azure.com), while you are setting up the app! After adding this app from the **Active Directory > Enterprise Applications** section, simply click the **Single Sign-On** tab and access the embedded documentation through the **Configuration** section at the bottom. You can read more about the embedded documentation feature here: [Azure AD embedded documentation]( https://go.microsoft.com/fwlink/?linkid=845985)
167+
10. To configure single sign-on on **Klue** side, you need to send the downloaded **Certificate(Base64), SAML Single Sign-On Service URL, and SAML Entity ID** to [Klue support team](mailto:[email protected]).
165168

166169
### Creating an Azure AD test user
170+
167171
The objective of this section is to create a test user in the Azure portal called Britta Simon.
168172

169173
![Create Azure AD User][100]
@@ -172,18 +176,18 @@ The objective of this section is to create a test user in the Azure portal calle
172176

173177
1. In the **Azure portal**, on the left navigation pane, click **Azure Active Directory** icon.
174178

175-
![Creating an Azure AD test user](./media/klue-tutorial/create_aaduser_01.png)
179+
![Creating an Azure AD test user](./media/klue-tutorial/create_aaduser_01.png)
180+
181+
2. To display the list of users, go to **Users and groups** and click **All users**.
182+
183+
![Creating an Azure AD test user](./media/klue-tutorial/create_aaduser_02.png)
184+
185+
3. To open the **User** dialog, click **Add** on the top of the dialog.
176186

177-
1. To display the list of users, go to **Users and groups** and click **All users**.
178-
179-
![Creating an Azure AD test user](./media/klue-tutorial/create_aaduser_02.png)
187+
![Creating an Azure AD test user](./media/klue-tutorial/create_aaduser_03.png)
180188

181-
1. To open the **User** dialog, click **Add** on the top of the dialog.
182-
183-
![Creating an Azure AD test user](./media/klue-tutorial/create_aaduser_03.png)
189+
4. On the **User** dialog page, perform the following steps:
184190

185-
1. On the **User** dialog page, perform the following steps:
186-
187191
![Creating an Azure AD test user](./media/klue-tutorial/create_aaduser_04.png)
188192

189193
a. In the **Name** textbox, type **BrittaSimon**.
@@ -193,13 +197,13 @@ The objective of this section is to create a test user in the Azure portal calle
193197
c. Select **Show Password** and write down the value of the **Password**.
194198

195199
d. Click **Create**.
196-
200+
197201
### Creating a Klue test user
198202

199203
The objective of this section is to create a user called Britta Simon in Klue. Klue supports just-in-time provisioning, which is by default enabled. There is no action item for you in this section. A new user is created during an attempt to access Klue if it doesn't exist yet.
200204

201-
>[!Note]
202-
>If you need to create a user manually, Contact [Klue support team](mailto:[email protected]).
205+
> [!Note]
206+
> If you need to create a user manually, Contact [Klue support team](mailto:[email protected]).
203207
204208
### Assigning the Azure AD test user
205209

@@ -213,24 +217,24 @@ In this section, you enable Britta Simon to use Azure single sign-on by granting
213217

214218
![Assign User][201]
215219

216-
1. In the applications list, select **Klue**.
220+
2. In the applications list, select **Klue**.
217221

218222
![Configure Single Sign-On](./media/klue-tutorial/tutorial_klue_app.png)
219223

220-
1. In the menu on the left, click **Users and groups**.
224+
3. In the menu on the left, click **Users and groups**.
221225

222-
![Assign User][202]
226+
![Assign User][202]
223227

224-
1. Click **Add** button. Then select **Users and groups** on **Add Assignment** dialog.
228+
4. Click **Add** button. Then select **Users and groups** on **Add Assignment** dialog.
225229

226230
![Assign User][203]
227231

228-
1. On **Users and groups** dialog, select **Britta Simon** in the Users list.
232+
5. On **Users and groups** dialog, select **Britta Simon** in the Users list.
233+
234+
6. Click **Select** button on **Users and groups** dialog.
229235

230-
1. Click **Select** button on **Users and groups** dialog.
236+
7. Click **Assign** button on **Add Assignment** dialog.
231237

232-
1. Click **Assign** button on **Add Assignment** dialog.
233-
234238
### Testing single sign-on
235239

236240
In this section, you test your Azure AD single sign-on configuration using the Access Panel.
@@ -243,8 +247,6 @@ For more information about the Access Panel, see [Introduction to the Access
243247
* [List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory](tutorial-list.md)
244248
* [What is application access and single sign-on with Azure Active Directory?](../manage-apps/what-is-single-sign-on.md)
245249

246-
247-
248250
<!--Image references-->
249251

250252
[1]: ./media/klue-tutorial/tutorial_general_01.png
@@ -257,5 +259,4 @@ For more information about the Access Panel, see [Introduction to the Access
257259
[200]: ./media/klue-tutorial/tutorial_general_200.png
258260
[201]: ./media/klue-tutorial/tutorial_general_201.png
259261
[202]: ./media/klue-tutorial/tutorial_general_202.png
260-
[203]: ./media/klue-tutorial/tutorial_general_203.png
261-
262+
[203]: ./media/klue-tutorial/tutorial_general_203.png

0 commit comments

Comments
 (0)