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

refactor: update environment variables precedence order

Browse Source
This commit is contained in:
nivedin
2024-02-21 18:02:57 +05:30
committed by Andrew Bastin
parent 175641246e
commit 386bb453d4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/hoppscotch-common/src/helpers/RequestRunner.ts
View File

@@ -71,14 +71,14 @@ const getTestableBody = (
const combineEnvVariables = (variables: { const combineEnvVariables = (variables: {
environments: { environments: {
global: Environment["variables"]
selected: Environment["variables"] selected: Environment["variables"]
global: Environment["variables"]
} }
requestVariables: Environment["variables"] requestVariables: Environment["variables"]
}) => [ }) => [
...variables.requestVariables, ...variables.requestVariables,
...variables.environments.global,
...variables.environments.selected, ...variables.environments.selected,
...variables.environments.global,
] ]
export const executedResponses$ = new Subject< export const executedResponses$ = new Subject<

8
packages/hoppscotch-common/src/helpers/preRequest.ts
View File

@@ -14,8 +14,8 @@ import { SecretEnvironmentService } from "~/services/secret-environment.service"
const secretEnvironmentService = getService(SecretEnvironmentService) const secretEnvironmentService = getService(SecretEnvironmentService)
const unsecretEnvironments = ( const unsecretEnvironments = (
global: Environment["variables"], selected: Environment,
selected: Environment global: Environment["variables"]
) => { ) => {
const resolvedGlobalWithSecrets = global.map((globalVar, index) => { const resolvedGlobalWithSecrets = global.map((globalVar, index) => {
const secretVar = secretEnvironmentService.getSecretEnvironmentVariable( const secretVar = secretEnvironmentService.getSecretEnvironmentVariable(
@@ -65,8 +65,8 @@ const unsecretEnvironments = (
export const getCombinedEnvVariables = () => { export const getCombinedEnvVariables = () => {
const reformedVars = unsecretEnvironments( const reformedVars = unsecretEnvironments(
getGlobalVariables(), getCurrentEnvironment(),
getCurrentEnvironment() getGlobalVariables()
) )
return { return {
global: cloneDeep(reformedVars.global), global: cloneDeep(reformedVars.global),