Skip to content

Commit 282314c

Browse files
committed
resolve merge-blocking issues
1 parent 64ef148 commit 282314c

File tree

5 files changed

+11
-21
lines changed

5 files changed

+11
-21
lines changed

articles/active-directory/develop/apple-sso-plugin.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Microsoft Enterprise SSO plug-in for Apple devices
3-
titleSuffix: Microsoft identity platform
3+
titleSuffix: Microsoft identity platform | Azure
44
description: Learn about Microsoft's Azure Active Directory SSO plug-in for iOS and macOS devices.
55
services: active-directory
66
author: brandwe
@@ -25,7 +25,7 @@ ms.custom: aaddev
2525
2626
The *Microsoft Enterprise SSO plug-in for Apple devices* provides single sign-on (SSO) for Active Directory accounts across all applications that support Apple's [Enterprise Single Sign-On](https://developer.apple.com/documentation/authenticationservices) feature. Microsoft worked closely with Apple to develop this plug-in to increase your application's usability while providing the best protection that Apple and Microsoft can provide.
2727

28-
In this Public Preview release, the Enterprise SSO plug-in is available only for iOS devices and is distributed in certain Microsoft applications. The list of products and applications that support the Enterprise SSO plug-in will be expanded in the future.
28+
In this Public Preview release, the Enterprise SSO plug-in is available only for iOS devices and is distributed in certain Microsoft applications.
2929

3030
Our first use of the Enterprise SSO plug-in is with our new [shared device mode](msal-ios-shared-devices.md) feature.
3131

@@ -36,10 +36,6 @@ The Microsoft Enterprise SSO plug-in for Apple devices offers the following bene
3636
- Provides SSO for Active Directory accounts across all applications that support Apple's Enterprise Single Sign-On feature.
3737
- Delivered automatically in the Microsoft Authenticator and can be enabled by any mobile device management (MDM) solution.
3838

39-
Planned but not yet available in this preview release:
40-
41-
- Provides SSO across Safari browsers and applications on the device.
42-
4339
## Requirements
4440

4541
To use Microsoft Enterprise SSO plug-in for Apple devices:

articles/active-directory/develop/msal-android-shared-devices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Shared device mode for Android devices
3-
titleSuffix: Microsoft identity platform
3+
titleSuffix: Microsoft identity platform | Azure
44
description: Learn how to enable shared device mode to allow Firstline Workers to share an Android device
55
services: active-directory
66
author: mmacy
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.date: 03/31/2020
1414
ms.author: marsma
1515
ms.reviewer: hahamil
16-
ms.custom: aaddev, identityplatformtop40
16+
ms.custom: aaddev, identitypla | Azuretformtop40
1717
---
1818

1919
# Shared device mode for Android devices

articles/active-directory/develop/msal-ios-shared-devices.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Shared device mode for iOS devices
3-
titleSuffix: Microsoft identity platform
3+
titleSuffix: Microsoft identity platform | Azure
44
description: Learn how to enable shared device mode to allow Firstline Workers to share an iOS device
55
services: active-directory
66
author: brandwe
@@ -43,16 +43,12 @@ To create a shared device mode app, developers and cloud device admins work toge
4343

4444
To configure the membership of your organizational roles in the Azure portal: **Azure Active Directory** > **Roles and Administrators** > **Cloud Device Administrator**
4545

46-
When this feature launches for production workloads, this step will be unnecessary as Microsoft Intune will be able to join the device to your organization as part of the initial setup. Support for additional MDMs is planned.
47-
4846
The following sections help you update your application to support shared device mode.
4947

50-
## Use Intune to enable shared device mode and the SSO extension
48+
## Use Intune to enable shared device mode & SSO extension
5149

5250
> [!NOTE]
5351
> The following step is required only during public preview.
54-
>
55-
> In the future, Intune will include the ability to turn on the Microsoft Enterprise SSO plug-in for Apple devices and enable shared device mode. The following steps are required only for this Public Preview.
5652
5753
Your device needs to be configured to support shared device mode. It must have iOS 13+ installed and be MDM-enrolled. MDM configuration also needs to enable [Microsoft Enterprise SSO plug-in for Apple devices](apple-sso-plugin.md). To learn more about SSO extensions, see the [Apple video](https://developer.apple.com/videos/play/tech-talks/301/).
5854

@@ -177,12 +173,10 @@ The following code removes the signed-in account and clears cached tokens from n
177173

178174
#### Clear browser state
179175

180-
In this public preview version, the [Microsoft Enterprise SSO plug-in for Apple devices](apple-sso-plugin.md) clears state only for applications. It does not clear state on the Safari browser. We recommend you manually clear browser session to ensure no traces of user state are left behind. You can use the optional `signoutFromBrowser` property shown below to clear any cookies. This will cause the browser to briefly launch on the device.
181-
182-
Microsoft plans to resolve this issue prior to general availability (GA) of this feature.
176+
> [!NOTE]
177+
> The following step is required only during public preview.
183178
184-
> [!TIP]
185-
> In a future release of this feature, the Microsoft Enterprise SSO plug-in for Apple devices will automatically add credentials to and remove them from the Safari browser on the shared device. When released, this documentation will be updated to include a recommendation that you rely on the new functionality to clear the browser state.
179+
In this public preview version, the [Microsoft Enterprise SSO plug-in for Apple devices](apple-sso-plugin.md) clears state only for applications. It does not clear state on the Safari browser. We recommend you manually clear browser session to ensure no traces of user state are left behind. You can use the optional `signoutFromBrowser` property shown below to clear any cookies. This will cause the browser to briefly launch on the device.
186180

187181
#### Swift
188182

articles/active-directory/develop/msal-shared-devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Shared device mode overview
3-
titleSuffix: Microsoft identity platform
3+
titleSuffix: Microsoft identity platform | Azure
44
description: Learn about shared device mode to enable device sharing for your Firstline Workers.
55
services: active-directory
66
author: brandwe

articles/active-directory/develop/scenario-mobile-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Build a mobile app that calls web APIs | Azure
3-
titleSuffix: Microsoft identity platform
3+
titleSuffix: Microsoft identity platform | Azure
44
description: Learn how to build a mobile app that calls web APIs (overview)
55
services: active-directory
66
documentationcenter: dev-center-name

0 commit comments

Comments
 (0)