fix(persistence-service): add fallbacks for environments related schemas (#3832)

packages/hoppscotch-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-backend",
-  "version": "2023.12.4",
+  "version": "2023.12.5",
   "description": "",
   "author": "",
   "private": true,

packages/hoppscotch-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/common",
   "private": true,
-  "version": "2023.12.4",
+  "version": "2023.12.5",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
     "test": "vitest --run",

packages/hoppscotch-common/src/components/http/OAuth2Authorization.vue

@@ -112,7 +112,7 @@ const handleAccessTokenRequest = async () => {
   }
 
   const envs = getCombinedEnvVariables()
-  const envVars = [...envs.selected.variables, ...envs.global]
+  const envVars = [...envs.selected, ...envs.global]
 
   try {
     const tokenReqParams = {

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() {

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)
@@ -628,7 +631,7 @@ export class PersistenceService extends Service {
 
   private setupGlobalEnvsPersistence() {
     const globalEnvKey = "globalEnv"
-    let globalEnvData: Environment["variables"] = JSON.parse(
+    let globalEnvData: z.infer<typeof GLOBAL_ENV_SCHEMA> = JSON.parse(
       window.localStorage.getItem(globalEnvKey) || "[]"
     )
 
@@ -644,7 +647,7 @@ export class PersistenceService extends Service {
       )
     }
 
-    setGlobalEnvVariables(globalEnvData)
+    setGlobalEnvVariables(globalEnvData as Environment["variables"])
 
     globalEnv$.subscribe((vars) => {
       window.localStorage.setItem(globalEnvKey, JSON.stringify(vars))

packages/hoppscotch-common/src/services/persistence/validation-schemas/index.ts

@@ -229,24 +229,24 @@ export const MQTT_REQUEST_SCHEMA = z.nullable(
     .strict()
 )
 
-export const GLOBAL_ENV_SCHEMA = z.union([
+const EnvironmentVariablesSchema = z.union([
-  z.array(z.never()),
+  z.object({
-
+    key: z.string(),
-  z.array(
+    value: z.string(),
-    z.union([
+    secret: z.literal(false).catch(false),
-      z.object({
+  }),
-        key: z.string(),
+  z.object({
-        secret: z.literal(true),
+    key: z.string(),
-      }),
+    secret: z.literal(true),
-      z.object({
+  }),
-        key: z.string(),
+  z.object({
-        value: z.string(),
+    key: z.string(),
-        secret: z.literal(false),
+    value: z.string(),
-      }),
+  }),
-    ])
-  ),
 ])
 
+export const GLOBAL_ENV_SCHEMA = z.array(EnvironmentVariablesSchema)
+
 const OperationTypeSchema = z.enum([
   "subscription",
   "query",
@@ -364,22 +364,6 @@ const HoppTestDataSchema = z.lazy(() =>
     .strict()
 )
 
-const EnvironmentVariablesSchema = z.union([
-  z.object({
-    key: z.string(),
-    value: z.string(),
-    secret: z.literal(false),
-  }),
-  z.object({
-    key: z.string(),
-    secret: z.literal(true),
-  }),
-  z.object({
-    key: z.string(),
-    value: z.string(),
-  }),
-])
-
 export const SECRET_ENVIRONMENT_VARIABLE_SCHEMA = z.union([
   z.object({}).strict(),
 

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),
       }),
     ])
   ),

packages/hoppscotch-selfhost-desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-desktop",
   "private": true,
-  "version": "2023.12.4",
+  "version": "2023.12.5",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",

packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock

@@ -1260,7 +1260,7 @@ dependencies = [
 
 [[package]]
 name = "hoppscotch-desktop"
-version = "23.12.4"
+version = "23.12.5"
 dependencies = [
  "cocoa 0.25.0",
  "hex_color",

packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hoppscotch-desktop"
-version = "23.12.4"
+version = "23.12.5"
 description = "A Tauri App"
 authors = ["you"]
 license = ""

packages/hoppscotch-selfhost-desktop/src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Hoppscotch",
-    "version": "23.12.4"
+    "version": "23.12.5"
   },
   "tauri": {
     "allowlist": {

packages/hoppscotch-selfhost-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-web",
   "private": true,
-  "version": "2023.12.4",
+  "version": "2023.12.5",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",

packages/hoppscotch-sh-admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hoppscotch-sh-admin",
   "private": true,
-  "version": "2023.12.4",
+  "version": "2023.12.5",
   "type": "module",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",