Merge branch 'main' into feature/christenjack/storage

Author: jennymar

.github/workflows/frontend.yml

@@ -17,3 +17,8 @@ jobs:
           npm ci --legacy-peer-deps
           npm run lint-check
           npm run build
+        env:
+          NEXT_PUBLIC_BACKEND_URL: ${{ vars.NEXT_PUBLIC_BACKEND_URL }}
+          NEXT_PUBLIC_FIREBASE_SETTINGS: ${{ vars.NEXT_PUBLIC_FIREBASE_SETTINGS }}
+          NEXT_PUBLIC_PAYPAL_CLIENT_SECRET: ${{ vars.NEXT_PUBLIC_PAYPAL_CLIENT_SECRET }}
+          NEXT_PUBLIC_PAYPAL_CLIENT_ID: ${{ vars.NEXT_PUBLIC_PAYPAL_CLIENT_ID }}

frontend/src/app/admin/firebase/firebase.ts

@@ -12,7 +12,7 @@ export type FirebaseServices = { auth: Auth; storage: FirebaseStorage };
  */
 export const initFirebase = (): FirebaseServices => {
   if (!env.NEXT_PUBLIC_FIREBASE_SETTINGS) {
-    throw new Error("Cannot get firebase settings");
+    throw new Error("Cannot get firebase settings. " + process.env.NEXT_PUBLIC_FIREBASE_SETTINGS);
   }
 
   const firebaseConfig = env.NEXT_PUBLIC_FIREBASE_SETTINGS as FirebaseOptions;

frontend/src/app/admin/util/validateEnv.ts

@@ -4,7 +4,7 @@
  */
 
 import { cleanEnv } from "envalid";
-import { json, str } from "envalid/dist/validators";
+import { str, json } from "envalid/dist/validators";
 
 /**
  * NextJS only allows the frontend to access environment variables if they start with
@@ -19,7 +19,7 @@ export default cleanEnv(
   },
   {
     NEXT_PUBLIC_BACKEND_URL: str(), // URL of our backend
-    NEXT_PUBLIC_FIREBASE_SETTINGS: json(), // Firebase settings for frontend, stored as a JSON string
+    NEXT_PUBLIC_FIREBASE_SETTINGS: json(), // Firebase settings for frontend
     NEXT_PUBLIC_PAYPAL_CLIENT_SECRET: str(),
     NEXT_PUBLIC_PAYPAL_CLIENT_ID: str(),
   },