Inject globals env into pre-request scripts
This commit is contained in:
@@ -1,4 +1,7 @@
|
|||||||
import { getCurrentEnvironment } from "~/newstore/environments"
|
import {
|
||||||
|
getCurrentEnvironment,
|
||||||
|
getGlobalEnvironment,
|
||||||
|
} from "~/newstore/environments"
|
||||||
|
|
||||||
export default function getEnvironmentVariablesFromScript(script: any) {
|
export default function getEnvironmentVariablesFromScript(script: any) {
|
||||||
const _variables: Record<string, string> = {}
|
const _variables: Record<string, string> = {}
|
||||||
@@ -9,6 +12,14 @@ export default function getEnvironmentVariablesFromScript(script: any) {
|
|||||||
_variables[variable.key] = variable.value
|
_variables[variable.key] = variable.value
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const globalEnv = getGlobalEnvironment()
|
||||||
|
|
||||||
|
if (globalEnv) {
|
||||||
|
for (const variable of globalEnv.variables) {
|
||||||
|
_variables[variable.key] = variable.value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// the pw object is the proxy by which pre-request scripts can pass variables to the request.
|
// the pw object is the proxy by which pre-request scripts can pass variables to the request.
|
||||||
// for security and control purposes, this is the only way a pre-request script should modify variables.
|
// for security and control purposes, this is the only way a pre-request script should modify variables.
|
||||||
|
|||||||
@@ -216,6 +216,16 @@ export function setCurrentEnvironment(newEnvIndex: number) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getGlobalEnvironment(): Environment | null {
|
||||||
|
const envs = environmentsStore.value.environments
|
||||||
|
|
||||||
|
const el = envs.find(
|
||||||
|
(env) => env.name === "globals" || env.name === "Globals"
|
||||||
|
)
|
||||||
|
|
||||||
|
return el ?? null
|
||||||
|
}
|
||||||
|
|
||||||
export function replaceEnvironments(newEnvironments: any[]) {
|
export function replaceEnvironments(newEnvironments: any[]) {
|
||||||
environmentsStore.dispatch({
|
environmentsStore.dispatch({
|
||||||
dispatcher: "replaceEnvironments",
|
dispatcher: "replaceEnvironments",
|
||||||
|
|||||||
Reference in New Issue
Block a user