From bb16995dbbd307770954493c578c28f277d3f7ee Mon Sep 17 00:00:00 2001 From: Alexis Delhaie Date: Thu, 10 Dec 2020 10:37:10 +0100 Subject: [PATCH] Fixing Basic authentication --- .../endpoint/configuration/AboutDialog.java | 2 +- .../endpoint/utils/AuthorizationDialog.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/ovh/alexisdelhaie/endpoint/configuration/AboutDialog.java b/src/main/java/ovh/alexisdelhaie/endpoint/configuration/AboutDialog.java index 689b0f3..c14b49d 100644 --- a/src/main/java/ovh/alexisdelhaie/endpoint/configuration/AboutDialog.java +++ b/src/main/java/ovh/alexisdelhaie/endpoint/configuration/AboutDialog.java @@ -13,7 +13,7 @@ public class AboutDialog extends JDialog { public static final int WIDTH = 740; public static final int HEIGHT = 500; - public static final String VERSION = "0.1.5"; + public static final String VERSION = "0.1.5.1"; private JPanel contentPane; private JLabel version; diff --git a/src/main/java/ovh/alexisdelhaie/endpoint/utils/AuthorizationDialog.java b/src/main/java/ovh/alexisdelhaie/endpoint/utils/AuthorizationDialog.java index d445eaf..a6ec5b1 100644 --- a/src/main/java/ovh/alexisdelhaie/endpoint/utils/AuthorizationDialog.java +++ b/src/main/java/ovh/alexisdelhaie/endpoint/utils/AuthorizationDialog.java @@ -66,11 +66,14 @@ public class AuthorizationDialog extends JDialog { private void onOK() { String type = (String) typeBox.getSelectedItem(); switch (Objects.requireNonNull(type)) { - case "Basic" -> finalValue = Tools.toBase64( - String.format( - "%s:%s", - usernameBasicField.getText(), - passwordBasicField.getText() + case "Basic" -> finalValue = String.format( + "Basic %s", + Tools.toBase64( + String.format( + "%s:%s", + usernameBasicField.getText(), + passwordBasicField.getText() + ) ) ); case "Bearer" -> finalValue = String.format("Bearer %s", bearerTokenField.getText());