Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia
TypeScript apiapi-clientapi-restapi-testingdeveloper-toolsgraphqlhttphttp-clientpwarestrest-apispatestingtesting-toolstoolsvuevuejswebsocket
fix(persistence-service): update global environment variables schema (#3829)
James Georgedfdd44b4ed58
diff --git a/packages/hoppscotch-common/src/services/persistence/index.ts b/packages/hoppscotch-common/src/services/persistence/index.tsindex 84d318476..74291bebb 100644--- a/packages/hoppscotch-common/src/services/persistence/index.ts+++ b/packages/hoppscotch-common/src/services/persistence/index.ts@@ -628,7 +628,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 +644,7 @@ export class PersistenceService extends Service {)}- setGlobalEnvVariables(globalEnvData)+ setGlobalEnvVariables(globalEnvData as Environment["variables"])globalEnv$.subscribe((vars) => {window.localStorage.setItem(globalEnvKey, JSON.stringify(vars))diff --git a/packages/hoppscotch-common/src/services/persistence/validation-schemas/index.ts b/packages/hoppscotch-common/src/services/persistence/validation-schemas/index.tsindex b5854403d..b6ac61ac5 100644--- a/packages/hoppscotch-common/src/services/persistence/validation-schemas/index.ts+++ b/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([- z.array(z.never()),-- z.array(- z.union([- z.object({- key: z.string(),- secret: z.literal(true),- }),- z.object({- key: z.string(),- value: z.string(),- secret: z.literal(false),- }),- ])- ),+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 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(),