Skip to content

Commit 6a3e4b4

Browse files
committed
fix(env): get env vars inside function scope (runtime)
1 parent fe979c5 commit 6a3e4b4

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

lib/services/update-tokens.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
'use strict'
22

33
const updateTokens = client => {
4-
const {
5-
ECOM_AUTH_UPDATE_INTERVAL,
6-
GCP_PROJECT,
7-
GCLOUD_PROJECT,
8-
FIREBASE_CONFIG
9-
} = process.env
10-
114
const { collRef, db, table, debug } = client
125
// handle access token refresh
136
const refreshToken = require('./../methods/refresh-token')(client)
@@ -118,6 +111,13 @@ const updateTokens = client => {
118111
}
119112
}
120113

114+
const {
115+
ECOM_AUTH_UPDATE_INTERVAL,
116+
GCP_PROJECT,
117+
GCLOUD_PROJECT,
118+
FIREBASE_CONFIG
119+
} = process.env
120+
121121
if (
122122
ECOM_AUTH_UPDATE_INTERVAL !== 'disabled' &&
123123
// ignore interval task for Google Cloud Functions by default

main.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,14 @@ const envDbFilename = process.env.ECOM_AUTH_DB
3737

3838
// handle new promise
3939
const promise = new Promise((resolve, reject) => {
40-
const {
41-
ECOM_AUTH_DEBUG,
42-
ECOM_AUTH_UPDATE,
43-
ECOM_AUTH_SETUP_TIMEOUT,
44-
GCP_PROJECT,
45-
GCLOUD_PROJECT,
46-
FIREBASE_CONFIG
47-
} = process.env
48-
4940
// setup database and table
5041
setup = (dbFilename, disableUpdates, firestoreDb) => {
5142
dbFilename = firestoreDb ? null : dbFilename || envDbFilename || process.cwd() + '/db.sqlite3'
5243
if (!client || client.dbFilename !== dbFilename) {
5344
const table = 'ecomplus_app_auth'
5445

5546
// setup instance client object
56-
const debug = !ECOM_AUTH_DEBUG
47+
const debug = !process.env.ECOM_AUTH_DEBUG
5748
? null
5849
: msg => {
5950
console.log(`[ECOM_AUTH] ${msg}`)
@@ -74,7 +65,7 @@ const promise = new Promise((resolve, reject) => {
7465
const updateTokens = () => {
7566
require('./lib/services/update-tokens')(client)
7667
}
77-
if (disableUpdates !== true && ECOM_AUTH_UPDATE !== 'disabled') {
68+
if (disableUpdates !== true && process.env.ECOM_AUTH_UPDATE !== 'disabled') {
7869
// update access tokens periodically
7970
updateTokens()
8071
} else if (debug) {
@@ -138,6 +129,13 @@ const promise = new Promise((resolve, reject) => {
138129
return promise
139130
}
140131

132+
const {
133+
ECOM_AUTH_SETUP_TIMEOUT,
134+
GCP_PROJECT,
135+
GCLOUD_PROJECT,
136+
FIREBASE_CONFIG
137+
} = process.env
138+
141139
if (
142140
ECOM_AUTH_SETUP_TIMEOUT !== 'disabled' &&
143141
// ignore setup timeout for Google (Firebase) Cloud Functions by default

0 commit comments

Comments
 (0)