From 9c31f574b83ea42773c8341991a7acf5150f5781 Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Wed, 12 Jun 2024 20:53:18 +0200
Subject: [PATCH] Fix accessing console without password.

---
 .../src/org/jdrupes/vmoperator/vmviewer/VmViewer.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/VmViewer.java b/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/VmViewer.java
index fe48d3b..cae53b0 100644
--- a/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/VmViewer.java
+++ b/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/VmViewer.java
@@ -513,8 +513,8 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
         case "openConsole":
             if (perms.contains(Permission.ACCESS_CONSOLE)) {
                 var pwQuery = Event.onCompletion(new GetDisplayPassword(vmDef),
-                    e -> e.password().ifPresent(
-                        pw -> openConsole(vmName, channel, model, pw)));
+                    e -> openConsole(vmName, channel, model,
+                        e.password().orElse(null)));
                 fire(pwQuery, vmChannel);
             }
             break;
@@ -555,7 +555,10 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
             .append("[virt-viewer]\ntype=spice\nhost=")
             .append(addr.get().getHostAddress()).append("\nport=")
             .append(Integer.toString(port.get().getAsInt()))
-            .append("\npassword=").append(password).append('\n');
+            .append('\n');
+        if (password != null) {
+            data.append("password=").append(password).append('\n');
+        }
         proxyUrl.map(JsonPrimitive::getAsString).ifPresent(u -> {
             if (!Strings.isNullOrEmpty(u)) {
                 data.append("proxy=").append(u).append('\n');