Merge pull request #5058 from KoenZomers/FixDeviceLoginOnLinux

Fixing devicelogin not working on a desktopless Linux device

Author: KoenZomers

CHANGELOG.md

@@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Fix `Add/Publish/Unpublish/Remove-PnPApp` cmdlets to properly handle the issue in no-script sites.
 - Fix `Get-PnPHubSiteChild` cmdlet to handle vanity domains. [#4965](https://github.com/pnp/powershell/pull/4965)
 - Fix `Connect-PnPOnline` not working correctly with `-DeviceLogin` in Azure Cloud Shell.
+- Fix `Connect-PnPOnline` not working correctly with `-DeviceLogin` in desktop-less environments, such as on a Raspberry Pi [#5058](https://github.com/pnp/powershell/pull/5058)
 
 ### Removed
 

documentation/Connect-PnPOnline.md

@@ -56,7 +56,7 @@ Connect-PnPOnline [-ReturnConnection] [-Url] <String> [-CreateDrive] [-DriveName
 
 ### DeviceLogin
 ```powershell
-Connect-PnPOnline [-ReturnConnection] [-Url] <String> [-PersistLogin] [-CreateDrive] [-DriveName <String>] [-DeviceLogin] -Tenant <String>
+Connect-PnPOnline [-ReturnConnection] [-Url] <String> [-PersistLogin] [-CreateDrive] [-DriveName <String>] -DeviceLogin -Tenant <String>
  [-ClientId <String>] [-AzureEnvironment <AzureEnvironment>] 
  [-ValidateConnection] [-MicrosoftGraphEndPoint <string>]
  [-AzureADLoginEndPoint <string>] [-Connection <PnPConnection>]

src/Commands/Base/PnPConnection.cs

@@ -286,15 +286,34 @@ internal static PnPConnection CreateWithDeviceLogin(string clientId, string url,
                      }
                      else
                      {
+                         var copiedToClipboard = true;
                          try
                          {
                              ClipboardService.SetText(deviceCodeResult.UserCode);
                          }
                          catch
                          {
+                             copiedToClipboard = false;
+                         }
+
+                         var browserOpened = true;
+                         try
+                         {
+                             BrowserHelper.OpenBrowserForInteractiveLogin(deviceCodeResult.VerificationUrl, BrowserHelper.FindFreeLocalhostRedirectUri(), cancellationTokenSource);
+                         }
+                         catch
+                         {
+                             browserOpened = false;
+                         }
+
+                         if (copiedToClipboard && browserOpened)
+                         {
+                             messageWriter.LogWarning($"\n\nCode {deviceCodeResult.UserCode} has been copied to your clipboard and a new tab in the browser has been opened. Please paste this code in there and proceed.\n\n");
+                         }
+                         else
+                         {
+                            messageWriter.LogWarning($"\n\nOpen a browser, navigate to {deviceCodeResult.VerificationUrl} and authenticate using code {deviceCodeResult.UserCode} to proceed.\n\n");
                          }
-                         messageWriter.LogWarning($"\n\nCode {deviceCodeResult.UserCode} has been copied to your clipboard and a new tab in the browser has been opened. Please paste this code in there and proceed.\n\n");
-                         BrowserHelper.OpenBrowserForInteractiveLogin(deviceCodeResult.VerificationUrl, BrowserHelper.FindFreeLocalhostRedirectUri(), cancellationTokenSource);
                      }
 
                      return Task.FromResult(0);