Skip to content

Envvariable fix for optional true case #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISHNUDAS-tunerlabs merged 3 commits into from
Dec 12, 2024
Merged

Envvariable fix for optional true case #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e52baee
Envvariable fix for optional true case
priyanka-TL Dec 12, 2024
19dd49b
fix
priyanka-TL Dec 12, 2024
4da574e
remove console
priyanka-TL Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/envVariables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ module.exports = function () {
}

if (
(!process.env[eachEnvironmentVariable] || process.env[eachEnvironmentVariable] == '') &&
enviromentVariables[eachEnvironmentVariable].default &&
enviromentVariables[eachEnvironmentVariable].default != ''
(!process.env[eachEnvironmentVariable] || process.env[eachEnvironmentVariable].trim() === '') &&
enviromentVariables[eachEnvironmentVariable]?.optional === true &&
enviromentVariables[eachEnvironmentVariable]?.default !== undefined
) {
process.env[eachEnvironmentVariable] = enviromentVariables[eachEnvironmentVariable].default
success = true
keyCheckPass = true
success = true
}

if (!keyCheckPass) {
Expand Down
7 changes: 3 additions & 4 deletions src/generics/middleware/authenticator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// dependencies
const jwt = require('jsonwebtoken')
const isBearerRequired = process.env.IS_AUTH_TOKEN_BEARER === 'true'

var respUtil = function (resp) {
return {
status: resp.errCode,
Expand Down Expand Up @@ -38,6 +37,9 @@ module.exports = async function (req, res, next, token = '') {
delete req.headers[e]
})

if (!req.rspObj) req.rspObj = {}
var rspObj = req.rspObj

// Check if a Bearer token is required for authentication
let authHeader = req.headers['x-auth-token']
if (isBearerRequired) {
Expand All @@ -53,9 +55,6 @@ module.exports = async function (req, res, next, token = '') {
token = authHeader.trim()
}

if (!req.rspObj) req.rspObj = {}
var rspObj = req.rspObj

let internalAccessApiPaths = CONSTANTS.common.INTERNAL_ACCESS_URLS
let performInternalAccessTokenCheck = false
await Promise.all(
Expand Down