Merge pull request #234 from LaurierHawkHacks/revert-232-main

Revert "Prod Deployments For AppCheck/ReCaptcha"
LaurierHawkHacks · Apr 9, 2024 · 2758341 · 2758341
2 parents 47dec93 + c3196d6
commit 2758341
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 35 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -5,7 +5,6 @@ on:
             - live
 jobs:
     build_and_deploy:
-        if: ${{ false }}
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3

diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -5,7 +5,7 @@ on:
             - live
 jobs:
     build_and_preview:
-        if: ${{ false }}
+        if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3

diff --git a/config/storage.rules b/config/storage.rules
@@ -8,7 +8,7 @@ service firebase.storage {
         match /resumes/{resumeId} {
             // allow read if owner or admin
             allow read: if request.auth != null && resource.metadata.owner == request.auth.uid || request.auth.token.admin == true;
-            allow write: if request.auth != null && request.resource.size <= 10 * 1024 * 1024;
+            allow write: if request.auth != null;
         }
 
         match /{allPaths=**} {

diff --git a/firebase.json b/firebase.json
@@ -42,6 +42,12 @@
         "firestore": {
             "port": 8080
         },
+        "hosting": {
+            "port": 5000
+        },
+        "pubsub": {
+            "port": 8085
+        },
         "storage": {
             "port": 9199
         },

diff --git a/index.html b/index.html
@@ -1,31 +1,25 @@
 <!doctype html>
 <html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <link rel="icon" type="image/svg+xml" href="./src/assets/favicon.svg" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta name="description" content="HawkHacks Hacker Portal" />
-        <meta
-            name="keywords"
-            content="hawkhacks, hawkhacks portal, hakwhacks dashboard, my hawkhacks, wilfrid laurier hackathon"
-        />
-        <title>HawkHacks | Dashboard</title>
 
-        <meta property="og:title" content="HawkHacks" />
-        <meta property="og:site_name" content="HawkHacks" />
-        <meta
-            property="og:description"
-            content="Wilfrid Laurier's first large-scale global hackathon!"
-        />
-        <meta property="og:url" content="https://hawkhacks.ca/" />
-        <meta property="og:locale" content="en_CA" />
-        <meta property="og:locale:alternate" content="en_GB" />
-        <meta property="og:locale:alternate" content="en_US" />
-    </head>
+<head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="./src/assets/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>HawkHacks | Dashboard</title>
+
+    <meta property="og:title" content="HawkHacks" />
+    <meta property="og:site_name" content="HawkHacks" />
+    <meta property="og:description" content="Wilfrid Laurier's first large-scale global hackathon!" />
+    <meta property="og:url" content="https://hawkhacks.ca/" />
+    <meta property="og:locale" content="en_CA" />
+    <meta property="og:locale:alternate" content="en_GB" />
+    <meta property="og:locale:alternate" content="en_US" />
+</head>
+
+<body>
+    <div id="root"></div>
+    <div id="notifications"></div>
+    <script type="module" src="/src/main.tsx"></script>
+</body>
 
-    <body>
-        <div id="root"></div>
-        <div id="notifications"></div>
-        <script type="module" src="/src/main.tsx"></script>
-    </body>
 </html>
diff --git a/src/services/firebase.ts b/src/services/firebase.ts
@@ -4,7 +4,6 @@ import { getAnalytics } from "firebase/analytics";
 import { connectAuthEmulator, getAuth } from "firebase/auth";
 import { connectFunctionsEmulator, getFunctions } from "firebase/functions";
 import { connectStorageEmulator, getStorage } from "firebase/storage";
-import { ReCaptchaV3Provider, initializeAppCheck } from "firebase/app-check";
 
 const firebaseConfig = {
     apiKey: import.meta.env.VITE_FIREBASE_API_KEY,
@@ -22,10 +21,6 @@ export const firestore = getFirestore(app);
 export const auth = getAuth(app);
 export const functions = getFunctions(app);
 export const storage = getStorage(app);
-initializeAppCheck(app, {
-    provider: new ReCaptchaV3Provider(import.meta.env.VITE_APP_CHECK_KEY),
-    isTokenAutoRefreshEnabled: true,
-});
 
 // connect to emulators if not in prod
 if (!import.meta.env.PROD) {

diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -10,5 +10,4 @@ interface ImportMetaEnv {
     VITE_CONNECT_AUTH_EMU: string;
     VITE_GOOGLE_CLIENT_ID: string;
     VITE_APP_VERSION: string;
-    VITE_APP_CHECK_KEY: string;
 }