fix(functions): use function config vars for env

ComposableWeb · Apr 22, 2020 · 81fad4c · 81fad4c
1 parent 6601316
commit 81fad4c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/poolbase-app/src/app/utils/auth/firebaseAdmin.ts b/packages/poolbase-app/src/app/utils/auth/firebaseAdmin.ts
@@ -1,7 +1,9 @@
 import * as admin from 'firebase-admin';
+import * as functions from 'firebase-functions';
 
+const FIREBASE_PRIVATE_KEY = functions.config().env.firebase_private_key || process.env.FIREBASE_PRIVATE_KEY;
 export const verifyIdToken = (token: string): Promise<admin.auth.DecodedIdToken | void> => {
-  const firebasePrivateKey = process.env.FIREBASE_PRIVATE_KEY;
+  const firebasePrivateKey = FIREBASE_PRIVATE_KEY;
 
   if (!admin.apps.length) {
     admin.initializeApp({

diff --git a/packages/poolbase-app/src/app/utils/middleware/cookieSession.ts b/packages/poolbase-app/src/app/utils/middleware/cookieSession.ts
@@ -1,15 +1,18 @@
 import cookieSession from 'cookie-session';
+import * as functions from 'firebase-functions';
 
+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;
 export const addSession = (req, res) => {
   // Ensure that session secrets are set.
-  if (!(process.env.SESSION_SECRET_CURRENT && process.env.SESSION_SECRET_PREVIOUS)) {
+  if (!(SESSION_SECRET_CURRENT && SESSION_SECRET_PREVIOUS)) {
     throw new Error('Session secrets must be set as env vars `SESSION_SECRET_CURRENT` and `SESSION_SECRET_PREVIOUS`.');
   }
 
   // An array is useful for rotating secrets without invalidating old sessions.
   // The first will be used to sign cookies, and the rest to validate them.
   // https://github.com/expressjs/cookie-session#keys
-  const sessionSecrets = [process.env.SESSION_SECRET_CURRENT, process.env.SESSION_SECRET_PREVIOUS];
+  const sessionSecrets = [SESSION_SECRET_CURRENT, SESSION_SECRET_PREVIOUS];
 
   // Example:
   // https://github.com/billymoon/micro-cookie-session
@@ -24,7 +27,7 @@ export const addSession = (req, res) => {
   includeSession(req, res, () => {});
 };
 
-export default handler => (req, res) => {
+export default (handler) => (req, res) => {
   try {
     addSession(req, res);
   } catch (e) {