Allow Microsoft authentication to use xdg-open on Linux

joshricker · Jan 4, 2022 · 291f62a · 291f62a
1 parent 28017e8
commit 291f62a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/launcher/src/main/java/com/skcraft/launcher/auth/microsoft/MicrosoftWebAuthorizer.java b/launcher/src/main/java/com/skcraft/launcher/auth/microsoft/MicrosoftWebAuthorizer.java
@@ -1,6 +1,7 @@
 package com.skcraft.launcher.auth.microsoft;
 
 import com.skcraft.launcher.auth.AuthenticationException;
+import com.skcraft.launcher.swing.SwingHelper;
 import com.skcraft.launcher.util.HttpRequest;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -30,7 +31,7 @@ public OauthResult authorize() throws IOException, AuthenticationException, Inte
 
 	private OauthResult authorizeInteractive() throws IOException, AuthenticationException, InterruptedException {
 		OauthHttpHandler httpHandler = new OauthHttpHandler();
-		Desktop.getDesktop().browse(generateInteractiveUrl(httpHandler.getPort()));
+		SwingHelper.openURL(generateInteractiveUrl(httpHandler.getPort()));
 
 		return httpHandler.await();
 	}

diff --git a/launcher/src/main/java/com/skcraft/launcher/swing/SwingHelper.java b/launcher/src/main/java/com/skcraft/launcher/swing/SwingHelper.java
@@ -35,6 +35,7 @@
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.List;
@@ -104,23 +105,25 @@ public static void openURL(@NonNull String url, @NonNull Component parentCompone
      */
     public static void openURL(URL url, Component parentComponent) {
         try {
-            Desktop.getDesktop().browse(url.toURI());
-        } catch (UnsupportedOperationException e) {
-            if (Environment.detectPlatform() == Platform.LINUX) {
-                // Try xdg-open instead
-                try {
-                    Runtime.getRuntime().exec(new String[]{"xdg-open", url.toString()});
-                } catch (IOException ex) {
-                    showErrorDialog(parentComponent, tr("errors.openUrlError", url.toString()), tr("errorTitle"), ex);
-                }
-            }
+            openURL(url.toURI());
         } catch (IOException e) {
             showErrorDialog(parentComponent, tr("errors.openUrlError", url.toString()), SharedLocale.tr("errorTitle"));
         } catch (URISyntaxException e) {
             log.log(Level.WARNING, "Malformed URL; this is a programming error!", e);
         }
     }
 
+    public static void openURL(URI url) throws IOException {
+        try {
+            Desktop.getDesktop().browse(url);
+        } catch (UnsupportedOperationException e) {
+            if (Environment.detectPlatform() == Platform.LINUX) {
+                // Try xdg-open instead
+                Runtime.getRuntime().exec(new String[]{"xdg-open", url.toString()});
+            }
+        }
+    }
+
     /**
      * Shows an popup error dialog, with potential extra details shown either immediately
      * or available on the dialog.