btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix: fixed bug in gui with masked secrets

Browse Source
This commit is contained in:
Daniel Maurer
2023-07-27 10:32:48 +02:00
committed by nivedin
parent f530fc2853
commit b9a1cc21f1
2 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/hoppscotch-common/src/components/environments/my/Details.vue
View File

@@ -216,7 +216,7 @@ const workingEnv = computed(() => {
} }
}) })
const oldEnvironments = ref<Environment | null>(workingEnv.value) const oldEnvironments = ref<string[]>([])
const envList = useReadonlyStream(environments$, []) || props.envVars() const envList = useReadonlyStream(environments$, []) || props.envVars()
@@ -250,17 +250,24 @@ const liveEnvs = computed(() => {
}) })
watch(liveEnvs, (newLiveEnv, oldLiveEnv) => { watch(liveEnvs, (newLiveEnv, oldLiveEnv) => {
for (let i = 0; i < newLiveEnv.length; i++) { const oldEnvLength = oldLiveEnv.length
const newVar = newLiveEnv[i] const newEnvLength = newLiveEnv.length
const oldVar = oldLiveEnv[i] if (oldEnvLength === newEnvLength) {
const _oldEnvironments = []
if (!newVar.secret && newVar.value !== oldVar.value) { for (let i = 0; i < newEnvLength; i++) {
const _oldEnvironments = oldEnvironments.value const newVar = newLiveEnv[i]
if (_oldEnvironments) { const oldVar = oldLiveEnv[i]
_oldEnvironments.variables[i].value = newVar.value 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 const _vars = vars.value
for (let i = 0; i < vars.value.length; i++) { for (let i = 0; i < vars.value.length; i++) {
const value = oldEnvironments.value?.variables[i].value const value = oldEnvironments.value[i]
if (value) { if (value) {
_vars[i].env.value = value _vars[i].env.value = value
} }

29
packages/hoppscotch-common/src/components/environments/teams/Details.vue
View File

@@ -198,7 +198,7 @@ const vars = ref<EnvironmentVariable[]>([
{ id: idTicker.value++, env: { key: "", value: "", secret: false } }, { id: idTicker.value++, env: { key: "", value: "", secret: false } },
]) ])
const oldEnvironments = ref(props.envVars()) const oldEnvironments = ref<string[]>([])
const clearIcon = refAutoReset<typeof IconTrash2 | typeof IconDone>( const clearIcon = refAutoReset<typeof IconTrash2 | typeof IconDone>(
IconTrash2, IconTrash2,
1000 1000
@@ -227,17 +227,24 @@ const liveEnvs = computed(() => {
}) })
watch(liveEnvs, (newLiveEnv, oldLiveEnv) => { watch(liveEnvs, (newLiveEnv, oldLiveEnv) => {
for (let i = 0; i < newLiveEnv.length; i++) { const oldEnvLength = oldLiveEnv.length
const newVar = newLiveEnv[i] const newEnvLength = newLiveEnv.length
const oldVar = oldLiveEnv[i] if (oldEnvLength === newEnvLength) {
const _oldEnvironments = []
if (!newVar.secret && newVar.value !== oldVar.value) { for (let i = 0; i < newEnvLength; i++) {
const _oldEnvironments = oldEnvironments.value const newVar = newLiveEnv[i]
if (_oldEnvironments) { const oldVar = oldLiveEnv[i]
_oldEnvironments[i].value = newVar.value 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 const _vars = vars.value
for (let i = 0; i < vars.value.length; i++) { for (let i = 0; i < vars.value.length; i++) {
const value = oldEnvironments.value[i].value const value = oldEnvironments.value[i]
if (value) { if (value) {
_vars[i].env.value = value _vars[i].env.value = value
} }