From f3edb00d16125f0ab0f81c9b9814c2089515f682 Mon Sep 17 00:00:00 2001
From: Craig Wisniewski <craig.wisniewski@gmail.com>
Date: Tue, 9 Feb 2021 17:29:43 +1030
Subject: [PATCH] Require password to connect to server

---
 .../rptools/maptool/client/ui/ConnectToServerDialog.java  | 8 ++++++++
 .../net/rptools/maptool/language/i18n.properties          | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/net/rptools/maptool/client/ui/ConnectToServerDialog.java b/src/main/java/net/rptools/maptool/client/ui/ConnectToServerDialog.java
index aa966d85d1..00586a6c56 100644
--- a/src/main/java/net/rptools/maptool/client/ui/ConnectToServerDialog.java
+++ b/src/main/java/net/rptools/maptool/client/ui/ConnectToServerDialog.java
@@ -241,6 +241,10 @@ public JTextField getUsernameTextField() {
     return (JTextField) getComponent("@username");
   }
 
+  public JTextField getPasswordTextField() {
+    return (JTextField) getComponent("@password");
+  }
+
   public JTextField getPortTextField() {
     return (JTextField) getComponent("@port");
   }
@@ -263,6 +267,10 @@ private void handleOK() {
       MapTool.showError("ServerDialog.error.username"); // $NON-NLS-1$
       return;
     }
+    if (getPasswordTextField().getText().length() == 0) {
+      MapTool.showError("ServerDialog.error.noConnectPassword"); // $NON-NLS-1$
+      return;
+    }
     getUsernameTextField().setText(username);
 
     String externalAddress = "Unknown";
diff --git a/src/main/resources/net/rptools/maptool/language/i18n.properties b/src/main/resources/net/rptools/maptool/language/i18n.properties
index cf7af0efc9..04ff154411 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n.properties
@@ -564,6 +564,7 @@ ServerDialog.error.portNumberException = Port from RPTools registry is not numer
 ServerDialog.error.server              = You must enter a server name or IP address.
 ServerDialog.error.serverNotFound      = Server "{0}" not found.
 ServerDialog.error.username            = A username must be provided.
+ServerDialog.error.noConnectPassword   = You must enter a password to connect to a server.
 ServerDialog.error.passwordMissing     = Both Player and GM Password must be provided.
 ServerDialog.error.passwordMustDiffer  = Player and GM Password can not be the same.