From a8dc4d84605b7cbfc42cd82337f62ae0f2eaeb46 Mon Sep 17 00:00:00 2001 From: Nicholas Pease Date: Tue, 20 Feb 2024 16:26:01 -0500 Subject: [PATCH] Move to .env.local files instead of files on dir --- frontend-next/src/app/api/firebase-admin.js | 17 ++++++++++++++--- frontend-next/src/app/api/firebase-config.js | 13 ++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/frontend-next/src/app/api/firebase-admin.js b/frontend-next/src/app/api/firebase-admin.js index 93591f4..1317eab 100644 --- a/frontend-next/src/app/api/firebase-admin.js +++ b/frontend-next/src/app/api/firebase-admin.js @@ -1,11 +1,22 @@ -// lib/firebase-admin-config.js import { initializeApp, getApps, cert } from "firebase-admin/app"; -import serviceAccount from "../../../../firebase-admin-key" +import admin from "firebase-admin"; export function customInitApp() { if (getApps().length <= 0) { initializeApp({ - credential: cert(serviceAccount) + credential: admin.credential.cert({ + type: process.env.FIREBASE_ADMIN_TYPE, + projectId: process.env.FIREBASE_ADMIN_PROJECT_ID, + privateKeyId: process.env.FIREBASE_ADMIN_PRIV_KEY_ID, + privateKey: process.env.FIREBASE_ADMIN_PRIV_KEY?.replace(/\\n/g, "\n"), + clientEmail: process.env.FIREBASE_ADMIN_CLIENT_EMAIL, + clientId: process.env.FIREBASE_ADMIN_CLIENT_ID, + authUri: process.env.FIREBASE_ADMIN_AUTH_URI, + tokenUri: process.env.FIREBASE_ADMIN_TOKEN_URL, + authProviderX509CertUrl: process.env.FIREBASE_ADMIN_AUTH_PROVIDER_X509_CERT_URL, + clientC509CertUrl: process.env.FIREBASE_ADMIN_CLIENT_X509_CERT_URL, + universe_domain: process.env.FIREBASE_ADMIN_UNIVERSE_DOMAIN, + }), }); } } \ No newline at end of file diff --git a/frontend-next/src/app/api/firebase-config.js b/frontend-next/src/app/api/firebase-config.js index d544147..5d82756 100644 --- a/frontend-next/src/app/api/firebase-config.js +++ b/frontend-next/src/app/api/firebase-config.js @@ -1,10 +1,17 @@ import { initializeApp, getApps, getApp } from "firebase/app"; import { getAuth } from "firebase/auth"; -import firebaseConfigFile from "../../../../firebase-config" -var firebaseConfig = firebaseConfigFile; +var config = { + apiKey: process.env.FIREBASE_CONFIG_API_KEY, + authDomain: process.env.FIREBASE_CONFIG_AUTH_DOMAIN, + projectId: process.env.FIREBASE_CONFIG_PROJECT_ID, + storageBucket: process.env.FIREBASE_CONFIG_STORAGE_BUCKET, + messagingSenderId: process.env.FIREBASE_CONFIG_MESSAGING_SENDER_ID, + appId: process.env.FIREBASE_CONFIG_APPID, + databaseURL: process.env.FIREBASE_CONFIG_DATABASE_URL, +} -var app = getApps().length > 0 ? getApp() : initializeApp(firebaseConfig); +var app = getApps().length > 0 ? getApp() : initializeApp(config); var auth = getAuth(app); export { auth, app }; \ No newline at end of file