From 313c8c14dc34888e746ebaaa79a258c2762ef642 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 6 Sep 2020 22:16:42 +0200
Subject: [PATCH] :zap: Overwrite credential data only if there is no data set
 yet

---
 packages/cli/src/CredentialsOverwrites.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/CredentialsOverwrites.ts b/packages/cli/src/CredentialsOverwrites.ts
index ca09b8762..40b6419da 100644
--- a/packages/cli/src/CredentialsOverwrites.ts
+++ b/packages/cli/src/CredentialsOverwrites.ts
@@ -38,7 +38,12 @@ class CredentialsOverwritesClass {
 		}
 
 		const returnData = JSON.parse(JSON.stringify(data));
-		Object.assign(returnData, overwrites);
+		// Overwrite only if there is currently no data set
+		for (const key of Object.keys(overwrites)) {
+			if ([null, undefined, ''].includes(returnData[key])) {
+				returnData[key] = overwrites[key];
+			}
+		}
 
 		return returnData;
 	}