Merge pull request #879 from Microsoft/cbarker/onedrivefixes

OneDrive for Business bug fixes, updated docs. Cleaned up Sample app …

Author: deltakosh

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OneDrive Service/OneDriveCode.bind

@@ -18,7 +18,7 @@
 // OneDrive For Business you need to register your app from the Azure Management Portal
 // For more information to manualy register your app see go to the following article
 // https://docs.microsoft.com/en-US/azure/active-directory/develop/active-directory-authentication-scenarios#basics-of-registering-an-application-in-azure-ad
-// When registering your application don't forget to add the Office 365 Sharepoint Online application with the "Read and Write user Files" permissions
+// When registering your application don't forget to add the Office 365 Sharepoint Online application with the "Read and Write user Files" permissions. You should set your Redirect URI to "urn:ietf:wg:oauth:2.0:oob". You may also need to add the following capabilities to your Package.appxmanifest: privateNetworkClientServer; enterpriseAuthentication
 
 // First get the root of your OneDrive
 // By default the service silently connects the current Windows user if Windows is associated with a Microsoft Account

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OneDrive Service/OneDrivePage.xaml

@@ -411,6 +411,11 @@
                                      x:Name="ClientId" 
                                      Margin="0,15,0,12"
                                      Text="" Visibility="Collapsed"/>
+                            <HyperlinkButton x:Name="ClientIdHelper" Margin="0,0,0,15"
+                                             Content="Show me how to get this ID"
+                                             NavigateUri="https://dev.onedrive.com/app-registration.htm"
+                                             Visibility="Collapsed"
+                                             />
                             <Button Content="Sign in" 
                                     x:Name="ConnectButton" 
                                     Click="ConnectButton_Click" 

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OneDrive Service/OneDrivePage.xaml.cs

@@ -11,6 +11,7 @@
 // ******************************************************************
 
 using System;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.Graph;
 using Microsoft.Toolkit.Uwp.Services.OneDrive;
@@ -46,6 +47,7 @@ private async Task SigninAsync(int indexProvider, string appClientId)
             }
 
             Shell.Current.DisplayWaitRing = true;
+            bool succeeded = false;
 
             try
             {
@@ -70,6 +72,7 @@ private async Task SigninAsync(int indexProvider, string appClientId)
 
                 _currentFolder = _rootFolder = await OneDriveService.Instance.RootFolderAsync();
                 OneDriveItemsList.ItemsSource = _rootFolder.GetItemsAsync();
+                succeeded = true;
             }
             catch (ServiceException serviceEx)
             {
@@ -85,23 +88,40 @@ private async Task SigninAsync(int indexProvider, string appClientId)
                 Shell.Current.DisplayWaitRing = false;
             }
 
-            FilesBox.Visibility = Visibility.Visible;
-            UserBox.Visibility = Visibility.Visible;
-            ClientIdBox.Visibility = Visibility.Collapsed;
-            LogOutButton.Visibility = Visibility.Visible;
-            ConnectButton.Visibility = Visibility.Collapsed;
-            menuButton.Visibility = Visibility.Visible;
-            BackButton.Visibility = Visibility.Visible;
+            if (succeeded)
+            {
+                FilesBox.Visibility = Visibility.Visible;
+                UserBox.Visibility = Visibility.Visible;
+                ClientIdBox.Visibility = Visibility.Collapsed;
+                ClientIdHelper.Visibility = Visibility.Collapsed;
+                LogOutButton.Visibility = Visibility.Visible;
+                ConnectButton.Visibility = Visibility.Collapsed;
+                menuButton.Visibility = Visibility.Visible;
+                BackButton.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                FilesBox.Visibility = Visibility.Collapsed;
+                UserBox.Visibility = Visibility.Collapsed;
+                ClientIdBox.Visibility = Visibility.Visible;
+                ClientIdHelper.Visibility = Visibility.Visible;
+                LogOutButton.Visibility = Visibility.Collapsed;
+                ConnectButton.Visibility = Visibility.Visible;
+                menuButton.Visibility = Visibility.Collapsed;
+                BackButton.Visibility = Visibility.Collapsed;
+            }
         }
 
         private async void ConnectButton_Click(object sender, RoutedEventArgs e)
         {
-            if (string.IsNullOrEmpty(ClientId.Text))
+            try
             {
-                return;
+                await SigninAsync(_indexProvider, ClientId.Text);
+            }
+            catch (Exception ex)
+            {
+                await OneDriveSampleHelpers.DisplayMessageAsync(ex.Message);
             }
-
-            await SigninAsync(_indexProvider, ClientId.Text);
         }
 
         private async void LogOutButton_Click(object sender, RoutedEventArgs e)
@@ -112,6 +132,7 @@ private async void LogOutButton_Click(object sender, RoutedEventArgs e)
             LogOutButton.Visibility = Visibility.Collapsed;
             UserBox.Visibility = Visibility.Collapsed;
             ClientIdBox.Visibility = Visibility.Visible;
+            ClientIdHelper.Visibility = Visibility.Visible;
             ConnectButton.Visibility = Visibility.Visible;
             BackButton.Visibility = Visibility.Collapsed;
             menuButton.Visibility = Visibility.Collapsed;
@@ -317,7 +338,7 @@ private async void CboProvider_SelectionChanged(object sender, SelectionChangedE
                 visibility = Visibility.Collapsed;
             }
 
-            ConnectButton.Visibility = ClientId.Visibility = visibility;
+            ClientIdHelper.Visibility = ConnectButton.Visibility = ClientId.Visibility = visibility;
         }
 
         private async void CopyToButton_Click(object sender, RoutedEventArgs e)

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

@@ -119,7 +119,7 @@ internal static IAuthenticationProvider CreateAdalAuthenticationProvider(string
         {
             var discoveryResourceUri = "https://api.office.com/discovery/";
             _appClientId = appClientId;
-            IdentityModel.Clients.ActiveDirectory.AuthenticationResult userAuthnResult = await _azureAdContext.AcquireTokenAsync(discoveryResourceUri, appClientId, new Uri(DefaultRedirectUri), new IdentityModel.Clients.ActiveDirectory.PlatformParameters(PromptBehavior.Always, false));
+            IdentityModel.Clients.ActiveDirectory.AuthenticationResult userAuthnResult = await _azureAdContext.AcquireTokenAsync(discoveryResourceUri, appClientId, new Uri(DefaultRedirectUri), new IdentityModel.Clients.ActiveDirectory.PlatformParameters(PromptBehavior.Auto, true));
             _userInfoSettings = SaveUserInfo(userAuthnResult);
             return userAuthnResult;
         }

docs/services/OneDrive.md

@@ -33,7 +33,8 @@ OneDrive for Business requires you to register your app in the Azure Management
 OneDrive For Business you need to register your app from the Azure Management Portal
 For more information to manualy register your app see go to the following article
 https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-authentication-scenarios#basics-of-registering-an-application-in-azure-ad
-When registering your application don't forget to add the Office 365 Sharepoint Online application with the "Read and Write user Files" permissions
+When registering your application don't forget to add the Office 365 Sharepoint Online application with the "Read and Write user Files" permissions. You should set your Redirect URI to "urn:ietf:wg:oauth:2.0:oob". You may also need to add the following capabilities to your Package.appxmanifest: privateNetworkClientServer; enterpriseAuthentication
+
 
 ## Syntax