fix: safe use of funnctions config vars

ComposableWeb · Apr 24, 2020 · 69d8e56 · 69d8e56
1 parent 8107525
commit 69d8e56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/poolbase-app/src/app/utils/middleware/cookieSession.ts b/packages/poolbase-app/src/app/utils/middleware/cookieSession.ts
@@ -1,8 +1,10 @@
 import cookieSession from 'cookie-session';
-import * as functions from 'firebase-functions';
+import { functions } from '../../../functions/initFirebase';
 
-const SESSION_SECRET_CURRENT = functions.config().env.session_secret_current || process.env.SESSION_SECRET_CURRENT;
-const SESSION_SECRET_PREVIOUS = functions.config().env.session_secret_previous || process.env.SESSION_SECRET_PREVIOUS;
+const SESSION_SECRET_CURRENT =
+  (functions.config().env && functions.config().env.session_secret_current) || process.env.SESSION_SECRET_CURRENT;
+const SESSION_SECRET_PREVIOUS =
+  (functions.config().env && functions.config().env.session_secret_previous) || process.env.SESSION_SECRET_PREVIOUS;
 export const addSession = (req, res) => {
   // Ensure that session secrets are set.
   if (!(SESSION_SECRET_CURRENT && SESSION_SECRET_PREVIOUS)) {

diff --git a/packages/poolbase-app/src/functions/initFirebase.ts b/packages/poolbase-app/src/functions/initFirebase.ts
@@ -1,10 +1,11 @@
 import * as admin from 'firebase-admin';
+import * as functions from 'firebase-functions';
 
 const app = admin.apps.length === 0 ? admin.initializeApp() : admin.app();
 const firestore = admin.firestore(app);
 const storage = admin.storage();
 const bucket = storage.bucket(process.env.FIREBASE_STORAGEBUCKET);
 const auth = admin.auth(app);
 
-export { app, firestore, storage, bucket, auth };
+export { app, firestore, storage, bucket, auth, functions };
 export default admin;