fix(persistence-service): add fallbacks for environments related sche…

…mas (#3832)
hoppscotch · Feb 15, 2024 · 4bd54b1 · 4bd54b1
1 parent ed6e9b6
commit 4bd54b1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/packages/hoppscotch-common/src/newstore/environments.ts b/packages/hoppscotch-common/src/newstore/environments.ts
@@ -568,7 +568,18 @@ export function getLegacyGlobalEnvironment(): Environment | null {
 }
 
 export function getGlobalVariables(): Environment["variables"] {
-  return environmentsStore.value.globals
+  return environmentsStore.value.globals.map(
+    (env: Environment["variables"][number]) => {
+      if (env.key && "value" in env && !("secret" in env)) {
+        return {
+          ...(env as Environment["variables"][number]),
+          secret: false,
+        }
+      }
+
+      return env
+    }
+  ) as Environment["variables"]
 }
 
 export function getGlobalVariableID() {

diff --git a/packages/hoppscotch-common/src/services/persistence/index.ts b/packages/hoppscotch-common/src/services/persistence/index.ts
@@ -425,7 +425,10 @@ export class PersistenceService extends Service {
 
     if (globalIndex !== -1) {
       const globalEnv = environmentsData[globalIndex]
-      globalEnv.variables.forEach((variable) => addGlobalEnvVariable(variable))
+      globalEnv.variables.forEach(
+        (variable: Environment["variables"][number]) =>
+          addGlobalEnvVariable(variable)
+      )
 
       // Remove global from environments
       environmentsData.splice(globalIndex, 1)

diff --git a/packages/hoppscotch-common/src/services/persistence/validation-schemas/index.ts b/packages/hoppscotch-common/src/services/persistence/validation-schemas/index.ts
@@ -233,7 +233,7 @@ const EnvironmentVariablesSchema = z.union([
   z.object({
     key: z.string(),
     value: z.string(),
-    secret: z.literal(false),
+    secret: z.literal(false).catch(false),
   }),
   z.object({
     key: z.string(),

diff --git a/packages/hoppscotch-data/src/environment/v/1.ts b/packages/hoppscotch-data/src/environment/v/1.ts
@@ -15,7 +15,7 @@ export const V1_SCHEMA = z.object({
       z.object({
         key: z.string(),
         value: z.string(),
-        secret: z.literal(false),
+        secret: z.literal(false).catch(false),
       }),
     ])
   ),