Merge pull request #37 from infoshareacademy/hotfix/db-rules

Functions in services.js updated to match new firebase access rules

Author: zazulec

src/pages/AddNewPlace/AddNewPlace.js

@@ -37,10 +37,12 @@ class FormAddPlace extends Component {
   handleTextChange = (e, { value, name }) => this.setState({ [name]: value });
   handleCheckboxChange = (e, { checked, name }) => this.setState({ [name]: checked });
 
-  addToData = () => addAttraction(this.state)
-    .then(() => getAttractionsAsArray()
+  addToData = () => 
+    addAttraction(this.state)
+      .then(() => getAttractionsAsArray()
       .then((attractions) => this.context.setAttractionList(attractions))
-    );
+      )
+    ;
 
   resetState = () => this.setState({
     name: "",

src/services.js

@@ -3,10 +3,28 @@ const API_KEY = "AIzaSyD2TGrCzks3qlgYeCkAIrqAxdXgM4xJxOo";
 const REGISTER_URL = `https://identitytoolkit.googleapis.com/v1/accounts:signUp?key=${API_KEY}`;
 const LOG_IN_URL = `https://identitytoolkit.googleapis.com/v1/accounts:signInWithPassword?key=${API_KEY}`;
 
-export const getFavoriteAttractionIdsFromFirebase = (userId) =>
-  fetch(
-    `https://tripcity-app.firebaseio.com/users/${userId}/favourites.json`
+// firebase rules:
+// {
+//   "rules": {
+//     "attractions": {
+//       ".read": true,
+//     	".write": "auth != null"
+//     },
+//     "users": {
+//       "$uid": {
+//         ".read": "$uid === auth.uid",
+//         ".write": "$uid === auth.uid"
+//       }
+//     }
+//   }
+// }
+
+export const getFavoriteAttractionIdsFromFirebase = (userId) => {
+  const idToken = JSON.parse(localStorage.getItem("tripcityUser")).idToken;
+  return fetch(
+    `https://tripcity-app.firebaseio.com/users/${userId}/favourites.json?auth=${idToken}`
   ).then((response) => response.json());
+};
 
 export const getAttractions = () =>
   fetch(ATTRACTIONS_URL + ".json").then((response) => response.json());
@@ -29,18 +47,21 @@ export const getFavoriteAttractionIds = (userId) =>
     (attractions) => attractions || null
   );
 
-export const addAttraction = (attraction) =>
-  fetch(ATTRACTIONS_URL + ".json", {
+export const addAttraction = (attraction) => {
+  const idToken = JSON.parse(localStorage.getItem("tripcityUser")).idToken;
+  return fetch(ATTRACTIONS_URL + ".json?auth=" + idToken, {
     method: "POST",
     body: JSON.stringify(attraction),
   });
+};
 
-export const toggleFavorite = (attractionId, userId) =>
-  getFavoriteAttractionIds(userId).then((attractionIds) => {
+export const toggleFavorite = (attractionId, userId) => {
+  const idToken = JSON.parse(localStorage.getItem("tripcityUser")).idToken;
+  return getFavoriteAttractionIds(userId).then((attractionIds) => {
     if (attractionIds === null) {
       const data = JSON.stringify({ [attractionId]: true });
       return fetch(
-        `https://tripcity-app.firebaseio.com/users/${userId}/favourites.json`,
+        `https://tripcity-app.firebaseio.com/users/${userId}/favourites.json?auth=${idToken}`,
         {
           method: "PUT",
           body: data,
@@ -50,7 +71,7 @@ export const toggleFavorite = (attractionId, userId) =>
     if (attractionIds[attractionId] === true) {
       delete attractionIds[attractionId];
       return fetch(
-        `https://tripcity-app.firebaseio.com/users/${userId}/favourites/${attractionId}.json`,
+        `https://tripcity-app.firebaseio.com/users/${userId}/favourites/${attractionId}.json?auth=${idToken}`,
         {
           method: "DELETE",
         }
@@ -59,13 +80,14 @@ export const toggleFavorite = (attractionId, userId) =>
     attractionIds[attractionId] = true;
     const data = JSON.stringify(attractionIds);
     return fetch(
-      `https://tripcity-app.firebaseio.com/users/${userId}/favourites.json`,
+      `https://tripcity-app.firebaseio.com/users/${userId}/favourites.json?auth=${idToken}`,
       {
         method: "PUT",
         body: data,
       }
     );
   });
+};
 
 export const getFavoriteAttractionsAsArray = (userId) =>
   Promise.all([