From 0f134de65ab5f0193b17758b3489995b3e48d700 Mon Sep 17 00:00:00 2001 From: Douglas Gubert Date: Wed, 19 Dec 2018 10:41:00 -0200 Subject: [PATCH] Fix readable validation on the apps engine environment bridge --- .../rocketchat-apps/server/bridges/environmental.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/rocketchat-apps/server/bridges/environmental.js b/packages/rocketchat-apps/server/bridges/environmental.js index 2cf4a47715be..57b28437c532 100644 --- a/packages/rocketchat-apps/server/bridges/environmental.js +++ b/packages/rocketchat-apps/server/bridges/environmental.js @@ -7,11 +7,11 @@ export class AppEnvironmentalVariableBridge { async getValueByName(envVarName, appId) { console.log(`The App ${ appId } is getting the environmental variable value ${ envVarName }.`); - if (this.isReadable(envVarName, appId)) { - return process.env[envVarName]; + if (!(await this.isReadable(envVarName, appId))) { + throw new Error(`The environmental variable "${ envVarName }" is not readable.`); } - throw new Error(`The environmental variable "${ envVarName }" is not readable.`); + return process.env[envVarName]; } async isReadable(envVarName, appId) { @@ -23,10 +23,10 @@ export class AppEnvironmentalVariableBridge { async isSet(envVarName, appId) { console.log(`The App ${ appId } is checking if the environmental variable is set ${ envVarName }.`); - if (this.isReadable(envVarName, appId)) { - return typeof process.env[envVarName] !== 'undefined'; + if (!(await this.isReadable(envVarName, appId))) { + throw new Error(`The environmental variable "${ envVarName }" is not readable.`); } - throw new Error(`The environmental variable "${ envVarName }" is not readable.`); + return typeof process.env[envVarName] !== 'undefined'; } }