Skip to content

Commit 31e9bd8

Browse files
committed
fix(cloud-functions): also check for FIREBASE_CONFIG env
1 parent b8f82b0 commit 31e9bd8

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

lib/services/update-tokens.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const updateTokens = client => {
44
const {
55
ECOM_AUTH_UPDATE_INTERVAL,
66
GCP_PROJECT,
7-
GCLOUD_PROJECT
7+
GCLOUD_PROJECT,
8+
FIREBASE_CONFIG
89
} = process.env
910

1011
const { collRef, db, table, debug } = client
@@ -120,7 +121,7 @@ const updateTokens = client => {
120121
if (
121122
ECOM_AUTH_UPDATE_INTERVAL !== 'disabled' &&
122123
// ignore interval task for Google Cloud Functions by default
123-
((!GCP_PROJECT && !GCLOUD_PROJECT) || ECOM_AUTH_UPDATE_INTERVAL === 'enabled')
124+
((!GCP_PROJECT && !GCLOUD_PROJECT && !FIREBASE_CONFIG) || ECOM_AUTH_UPDATE_INTERVAL === 'enabled')
124125
) {
125126
// run task with 1 hour interval
126127
const hour = 60 * 60 * 1000

main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ const promise = new Promise((resolve, reject) => {
4242
ECOM_AUTH_UPDATE,
4343
ECOM_AUTH_SETUP_TIMEOUT,
4444
GCP_PROJECT,
45-
GCLOUD_PROJECT
45+
GCLOUD_PROJECT,
46+
FIREBASE_CONFIG
4647
} = process.env
4748

4849
// setup database and table
@@ -140,7 +141,7 @@ const promise = new Promise((resolve, reject) => {
140141
if (
141142
ECOM_AUTH_SETUP_TIMEOUT !== 'disabled' &&
142143
// ignore setup timeout for Google (Firebase) Cloud Functions by default
143-
((!GCP_PROJECT && !GCLOUD_PROJECT) || ECOM_AUTH_SETUP_TIMEOUT === 'enabled')
144+
((!GCP_PROJECT && !GCLOUD_PROJECT && !FIREBASE_CONFIG) || ECOM_AUTH_SETUP_TIMEOUT === 'enabled')
144145
) {
145146
// timeout to handle setup
146147
setTimeout(() => {

0 commit comments

Comments
 (0)