From 9f758b20158b9065c31e215e59e3831204c7d5a5 Mon Sep 17 00:00:00 2001
From: Zoltan Papp <zoltan.pmail@gmail.com>
Date: Thu, 11 May 2023 18:09:06 +0200
Subject: [PATCH] Fix preshared key command line arg handling (#850)

---
 client/cmd/login.go | 10 +++++++---
 client/cmd/up.go    | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/cmd/login.go b/client/cmd/login.go
index 92eb10aef..83ed7f3b8 100644
--- a/client/cmd/login.go
+++ b/client/cmd/login.go
@@ -46,12 +46,16 @@ var loginCmd = &cobra.Command{
 				return err
 			}
 
-			config, err := internal.UpdateOrCreateConfig(internal.ConfigInput{
+			ic := internal.ConfigInput{
 				ManagementURL: managementURL,
 				AdminURL:      adminURL,
 				ConfigPath:    configPath,
-				PreSharedKey:  &preSharedKey,
-			})
+			}
+			if preSharedKey != "" {
+				ic.PreSharedKey = &preSharedKey
+			}
+
+			config, err := internal.UpdateOrCreateConfig(ic)
 			if err != nil {
 				return fmt.Errorf("get config file: %v", err)
 			}
diff --git a/client/cmd/up.go b/client/cmd/up.go
index c03e290b0..375832a78 100644
--- a/client/cmd/up.go
+++ b/client/cmd/up.go
@@ -78,14 +78,18 @@ func runInForegroundMode(ctx context.Context, cmd *cobra.Command) error {
 		return err
 	}
 
-	config, err := internal.UpdateOrCreateConfig(internal.ConfigInput{
+	ic := internal.ConfigInput{
 		ManagementURL:    managementURL,
 		AdminURL:         adminURL,
 		ConfigPath:       configPath,
-		PreSharedKey:     &preSharedKey,
 		NATExternalIPs:   natExternalIPs,
 		CustomDNSAddress: customDNSAddressConverted,
-	})
+	}
+	if preSharedKey != "" {
+		ic.PreSharedKey = &preSharedKey
+	}
+
+	config, err := internal.UpdateOrCreateConfig(ic)
 	if err != nil {
 		return fmt.Errorf("get config file: %v", err)
 	}