From b9a1cc21f18c86518743368c07bfc3cd16785c10 Mon Sep 17 00:00:00 2001
From: Daniel Maurer <daniel.maurer@deutschebahn.com>
Date: Thu, 27 Jul 2023 10:32:48 +0200
Subject: [PATCH] fix: fixed bug in gui with masked secrets

---
 .../components/environments/my/Details.vue    | 29 ++++++++++++-------
 .../components/environments/teams/Details.vue | 29 ++++++++++++-------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/packages/hoppscotch-common/src/components/environments/my/Details.vue b/packages/hoppscotch-common/src/components/environments/my/Details.vue
index 6a163dae3..1d9d92d72 100644
--- a/packages/hoppscotch-common/src/components/environments/my/Details.vue
+++ b/packages/hoppscotch-common/src/components/environments/my/Details.vue
@@ -216,7 +216,7 @@ const workingEnv = computed(() => {
   }
 })
 
-const oldEnvironments = ref<Environment | null>(workingEnv.value)
+const oldEnvironments = ref<string[]>([])
 
 const envList = useReadonlyStream(environments$, []) || props.envVars()
 
@@ -250,17 +250,24 @@ const liveEnvs = computed(() => {
 })
 
 watch(liveEnvs, (newLiveEnv, oldLiveEnv) => {
-  for (let i = 0; i < newLiveEnv.length; i++) {
-    const newVar = newLiveEnv[i]
-    const oldVar = oldLiveEnv[i]
-
-    if (!newVar.secret && newVar.value !== oldVar.value) {
-      const _oldEnvironments = oldEnvironments.value
-      if (_oldEnvironments) {
-        _oldEnvironments.variables[i].value = newVar.value
+  const oldEnvLength = oldLiveEnv.length
+  const newEnvLength = newLiveEnv.length
+  if (oldEnvLength === newEnvLength) {
+    const _oldEnvironments = []
+    for (let i = 0; i < newEnvLength; i++) {
+      const newVar = newLiveEnv[i]
+      const oldVar = oldLiveEnv[i]
+      let newValue = ""
+      if (!newVar.secret) {
+        newValue = newVar.value
+      } else if (!oldVar.secret) {
+        newValue = oldVar.value
+      } else {
+        newValue = oldEnvironments.value[i]
       }
-      oldEnvironments.value = _oldEnvironments
+      _oldEnvironments.push(newValue)
     }
+    oldEnvironments.value = _oldEnvironments
   }
 })
 
@@ -312,7 +319,7 @@ const saveEnvironment = () => {
   }
   const _vars = vars.value
   for (let i = 0; i < vars.value.length; i++) {
-    const value = oldEnvironments.value?.variables[i].value
+    const value = oldEnvironments.value[i]
     if (value) {
       _vars[i].env.value = value
     }
diff --git a/packages/hoppscotch-common/src/components/environments/teams/Details.vue b/packages/hoppscotch-common/src/components/environments/teams/Details.vue
index 072477903..054bbc6c5 100644
--- a/packages/hoppscotch-common/src/components/environments/teams/Details.vue
+++ b/packages/hoppscotch-common/src/components/environments/teams/Details.vue
@@ -198,7 +198,7 @@ const vars = ref<EnvironmentVariable[]>([
   { id: idTicker.value++, env: { key: "", value: "", secret: false } },
 ])
 
-const oldEnvironments = ref(props.envVars())
+const oldEnvironments = ref<string[]>([])
 const clearIcon = refAutoReset<typeof IconTrash2 | typeof IconDone>(
   IconTrash2,
   1000
@@ -227,17 +227,24 @@ const liveEnvs = computed(() => {
 })
 
 watch(liveEnvs, (newLiveEnv, oldLiveEnv) => {
-  for (let i = 0; i < newLiveEnv.length; i++) {
-    const newVar = newLiveEnv[i]
-    const oldVar = oldLiveEnv[i]
-
-    if (!newVar.secret && newVar.value !== oldVar.value) {
-      const _oldEnvironments = oldEnvironments.value
-      if (_oldEnvironments) {
-        _oldEnvironments[i].value = newVar.value
+  const oldEnvLength = oldLiveEnv.length
+  const newEnvLength = newLiveEnv.length
+  if (oldEnvLength === newEnvLength) {
+    const _oldEnvironments = []
+    for (let i = 0; i < newEnvLength; i++) {
+      const newVar = newLiveEnv[i]
+      const oldVar = oldLiveEnv[i]
+      let newValue = ""
+      if (!newVar.secret) {
+        newValue = newVar.value
+      } else if (!oldVar.secret) {
+        newValue = oldVar.value
+      } else {
+        newValue = oldEnvironments.value[i]
       }
-      oldEnvironments.value = _oldEnvironments
+      _oldEnvironments.push(newValue)
     }
+    oldEnvironments.value = _oldEnvironments
   }
 })
 
@@ -305,7 +312,7 @@ const saveEnvironment = async () => {
 
   const _vars = vars.value
   for (let i = 0; i < vars.value.length; i++) {
-    const value = oldEnvironments.value[i].value
+    const value = oldEnvironments.value[i]
     if (value) {
       _vars[i].env.value = value
     }