From b150f86e99ee4fbccbd6d948bbe1cd11c3ae0bf5 Mon Sep 17 00:00:00 2001 From: miguelfigueiredo Date: Mon, 22 Dec 2025 16:19:57 +0000 Subject: [PATCH 1/5] Fix CLI login error Signed-off-by: miguelfigueiredo --- .../mirth/connect/cli/CommandLineInterface.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/com/mirth/connect/cli/CommandLineInterface.java index 1e785ab14..49945e93d 100644 --- a/command/src/com/mirth/connect/cli/CommandLineInterface.java +++ b/command/src/com/mirth/connect/cli/CommandLineInterface.java @@ -58,6 +58,7 @@ import com.mirth.connect.client.core.PaginatedEventList; import com.mirth.connect.client.core.PaginatedMessageList; import com.mirth.connect.client.core.PropertiesConfigurationUtil; +import com.mirth.connect.client.core.UnauthorizedException; import com.mirth.connect.donkey.model.channel.DeployedState; import com.mirth.connect.donkey.model.message.ContentType; import com.mirth.connect.donkey.model.message.Message; @@ -179,10 +180,17 @@ private void runShell(String server, String user, String password, String script client = new Client(server); this.debug = debug; - LoginStatus loginStatus = client.login(user, password); - - if (loginStatus.getStatus() != LoginStatus.Status.SUCCESS) { - error("Could not login to server.", null); + LoginStatus loginStatus = null; + try { + loginStatus = client.login(user, password); + } catch (UnauthorizedException ex) { + if (ex.getResponse() != null && ex.getResponse() instanceof LoginStatus) { + loginStatus = (LoginStatus) ex.getResponse(); + } + } + + if (loginStatus == null || loginStatus.getStatus() != LoginStatus.Status.SUCCESS) { + error("Could not login to server. Status: " + loginStatus.getStatus(), null); return; } From 8e7a76ac13bb69cf62be59719388ae4230e4615b Mon Sep 17 00:00:00 2001 From: miguelfigueiredo Date: Mon, 22 Dec 2025 17:32:40 +0000 Subject: [PATCH 2/5] Implement review changes Signed-off-by: miguelfigueiredo --- .../src/com/mirth/connect/cli/CommandLineInterface.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/com/mirth/connect/cli/CommandLineInterface.java index 49945e93d..5926e0306 100644 --- a/command/src/com/mirth/connect/cli/CommandLineInterface.java +++ b/command/src/com/mirth/connect/cli/CommandLineInterface.java @@ -180,16 +180,20 @@ private void runShell(String server, String user, String password, String script client = new Client(server); this.debug = debug; - LoginStatus loginStatus = null; + LoginStatus loginStatus; try { loginStatus = client.login(user, password); } catch (UnauthorizedException ex) { if (ex.getResponse() != null && ex.getResponse() instanceof LoginStatus) { loginStatus = (LoginStatus) ex.getResponse(); } + else { + error("Could not login to server.", ex); + return; + } } - if (loginStatus == null || loginStatus.getStatus() != LoginStatus.Status.SUCCESS) { + if (loginStatus.getStatus() != LoginStatus.Status.SUCCESS) { error("Could not login to server. Status: " + loginStatus.getStatus(), null); return; } From c4de1555605bf42e0aa90157aa4db3c143748f99 Mon Sep 17 00:00:00 2001 From: miguelfigueiredo Date: Mon, 22 Dec 2025 18:13:07 +0000 Subject: [PATCH 3/5] Implement suggestion Signed-off-by: miguelfigueiredo --- command/src/com/mirth/connect/cli/CommandLineInterface.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/com/mirth/connect/cli/CommandLineInterface.java index 5926e0306..bb944920c 100644 --- a/command/src/com/mirth/connect/cli/CommandLineInterface.java +++ b/command/src/com/mirth/connect/cli/CommandLineInterface.java @@ -184,7 +184,7 @@ private void runShell(String server, String user, String password, String script try { loginStatus = client.login(user, password); } catch (UnauthorizedException ex) { - if (ex.getResponse() != null && ex.getResponse() instanceof LoginStatus) { + if (ex.getResponse() instanceof LoginStatus) { loginStatus = (LoginStatus) ex.getResponse(); } else { From 3f48e459ad77d891ca5b14b22d91b219c0de502e Mon Sep 17 00:00:00 2001 From: miguelfigueiredo Date: Mon, 22 Dec 2025 20:10:42 +0000 Subject: [PATCH 4/5] Use LoginStatus.isSuccess() to evaluate login result Signed-off-by: miguelfigueiredo --- command/src/com/mirth/connect/cli/CommandLineInterface.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/com/mirth/connect/cli/CommandLineInterface.java index bb944920c..9bf23e174 100644 --- a/command/src/com/mirth/connect/cli/CommandLineInterface.java +++ b/command/src/com/mirth/connect/cli/CommandLineInterface.java @@ -193,7 +193,7 @@ private void runShell(String server, String user, String password, String script } } - if (loginStatus.getStatus() != LoginStatus.Status.SUCCESS) { + if (!loginStatus.isSuccess()) { error("Could not login to server. Status: " + loginStatus.getStatus(), null); return; } From a47c7154dae44a791e05f6045c61f99cc9a1b96a Mon Sep 17 00:00:00 2001 From: miguelfigueiredo Date: Tue, 23 Dec 2025 11:41:03 +0000 Subject: [PATCH 5/5] Use new java syntax Signed-off-by: miguelfigueiredo --- command/src/com/mirth/connect/cli/CommandLineInterface.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/command/src/com/mirth/connect/cli/CommandLineInterface.java b/command/src/com/mirth/connect/cli/CommandLineInterface.java index 9bf23e174..365b2a605 100644 --- a/command/src/com/mirth/connect/cli/CommandLineInterface.java +++ b/command/src/com/mirth/connect/cli/CommandLineInterface.java @@ -184,8 +184,8 @@ private void runShell(String server, String user, String password, String script try { loginStatus = client.login(user, password); } catch (UnauthorizedException ex) { - if (ex.getResponse() instanceof LoginStatus) { - loginStatus = (LoginStatus) ex.getResponse(); + if (ex.getResponse() instanceof LoginStatus status) { + loginStatus = status; } else { error("Could not login to server.", ex);