Merge branch 'master' into rel/2.2.0

Author: nmetulev

Microsoft.Toolkit.Uwp.Services/Services/OneDrive/OneDriveService.cs

@@ -45,6 +45,11 @@ public class OneDriveService : Toolkit.Services.OneDrive.OneDriveService
         /// </summary>
         private static Toolkit.Services.OneDrive.OneDriveService _graphInstance;
 
+        /// <summary>
+        /// Private field for OnlineIdAuthenticationProvider.PromptType.
+        /// </summary>
+        private OnlineIdAuthenticationProvider.PromptType _onlineIdPromptType = OnlineIdAuthenticationProvider.PromptType.PromptIfNeeded;
+
         /// <summary>
         /// Gets public singleton property - new version that depends on Graph service / SDK - only supports ADAL v2 endpoint.
         /// </summary>
@@ -93,14 +98,28 @@ public static Toolkit.Services.OneDrive.OneDriveService GraphInstance
             }
         }
 
+        /// <summary>
+        /// Initialize OneDrive Service only for OnlineId Provider
+        /// </summary>
+        /// <param name="onlineIdPromptType">Specify whether to prompt for credentials. Set to DoNotPrompt if calling from a background task.</param>
+        /// <returns>Success or failure</returns>
+        public bool Initialize(OnlineIdAuthenticationProvider.PromptType onlineIdPromptType)
+        {
+            OneDriveScopes scopes = OneDriveScopes.ReadWrite | OneDriveScopes.OfflineAccess;
+            _onlineIdPromptType = onlineIdPromptType;
+            return Initialize(scopes, _onlineIdPromptType);
+        }
+
         /// <summary>
         /// Initialize OneDrive Service only for OnlineId Provider
         /// </summary>
         /// <param name="scopes">Scopes represent various permission levels that an app can request from a user</param>
+        /// <param name="onlineIdPromptType">Specify whether to prompt for credentials. Set to DoNotPrompt if calling from a background task.</param>
         /// <returns>Success or failure</returns>
-        public bool Initialize(OneDriveScopes scopes = OneDriveScopes.ReadWrite | OneDriveScopes.OfflineAccess)
+        public bool Initialize(OneDriveScopes scopes = OneDriveScopes.ReadWrite | OneDriveScopes.OfflineAccess, OnlineIdAuthenticationProvider.PromptType onlineIdPromptType = OnlineIdAuthenticationProvider.PromptType.PromptIfNeeded)
         {
-            return Initialize(null, AccountProviderType.OnlineId, scopes);
+            _onlineIdPromptType = onlineIdPromptType;
+            return Initialize(null, AccountProviderType.OnlineId, scopes, _onlineIdPromptType);
         }
 
         /// <summary>
@@ -112,10 +131,13 @@ public bool Initialize(OneDriveScopes scopes = OneDriveScopes.ReadWrite | OneDri
         /// <para>AccountProviderType.Msa: Authenticate the user with a Microsoft Account. You need to register your app https://apps.dev.microsoft.com in the SDK Live section</para>
         /// <para>AccountProviderType.Adal: Authenticate the user with a Office 365 Account. You need to register your in Azure Active Directory</para></param>
         /// <param name="scopes">Scopes represent various permission levels that an app can request from a user. Could be null if AccountProviderType.Adal is used </param>
+        /// <param name="onlineIdPromptType">Specify whether to prompt for credentials. Set to DoNotPrompt if calling from a background task.</param>
         /// <remarks>If AccountProvider</remarks>
         /// <returns>Success or failure.</returns>
-        public bool Initialize(string appClientId, AccountProviderType accountProviderType = AccountProviderType.OnlineId, OneDriveScopes scopes = OneDriveScopes.ReadWrite | OneDriveScopes.OfflineAccess)
+        public bool Initialize(string appClientId, AccountProviderType accountProviderType = AccountProviderType.OnlineId, OneDriveScopes scopes = OneDriveScopes.ReadWrite | OneDriveScopes.OfflineAccess, OnlineIdAuthenticationProvider.PromptType onlineIdPromptType = OnlineIdAuthenticationProvider.PromptType.PromptIfNeeded)
         {
+            _onlineIdPromptType = onlineIdPromptType;
+
             if (accountProviderType != AccountProviderType.OnlineId && string.IsNullOrEmpty(appClientId))
             {
                 throw new ArgumentNullException(nameof(appClientId));
@@ -204,7 +226,7 @@ public override async Task<bool> LoginAsync()
             else if (_accountProviderType == AccountProviderType.OnlineId)
             {
                 OneDriveAuthenticationHelper.ResourceUri = "https://api.onedrive.com/v1.0";
-                _accountProvider = new OnlineIdAuthenticationProvider(Scopes);
+                _accountProvider = new OnlineIdAuthenticationProvider(Scopes, _onlineIdPromptType);
                 await ((MsaAuthenticationProvider)_accountProvider).RestoreMostRecentFromCacheOrAuthenticateUserAsync();
                 resourceEndpointUri = OneDriveAuthenticationHelper.ResourceUri;
             }

docs/services/OneDrive.md

@@ -75,6 +75,9 @@ var folder = await OneDriveService.Instance.RootFolderAsync();
 
 ```csharp
 
+// if Windows is associated with a Microsoft account, and your project is associated with the Store then you may use OnlineId for seamless login. If you are doing this and initializing from a background task, then you need to explictly request that no credentials prompt be displayed.
+OneDriveService.Instance.Initialize(Microsoft.OneDrive.Sdk.OnlineIdAuthenticationProvider.PromptType.DoNotPrompt);
+
 // if Windows is not associated with a Microsoft Account, you need to initialize the service using an authentication provider AccountProviderType.Msa or AccountProviderType.Adal
 OneDriveService.Instance.Initialize(appClientId, AccountProviderType.Msa, OneDriveScopes.OfflineAccess | OneDriveScopes.ReadWrite);