Skip to content

Commit 0c78186

Browse files
committed
resolving merge conflict
2 parents 2b8355d + 7d05202 commit 0c78186

File tree

116 files changed

+51807
-726
lines changed

Some content is hidden

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

116 files changed

+51807
-726
lines changed

.openpublishing.redirection.json

Lines changed: 49454 additions & 0 deletions
Large diffs are not rendered by default.

articles/active-directory/develop/quickstart-v2-aspnet-core-webapp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ In this quickstart, you use a code sample to learn how an ASP.NET Core web app c
6565
> [!div class="sxs-lookup" renderon="portal"]
6666
> Run the project using Visual Studio 2019.
6767
> [!div renderon="portal" id="autoupdate" class="nextstepaction"]
68-
> [Download the code sample]()
68+
> [Download the code sample](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/archive/aspnetcore2-2.zip)
6969
7070
> [!div class="sxs-lookup" renderon="portal"]
7171
> #### Step 3: Your app is configured and ready to run

articles/active-directory/develop/quickstart-v2-aspnet-webapp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ In this quickstart, you use a code sample to learn how an ASP.NET web app to sig
6363
> [!div renderon="portal"]
6464
> Run the project using Visual Studio 2019.
6565
> [!div renderon="portal" id="autoupdate" class="nextstepaction"]
66-
> [Download the code sample]()
66+
> [Download the code sample](https://github.com/AzureADQuickStarts/AppModelv2-WebApp-OpenIDConnect-DotNet/archive/master.zip)
6767
6868
> [!div class="sxs-lookup" renderon="portal"]
6969
> #### Step 3: Your app is configured and ready to run

articles/active-directory/develop/quickstart-v2-java-webapp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ To run this sample you will need:
9595
> Put the generated keystore file in the "resources" folder.
9696
9797
> [!div renderon="portal" id="autoupdate" class="nextstepaction"]
98-
> [Download the code sample]()
98+
> [Download the code sample](https://github.com/Azure-Samples/ms-identity-java-webapp/archive/master.zip)
9999
100100
> [!div renderon="docs"]
101101
> #### Step 3: Configure the code sample

articles/active-directory/develop/quickstart-v2-javascript.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
7878
> Run the project with a web server by using Node.js
7979
8080
> [!div renderon="portal" id="autoupdate" class="nextstepaction"]
81-
> [Download the code sample]()
81+
> [Download the code sample](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2/archive/quickstart.zip)
8282
8383
> [!div renderon="docs"]
8484

articles/active-directory/devices/faq.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
1919

2020
## General FAQ
2121

22-
### Q: I registered the device recently. Why cant I see the device under my user info in the Azure portal? Or why is the device owner marked as N/A for hybrid Azure Active Directory (Azure AD) joined devices?
22+
### Q: I registered the device recently. Why can't I see the device under my user info in the Azure portal? Or why is the device owner marked as N/A for hybrid Azure Active Directory (Azure AD) joined devices?
2323

2424
**A:** Windows 10 devices that are hybrid Azure AD joined don't show up under **USER devices**.
2525
Use the **All devices** view in the Azure portal. You can also use a PowerShell [Get-MsolDevice](/powershell/module/msonline/get-msoldevice?view=azureadps-1.0) cmdlet.
@@ -126,7 +126,7 @@ See below on how these actions can be rectified.
126126
**A:** It takes up to an hour for a revoke to be applied from the time the Azure AD device is marked as disabled.
127127

128128
>[!NOTE]
129-
>For enrolled devices, we recommend that you wipe the device to make sure users can't access the resources. For more information, see [What is device enrollment?](/intune/deploy-use/enroll-devices-in-microsoft-intune).
129+
>For enrolled devices, we recommend that you wipe the device to make sure users can't access the resources. For more information, see [What is device enrollment?](/mem/intune/user-help/use-managed-devices-to-get-work-done).
130130
131131
---
132132

@@ -188,7 +188,7 @@ Deleted or disabled users who didn't sign in previously can't access a device. T
188188

189189
---
190190

191-
### Q: Why do my users see *You cant get there from here*?
191+
### Q: Why do my users see *You can't get there from here*?
192192

193193
**A:** Did you configure certain Conditional Access rules to require a specific device state? If the device doesn't meet the criteria, users are blocked, and they see that message.
194194
Evaluate the Conditional Access policy rules. Make sure the device meets the criteria to avoid the message.
@@ -309,8 +309,8 @@ Enable the following registry to block your users from adding additional work ac
309309

310310
**A:** Take the following steps:
311311

312-
1. [Create a compliance policy](/intune/compliance-policy-create-mac-os)
313-
1. [Define a Conditional Access policy for macOS devices](../active-directory-conditional-access-azure-portal.md)
312+
1. [Create a compliance policy](/intune/compliance-policy-create-mac-os)
313+
1. [Define a Conditional Access policy for macOS devices](../active-directory-conditional-access-azure-portal.md)
314314

315315
**Remarks:**
316316

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
---
2+
title: 'Tutorial: Azure Active Directory single sign-on (SSO) integration with Skills Workflow | Microsoft Docs'
3+
description: Learn how to configure single sign-on between Azure Active Directory and Skills Workflow.
4+
services: active-directory
5+
documentationCenter: na
6+
author: jeevansd
7+
manager: mtillman
8+
ms.reviewer: barbkess
9+
10+
ms.assetid: 4db0c061-7d61-43a9-b1b2-de0f409d116c
11+
ms.service: active-directory
12+
ms.subservice: saas-app-tutorial
13+
ms.workload: identity
14+
ms.tgt_pltfrm: na
15+
ms.topic: tutorial
16+
ms.date: 03/16/2020
17+
ms.author: jeedes
18+
19+
ms.collection: M365-identity-device-management
20+
---
21+
22+
# Tutorial: Azure Active Directory single sign-on (SSO) integration with Skills Workflow
23+
24+
In this tutorial, you'll learn how to integrate Skills Workflow with Azure Active Directory (Azure AD). When you integrate Skills Workflow with Azure AD, you can:
25+
26+
* Control in Azure AD who has access to Skills Workflow.
27+
* Enable your users to be automatically signed-in to Skills Workflow with their Azure AD accounts.
28+
* Manage your accounts in one central location - the Azure portal.
29+
30+
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on).
31+
32+
## Prerequisites
33+
34+
To get started, you need the following items:
35+
36+
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
37+
* Skills Workflow single sign-on (SSO) enabled subscription.
38+
39+
## Scenario description
40+
41+
In this tutorial, you configure and test Azure AD SSO in a test environment.
42+
43+
* Skills Workflow supports **SP** initiated SSO
44+
* Once you configure Skills Workflow you can enforce session control, which protect exfiltration and infiltration of your organization’s sensitive data in real-time. Session control extend from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](https://docs.microsoft.com/cloud-app-security/proxy-deployment-any-app).
45+
46+
## Adding Skills Workflow from the gallery
47+
48+
To configure the integration of Skills Workflow into Azure AD, you need to add Skills Workflow from the gallery to your list of managed SaaS apps.
49+
50+
1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account, or a personal Microsoft account.
51+
1. On the left navigation pane, select the **Azure Active Directory** service.
52+
1. Navigate to **Enterprise Applications** and then select **All Applications**.
53+
1. To add new application, select **New application**.
54+
1. In the **Add from the gallery** section, type **Skills Workflow** in the search box.
55+
1. Select **Skills Workflow** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
56+
57+
## Configure and test Azure AD single sign-on for Skills Workflow
58+
59+
Configure and test Azure AD SSO with Skills Workflow using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Skills Workflow.
60+
61+
To configure and test Azure AD SSO with Skills Workflow, complete the following building blocks:
62+
63+
1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
64+
* **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
65+
* **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
66+
1. **[Configure Skills Workflow SSO](#configure-skills-workflow-sso)** - to configure the single sign-on settings on application side.
67+
* **[Create Skills Workflow test user](#create-skills-workflow-test-user)** - to have a counterpart of B.Simon in Skills Workflow that is linked to the Azure AD representation of user.
68+
1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
69+
70+
## Configure Azure AD SSO
71+
72+
Follow these steps to enable Azure AD SSO in the Azure portal.
73+
74+
1. In the [Azure portal](https://portal.azure.com/), on the **Skills Workflow** application integration page, find the **Manage** section and select **single sign-on**.
75+
1. On the **Select a single sign-on method** page, select **SAML**.
76+
1. On the **Set up single sign-on with SAML** page, click the edit/pen icon for **Basic SAML Configuration** to edit the settings.
77+
78+
![Edit Basic SAML Configuration](common/edit-urls.png)
79+
80+
1. On the **Basic SAML Configuration** section, perform the following steps:
81+
82+
a. In the **Sign-on URL** text box, type a URL:
83+
`https://auth.skillsworkflow.com/saml2/acs`
84+
85+
b. In the **Identifier** text box, type a URL:
86+
`https://auth.skillsworkflow.com/saml2`
87+
88+
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Federation Metadata XML** and select **Download** to download the certificate and save it on your computer.
89+
90+
![The Certificate download link](common/metadataxml.png)
91+
92+
1. On the **Set up Skills Workflow** section, copy the appropriate URL(s) based on your requirement.
93+
94+
![Copy configuration URLs](common/copy-configuration-urls.png)
95+
96+
### Create an Azure AD test user
97+
98+
In this section, you'll create a test user in the Azure portal called B.Simon.
99+
100+
1. From the left pane in the Azure portal, select **Azure Active Directory**, select **Users**, and then select **All users**.
101+
1. Select **New user** at the top of the screen.
102+
1. In the **User** properties, follow these steps:
103+
1. In the **Name** field, enter `B.Simon`.
104+
1. In the **User name** field, enter the [email protected]. For example, `[email protected]`.
105+
1. Select the **Show password** check box, and then write down the value that's displayed in the **Password** box.
106+
1. Click **Create**.
107+
108+
### Assign the Azure AD test user
109+
110+
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Skills Workflow.
111+
112+
1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
113+
1. In the applications list, select **Skills Workflow**.
114+
1. In the app's overview page, find the **Manage** section and select **Users and groups**.
115+
116+
![The "Users and groups" link](common/users-groups-blade.png)
117+
118+
1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
119+
120+
![The Add User link](common/add-assign-user.png)
121+
122+
1. In the **Users and groups** dialog, select **B.Simon** from the Users list, then click the **Select** button at the bottom of the screen.
123+
1. If you're expecting any role value in the SAML assertion, in the **Select Role** dialog, select the appropriate role for the user from the list and then click the **Select** button at the bottom of the screen.
124+
1. In the **Add Assignment** dialog, click the **Assign** button.
125+
126+
## Configure Skills Workflow SSO
127+
128+
To configure single sign-on on **Skills Workflow** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [Skills Workflow support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
129+
130+
### Create Skills Workflow test user
131+
132+
In this section, you create a user called B.Simon in Skills Workflow. Work with [Skills Workflow support team](mailto:[email protected]) to add the users in the Skills Workflow platform. Users must be created and activated before you use single sign-on.
133+
134+
## Test SSO
135+
136+
In this section, you test your Azure AD single sign-on configuration using the Access Panel.
137+
138+
When you click the Skills Workflow tile in the Access Panel, you should be automatically signed in to the Skills Workflow for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](https://docs.microsoft.com/azure/active-directory/active-directory-saas-access-panel-introduction).
139+
140+
## Additional resources
141+
142+
- [List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
143+
144+
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on)
145+
146+
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
147+
148+
- [Try Skills Workflow with Azure AD](https://aad.portal.azure.com/)
149+
150+
- [What is session control in Microsoft Cloud App Security?](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)
151+
152+
- [How to protect Skills Workflow with advanced visibility and controls](https://docs.microsoft.com/cloud-app-security/proxy-intro-aad)

articles/active-directory/saas-apps/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,6 +1334,8 @@
13341334
href: skillsbase-tutorial.md
13351335
- name: Skills Manager
13361336
href: skillsmanager-tutorial.md
1337+
- name: Skills Workflow
1338+
href: skills-workflow-tutorial.md
13371339
- name: SkyDesk Email
13381340
href: skydeskemail-tutorial.md
13391341
- name: Skyhigh Networks

articles/aks/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ AKS agent nodes are billed as standard Azure virtual machines, so if you've purc
130130

131131
## Can I move/migrate my cluster between Azure tenants?
132132

133-
The `az aks update-credentials` command can be used to move an AKS cluster between Azure tenants. Follow the instructions in [Choose to update or create a service principal](https://docs.microsoft.com/azure/aks/update-credentials) and then [update aks cluster with new credentials](https://docs.microsoft.com/azure/aks/update-credentials#update-aks-cluster-with-new-credentials).
133+
The `az aks update-credentials` command can be used to move an AKS cluster between Azure tenants. Follow the instructions in [Choose to update or create a service principal](https://docs.microsoft.com/azure/aks/update-credentials) and then [update aks cluster with new credentials](https://docs.microsoft.com/azure/aks/update-credentials#update-aks-cluster-with-new-service-principal-credentials).
134134

135135
## Can I move/migrate my cluster between subscriptions?
136136

articles/aks/private-clusters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ As mentioned, VNet peering is one way to access your private cluster. To use VNe
100100
[az-feature-list]: /cli/azure/feature?view=azure-cli-latest#az-feature-list
101101
[az-extension-add]: /cli/azure/extension#az-extension-add
102102
[az-extension-update]: /cli/azure/extension#az-extension-update
103-
[private-link-service]: /private-link/private-link-service-overview
103+
[private-link-service]: /azure/private-link/private-link-service-overview
104104
[virtual-network-peering]: ../virtual-network/virtual-network-peering-overview.md
105105
[azure-bastion]: ../bastion/bastion-create-host-portal.md
106106
[express-route-or-vpn]: ../expressroute/expressroute-about-virtual-network-gateways.md

0 commit comments

Comments
 (0)