From 3e4a0b37b989988b6af29ddd6a82bb63cdb00f72 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 17 Apr 2026 10:17:18 +0000
Subject: [PATCH] Make passwork master key optional

---
 .../java/io/xpipe/app/pwman/PassworkPasswordManager.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/pwman/PassworkPasswordManager.java b/app/src/main/java/io/xpipe/app/pwman/PassworkPasswordManager.java
index 478c9fbeb..7354e9501 100644
--- a/app/src/main/java/io/xpipe/app/pwman/PassworkPasswordManager.java
+++ b/app/src/main/java/io/xpipe/app/pwman/PassworkPasswordManager.java
@@ -73,7 +73,6 @@ public class PassworkPasswordManager implements PasswordManager {
                 .nonNull()
                 .nameAndDescription("passworkMasterKey")
                 .addComp(new SecretFieldComp(masterKey, false).maxWidth(600), masterKey)
-                .nonNull()
                 .nameAndDescription("passwordManagerTest")
                 .addComp(new PasswordManagerTestComp(true))
                 .bind(
@@ -97,7 +96,7 @@ public class PassworkPasswordManager implements PasswordManager {
 
     @Override
     public synchronized Result query(String key) {
-        if (serverUrl == null || token == null || masterKey == null) {
+        if (serverUrl == null || token == null) {
             return null;
         }
 
@@ -115,9 +114,9 @@ public class PassworkPasswordManager implements PasswordManager {
             var fixedServerUrl = serverUrl.startsWith("http") ? serverUrl : "https://" + serverUrl;
             getOrStartShell().view().setSensitiveEnvironmentVariable("PASSWORK_HOST", fixedServerUrl);
             getOrStartShell().view().setSensitiveEnvironmentVariable("PASSWORK_TOKEN", token.getSecretValue());
-            getOrStartShell()
-                    .view()
-                    .setSensitiveEnvironmentVariable("PASSWORK_MASTER_KEY", masterKey.getSecretValue());
+            if (masterKey != null) {
+                getOrStartShell().view().setSensitiveEnvironmentVariable("PASSWORK_MASTER_KEY", masterKey.getSecretValue());
+            }
             var user = getOrStartShell()
                     .command(CommandBuilder.of()
                             .add("passwork-cli")