Update the GCP and Firebase API keys

Fetch only the pub crawls of the current user Signed-off-by: Georgi Georgiev <[email protected]>
ggeorgievx · Feb 12, 2022 · 8f8aeb8 · 8f8aeb8
1 parent 02080c5
commit 8f8aeb8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 34 deletions.
diff --git a/.env b/.env
@@ -1,9 +1,9 @@
-REACT_APP_GOOGLE_API_KEY=AIzaSyBDzQHuQl1bQkhb8ohvT3U8u4k7pfUwjV0
-REACT_APP_API_KEY=AIzaSyCqubqXnU75kuNNpyVjcHM6ABKrBFAK27Y
-REACT_APP_AUTH_DOMAIN=pub-crawl-267516.firebaseapp.com
-REACT_APP_DATABASE_URL=https://pub-crawl-267516.firebaseio.com
-REACT_APP_PROJECT_ID=pub-crawl-267516
-REACT_APP_STORAGE_BUCKET=pub-crawl-267516.appspot.com
-REACT_APP_MESSAGING_SENDER_ID=424140483147
-REACT_APP_APP_ID=1:424140483147:web:10325db50492c6eabcbbce
-REACT_APP_MEASUREMENT_ID=G-5QEW7NLPWX
+REACT_APP_GOOGLE_API_KEY=AIzaSyCrSqujhDJ7B_EAKFt9xVfl4dKDZ3jspyc
+REACT_APP_API_KEY=AIzaSyB2VNfDGbW644rDzfA-0JewSrmTUuGE_Eg
+REACT_APP_AUTH_DOMAIN=pub-crawl-5c99f.firebaseapp.com
+REACT_APP_DATABASE_URL=https://pub-crawl-5c99f-default-rtdb.firebaseio.com
+REACT_APP_PROJECT_ID=pub-crawl-5c99f
+REACT_APP_STORAGE_BUCKET=pub-crawl-5c99f.appspot.com
+REACT_APP_MESSAGING_SENDER_ID=92532689756
+REACT_APP_APP_ID=1:92532689756:web:12d436c9da821a5691cf99
+REACT_APP_MEASUREMENT_ID=G-WBFTS0BNGQ
diff --git a/src/axiosPubCrawls.js b/src/axiosPubCrawls.js
@@ -1,7 +1,7 @@
 import axios from 'axios';
 
 const axiosPubCrawlsInstance = axios.create({
-  baseURL: 'https://pub-crawl-267516.firebaseio.com/pubCrawls'
+  baseURL: `${process.env.REACT_APP_DATABASE_URL}/pubCrawls`
 });
 
 export default axiosPubCrawlsInstance;
diff --git a/src/containers/Home/Home.js b/src/containers/Home/Home.js
@@ -88,9 +88,12 @@ const Home = () => {
 
     return new Promise((resolve) => {
       if (currentUser !== null) {
-        axiosPubCrawlsInstance('.json')
+        currentUser.getIdToken(true)
+          .then((idToken) => {
+            return axiosPubCrawlsInstance(`/${currentUser.uid}.json?auth=${idToken}`);
+          })
           .then((response) => {
-            resolve(Object.keys(response.data[currentUser.uid]).length > 0);
+            resolve(Object.keys(response.data).length > 0);
           })
           .catch(() => {
             resolve(false);
@@ -174,7 +177,7 @@ const Home = () => {
                 onClick={buttonHandler}
               >
                 CONTINUE AS GUEST
-            </Button>
+              </Button>
             </Tooltip>
             <Tooltip
               title="WITH HISTORY"
@@ -190,20 +193,20 @@ const Home = () => {
                 onClick={googleButtonHandler}
               >
                 LOGIN WITH GOOGLE
-            </Button>
+              </Button>
             </Tooltip>
           </div>
         ) : (
-            <Button
-              className={classes.button}
-              variant="contained"
-              color="primary"
-              size="large"
-              onClick={buttonHandler}
-            >
-              CONTINUE
-            </Button>
-          )}
+          <Button
+            className={classes.button}
+            variant="contained"
+            color="primary"
+            size="large"
+            onClick={buttonHandler}
+          >
+            CONTINUE
+          </Button>
+        )}
       </div>
       <Backdrop
         className={classes.backdrop}

diff --git a/src/containers/PubCrawls/PubCrawls.js b/src/containers/PubCrawls/PubCrawls.js
@@ -89,13 +89,7 @@ const PubCrawls = () => {
     setBackdropOpen(true);
 
     const normalizePubCrawls = (pubCrawls) => {
-      let currentUsersPubCrawls;
-
-      if (authContext.currentUser !== null) {
-        currentUsersPubCrawls = pubCrawls[authContext.currentUser.uid];
-      } else {
-        currentUsersPubCrawls = pubCrawls;
-      }
+      const currentUsersPubCrawls = pubCrawls;
 
       const normalizedPubCrawls = Object.keys(currentUsersPubCrawls).map((currentUsersPubCrawlId) => {
         return {
@@ -117,8 +111,9 @@ const PubCrawls = () => {
       });
     };
 
-    const fetchPubCrawlsFromFirebase = async () => {
-      const response = await axiosPubCrawlsInstance('.json');
+    const fetchPubCrawlsForCurrentUserFromFirebase = async (currentUser) => {
+      const idToken = await currentUser.getIdToken(true);
+      const response = await axiosPubCrawlsInstance(`/${currentUser.uid}.json?auth=${idToken}`);
 
       normalizeAndSetPubCrawls(response.data);
     };
@@ -130,7 +125,7 @@ const PubCrawls = () => {
     };
 
     if (authContext.currentUser !== null) {
-      fetchPubCrawlsFromFirebase();
+      fetchPubCrawlsForCurrentUserFromFirebase(authContext.currentUser);
     } else {
       retrievePubCrawlsFromLocalStorage();
     }