Fixing UI

Auth backend 3

functions/handlers/post.js

@@ -1,17 +1,18 @@
+/* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/always-return */
 const admin = require('firebase-admin');
-exports.putPost = (req, res) => {
 
+exports.putPost = (req, res) => {
     const newPost = {
         body: req.body.body,
-        userHandle: req.body.userHandle,
+        userHandle: req.user.handle,
         userImage: req.body.userImage,
+        userID: req.user.uid,
         microBlogTitle: req.body.microBlogTitle,
         createdAt: new Date().toISOString(),
         likeCount: 0,
         commentCount: 0,
         microBlogTopics: req.body.microBlogTopics
-        
     };
 
     admin.firestore().collection('posts').add(newPost)
@@ -27,8 +28,7 @@ exports.putPost = (req, res) => {
 };
 
 exports.getallPostsforUser = (req, res) => {
-
+    admin.firestore().collection('posts').where('userHandle', '==', req.userData.handle ).get()
-    admin.firestore().collection('posts').where('userHandle', '==', 'new user' ).get()
     .then((data) => {
         let posts = [];
         data.forEach(function(doc) {
@@ -40,4 +40,8 @@ exports.getallPostsforUser = (req, res) => {
         console.error(err);
         return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'})
     })
-    }
+};
+
+exports.getFilteredPosts = (req, res) => {
+    admin.firestore().collection('posts').where('userHandle', '==', 'new user').where('microBlogTopics', '==')
+};

functions/handlers/topic.js

@@ -0,0 +1,52 @@
+/* eslint-disable promise/always-return */
+const { admin, db } = require("../util/admin");
+exports.putTopic = (req, res) => {
+
+    const newTopic = {
+        topic: req.body.topic
+    };
+
+    admin.firestore().collection('topics').add(newTopic)
+    .then((doc) => {
+        const resTopic = newTopic;
+        newTopic.topicId = doc.id;
+        return res.status(200).json(resTopic);
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({ error: 'something is wrong'});
+    });
+};
+
+exports.getAllTopics = (req, res) => {
+    admin.firestore().collection('topics').get()
+    .then((data) => {
+        let topics = [];
+        data.forEach(function(doc) {
+            topics.push(doc.data());
+        });
+        return res.status(200).json(topics);
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Failed to fetch all topics.'})
+    })
+};
+
+exports.deleteTopic = (req, res) => {
+    const topic = db.doc(`/topics/${req.params.topicId}`);
+    topic.get().then((doc) => {
+        if (!doc.exists) {
+            return res.status(404).json({error: 'Topic not found'});
+        } else {
+            return topic.delete();
+        }
+    })
+    .then(() => {
+        res.json({ message: 'Topic successfully deleted!'});
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Failed to delete topic.'})
+    })
+}

functions/handlers/users.js

@@ -1,4 +1,5 @@
 /* eslint-disable promise/catch-or-return */
+
 const { admin, db } = require("../util/admin");
 const config = require("../util/config");
 const { validateUpdateProfileInfo } = require("../util/validator");
@@ -50,7 +51,7 @@ exports.signup = (req, res) => {
     return res.status(400).json(errors);
   }
 
-  let idToken, userId;
+  let token, userId;
 
   db.doc(`/users/${newUser.handle}`)
     .get()
@@ -68,18 +69,19 @@ exports.signup = (req, res) => {
       userId = data.user.uid;
       return data.user.getIdToken();
     })
-    .then((token) => {
+    .then((idToken) => {
-      idToken = token;
+      token = idToken;
       const userCred = {
-        email: req.body.email,
+        email: newUser.email,
         handle: newUser.handle,
         createdAt: newUser.createdAt,
-        userId
+        userId,
+        followedTopics: []
       };
       return db.doc(`/users/${newUser.handle}`).set(userCred);
     })
     .then(() => {
-      return res.status(201).json({ idToken });
+      return res.status(201).json({ token });
     })
     .catch((err) => {
       console.error(err);
@@ -99,21 +101,37 @@ exports.login = (req, res) => {
   // Auth validation
   let errors = {};
 
-  // Email check
+  const emailRegEx = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
+  // Checks if email/username field is empty
   if (user.email.trim() === "") {
     errors.email = "Email must not be blank.";
   }
 
-  // Password check
+  // Checks if password field is empty
   if (user.password.trim() === "") {
     errors.password = "Password must not be blank.";
   }
 
-  // Checking if any errors have been raised
+  // Checks if any of the above two errors were found
   if (Object.keys(errors).length > 0) {
     return res.status(400).json(errors);
   }
 
+  // Email/username field is username since it's not in email format
+  if (!user.email.match(emailRegEx)) {
+    var userDoc = db.collection("users").doc(`${user.email}`);
+    userDoc.get()
+    .then(function(doc) {
+        if (doc.exists) {
+          user.email = doc.data().email;
+        }
+        else {
+          return res.status(403).json({ general: "Invalid credentials. Please try again." });
+        }
+        return;
+    })
+    .then(function() {
       firebase
       .auth()
       .signInWithEmailAndPassword(user.email, user.password)
@@ -121,17 +139,98 @@ exports.login = (req, res) => {
         return data.user.getIdToken();
       })
       .then((token) => {
-      return res.json({ token });
+        return res.status(200).json({ token });
       })
       .catch((err) => {
         console.error(err);
-      if (err.code === "auth/wrong-password") {
+        if (err.code === "auth/user-not-found" || err.code === "auth/invalid-email" || err.code === "auth/wrong-password") {
+          return res.status(403).json({ general: "Invalid credentials. Please try again." });
+        }
+        return res.status(500).json({ error: err.code });
+      });
+      return;
+    })
+    .catch(function(err) {
+      if(!doc.exists) {
+        return res.status(403).json({ general: "Invalid credentials. Please try again." });
+      }
+      return res.status(500).send(err);
+    });
+  }
+  // Email/username field is username
+  else {
+    firebase
+    .auth()
+    .signInWithEmailAndPassword(user.email, user.password)
+    .then((data) => {
+      return data.user.getIdToken();
+    })
+    .then((token) => {
+      return res.status(200).json({ token });
+    })
+    .catch((err) => {
+      console.error(err);
+      if (err.code === "auth/user-not-found" || err.code === "auth/invalid-email" || err.code === "auth/wrong-password") {
         return res
               .status(403)
               .json({ general: "Invalid credentials. Please try again." });
       }
       return res.status(500).json({ error: err.code });
     });
+  }
+};
+
+//Deletes user account
+exports.deleteUser = (req, res) => {
+  var currentUser;
+  firebase.auth().onAuthStateChanged(function(user) {
+    currentUser = user;
+    if (currentUser) {
+      var post_query = db.collection("posts").where("userHandle", "==", req.user.handle);
+      post_query.get()
+      .then(function(myPosts) {
+        myPosts.forEach(function(doc) {
+          doc.ref.delete();
+        });
+        return;
+      })
+      .then(function() {
+        res.status(200).send("Successfully removed all user's posts from database.");
+        return;
+      })
+      .catch(function(err) {
+        res.status(500).send("Failed to remove all user's posts from database.", err);
+      });
+
+
+
+      db.collection("users").doc(`${req.user.handle}`).delete()
+      .then(function() {
+        res.status(200).send("Sucessfully removed user from database.");
+        return;
+      })
+      .catch(function(err) {
+        res.status(500).send("Failed to remove user from database.", err);
+      });
+
+
+      
+      currentUser.delete()
+      .then(function() {
+        console.log("Successfully deleted user.");
+        res.status(200).send("Sucessfully deleted user.");
+        return;
+      })
+      .catch(function(err) {
+        console.log("Failed to delete user.", err);
+        res.status(500).send("Failed to delete user.");
+      });
+    } 
+    else {
+      console.log("Failed to deleter user or cannot get user.");
+      res.status(500).send("Failed to deleter user or cannot get user.");
+    }
+  });
 };
 
 // Returns all data in the database for the user who is currently signed in
@@ -150,10 +249,8 @@ exports.getProfileInfo = (req, res) => {
 
 // Updates the data in the database of the user who is currently logged in
 exports.updateProfileInfo = (req, res) => {
-  // TODO: Add functionality for adding/updating profile images
-
   // Data validation
-  const { valid, errors, profileData } = validateUpdateProfileInfo(req.body);
+  const { valid, errors, profileData } = validateUpdateProfileInfo(req);
   if (!valid) return res.status(400).json(errors);
 
   // Update the database entry for this user
@@ -178,39 +275,36 @@ exports.updateProfileInfo = (req, res) => {
 
 exports.getUserDetails = (req, res) => {
   let userData = {};
-  db.doc(`/users/${req.params.handle}`)
+  db.doc(`/users/${req.body.handle}`)
     .get()
     .then((doc) => {
       if (doc.exists) {
-        userData.user = doc.data();
+        userData = doc.data();
-        return db
+        return res.status(200).json({userData});
-          .collection("post")
-          .where("userHandle", "==", req.params.handle)
-          .orderBy("createdAt", "desc")
-          .get();
     } else {
-        return res.status(404).json({
+      return res.status(400).json({error: "User not found."})
-          error: "User not found"
+    }})
-        });
-      }
-    })
-    .then((data) => {
-      userData.posts = [];
-      data.forEach((doc) => {
-        userData.posts.push({
-          body: doc.data().body,
-          createAt: doc.data().createAt,
-          userHandle: doc.data().userHandle,
-          userImage: doc.data().userImage,
-          likeCount: doc.data().likeCount,
-          commentCount: doc.data().commentCount,
-          postId: doc.id
-        });
-      });
-      return res.json(userData);
-    })
     .catch((err) => {
       console.error(err);
       return res.status(500).json({ error: err.code });
     });
 };
+
+exports.getAuthenticatedUser = (req, res) => {
+  let credentials = {};
+  db.doc(`/users/${req.user.handle}`)
+    .get()
+    .then((doc) => {
+      if (doc.exists) {
+        credentials = doc.data();
+        return res.status(200).json({credentials});
+    } else {
+      return res.status(400).json({error: "User not found."})
+    }})
+    .catch((err) => {
+      console.error(err);
+      return res.status(500).json({ error: err.code });
+    });
+};
+
+

functions/index.js

@@ -10,10 +10,12 @@ app.use(cors());
  *  handlers/users.js                                               *
  *------------------------------------------------------------------*/
 const {
+  getAuthenticatedUser,
   getUserDetails,
   getProfileInfo,
   login,
   signup,
+  deleteUser,
   updateProfileInfo
 } = require("./handlers/users");
 
@@ -26,7 +28,10 @@ app.post("/signup", signup);
 // and password
 app.post("/login", login);
 
-app.get("/getUser/:handle", getUserDetails);
+//Deletes user account
+app.delete("/delete", fbAuth, deleteUser);
+
+app.get("/getUser", fbAuth, getUserDetails);
 
 // Returns all profile data of the currently logged in user
 app.get("/getProfileInfo", fbAuth, getProfileInfo);
@@ -34,14 +39,35 @@ app.get("/getProfileInfo", fbAuth, getProfileInfo);
 // Updates the currently logged in user's profile information
 app.post("/updateProfileInfo", fbAuth, updateProfileInfo);
 
+app.get("/user", fbAuth, getAuthenticatedUser);
+
 /*------------------------------------------------------------------*
  *  handlers/post.js                                                *
  *------------------------------------------------------------------*/
-const { getallPostsforUser, putPost } = require("./handlers/post");
+const { getallPostsforUser, putPost 
+} = require("./handlers/post");
 
 app.get("/getallPostsforUser", getallPostsforUser);
 
 // Adds one post to the database
 app.post("/putPost", fbAuth, putPost);
 
+/*------------------------------------------------------------------*
+ *  handlers/topic.js                                                *
+ *------------------------------------------------------------------*/
+const {
+  putTopic,
+  getAllTopics,
+  deleteTopic
+} = require("./handlers/topic");
+
+// add topic to database
+app.post("/putTopic", fbAuth, putTopic);
+
+// get all topics from database
+app.get("/getAllTopics", fbAuth, getAllTopics);
+
+// delete a specific topic
+app.delete("/deleteTopic/:topicId", fbAuth, deleteTopic);
+
 exports.api = functions.https.onRequest(app);

functions/package-lock.json

@@ -34,21 +34,6 @@
         "dom-storage": "2.1.0",
         "tslib": "1.10.0",
         "xmlhttprequest": "1.8.0"
-      },
-      "dependencies": {
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
       }
     },
     "@firebase/app-types": {
@@ -70,15 +55,9 @@
       "integrity": "sha512-foQHhvyB0RR+mb/+wmHXd/VOU+D8fruFEW1k79Q9wzyTPpovMBa1Mcns5fwEWBhUfi8bmoEtaGB8RSAHnTFzTg=="
     },
     "@firebase/database": {
-<<<<<<< HEAD
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.3.tgz",
-      "integrity": "sha512-LnXKRE1AmjlS+iRF7j8vx+Ni8x85CmLP5u5Pw5rDKhKLn2eTR1tJKD937mUeeGEtDHwR1rrrkLYOqRR2cSG3hQ==",
-=======
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz",
       "integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
       "requires": {
         "@firebase/database-types": "0.4.3",
         "@firebase/logger": "0.1.25",
@@ -113,11 +92,7 @@
     "@firebase/firestore": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.5.3.tgz",
-<<<<<<< HEAD
-      "integrity": "sha512-CPYLvkGZBKE47oQC9a0q13UMVRj3LvnSbB1nOerktE3CGRHKy44LxDumamN8Kj067hV/80mKK9FdbeUufwO/Rg==",
-=======
       "integrity": "sha512-O/yAbXpitOA6g627cUl0/FHYlkTy1EiEKMKOlnlMOJF2fH+nLVZREXjsrCC7N2tIvTn7yYwfpZ4zpSNvrhwiTA==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
       "requires": {
         "@firebase/firestore-types": "1.5.0",
         "@firebase/logger": "0.1.25",
@@ -126,21 +101,6 @@
         "@grpc/proto-loader": "^0.5.0",
         "grpc": "1.23.3",
         "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
       }
     },
     "@firebase/firestore-types": {
@@ -173,16 +133,6 @@
         "@firebase/util": "0.2.28",
         "idb": "3.0.2",
         "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
       }
     },
     "@firebase/installations-types": {
@@ -190,6 +140,11 @@
       "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.1.2.tgz",
       "integrity": "sha512-fQaWIW8hyX1XUN7+FCSPjvM1agFjGidVuF4Sxi7aFwfyh5t+4fD2VpM4wCQbWmodnx4fZLvsuQd9mkxxU+lGYQ=="
     },
+    "@firebase/logger": {
+      "version": "0.1.25",
+      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
+      "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
+    },
     "@firebase/messaging": {
       "version": "0.4.11",
       "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.4.11.tgz",
@@ -198,16 +153,6 @@
         "@firebase/messaging-types": "0.3.2",
         "@firebase/util": "0.2.28",
         "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
       }
     },
     "@firebase/messaging-types": {
@@ -225,21 +170,6 @@
         "@firebase/performance-types": "0.0.3",
         "@firebase/util": "0.2.28",
         "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
       }
     },
     "@firebase/performance-types": {
@@ -272,8 +202,13 @@
         "@firebase/storage-types": "0.3.3",
         "@firebase/util": "0.2.28",
         "tslib": "1.10.0"
+      }
+    },
+    "@firebase/storage-types": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.3.3.tgz",
+      "integrity": "sha512-fUp4kpbxwDiWs/aIBJqBvXgFHZvgoND2JA0gJYSEsXtWtVwfgzY/710plErgZDeQKopX5eOR1sHskZkQUy0U6w=="
     },
-      "dependencies": {
     "@firebase/util": {
       "version": "0.2.28",
       "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
@@ -281,13 +216,6 @@
       "requires": {
         "tslib": "1.10.0"
       }
-        }
-      }
-    },
-    "@firebase/storage-types": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.3.3.tgz",
-      "integrity": "sha512-fUp4kpbxwDiWs/aIBJqBvXgFHZvgoND2JA0gJYSEsXtWtVwfgzY/710plErgZDeQKopX5eOR1sHskZkQUy0U6w=="
     },
     "@firebase/webchannel-wrapper": {
       "version": "0.2.26",
@@ -608,10 +536,9 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "3.0.0",
+      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-      "dev": true
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -1190,15 +1117,9 @@
       }
     },
     "end-of-stream": {
-<<<<<<< HEAD
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-=======
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz",
       "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
       "optional": true,
       "requires": {
         "once": "^1.4.0"
@@ -1280,6 +1201,12 @@
         "text-table": "^0.2.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -1294,6 +1221,15 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
         }
       }
     },
@@ -1556,33 +1492,6 @@
         "@firebase/polyfill": "0.3.22",
         "@firebase/storage": "0.3.12",
         "@firebase/util": "0.2.28"
-      },
-      "dependencies": {
-        "@firebase/database": {
-          "version": "0.5.4",
-          "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz",
-          "integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==",
-          "requires": {
-            "@firebase/database-types": "0.4.3",
-            "@firebase/logger": "0.1.25",
-            "@firebase/util": "0.2.28",
-            "faye-websocket": "0.11.3",
-            "tslib": "1.10.0"
-          }
-        },
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
       }
     },
     "firebase-admin": {
@@ -1710,8 +1619,7 @@
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
-      "optional": true
     },
     "gaxios": {
       "version": "2.0.1",
@@ -2259,15 +2167,9 @@
       }
     },
     "gtoken": {
-<<<<<<< HEAD
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.0.0.tgz",
-      "integrity": "sha512-XaRCfHJxhj06LmnWNBzVTAr85NfAErq0W1oabkdqwbq3uL/QTB1kyvGog361Uu2FMG/8e3115sIy/97Rnd4GjQ==",
-=======
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.1.0.tgz",
       "integrity": "sha512-wqyn2gf5buzEZN4QNmmiiW2i2JkEdZnL7Z/9p44RtZqgt4077m4khRgAYNuu8cBwHWCc6MsP6eDUn/KkF6jFIw==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
       "optional": true,
       "requires": {
         "gaxios": "^2.0.0",
@@ -2441,8 +2343,7 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-      "optional": true
     },
     "inflight": {
       "version": "1.0.6",
@@ -2457,8 +2358,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-      "optional": true
     },
     "inquirer": {
       "version": "6.5.2",
@@ -2528,10 +2428,8 @@
     "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "requires": {
+      "dev": true
-        "number-is-nan": "^1.0.0"
-      }
     },
     "is-obj": {
       "version": "2.0.0",
@@ -2929,7 +2827,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "optional": true,
       "requires": {
         "wrappy": "1"
       }
@@ -3374,8 +3271,7 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-      "optional": true
     },
     "slice-ansi": {
       "version": "2.1.0",
@@ -3428,11 +3324,28 @@
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^2.0.0",
         "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
       }
     },
     "string_decoder": {
@@ -3442,12 +3355,11 @@
       "optional": true
     },
     "strip-ansi": {
-      "version": "4.0.0",
+      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
       "requires": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^4.1.0"
       }
     },
     "strip-json-comments": {
@@ -3755,8 +3667,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-      "optional": true
     },
     "write": {
       "version": "1.0.3",

functions/package.json

@@ -16,7 +16,8 @@
     "axios": "^0.19.0",
     "firebase": "^6.6.2",
     "firebase-admin": "^8.6.0",
-    "firebase-functions": "^3.1.0"
+    "firebase-functions": "^3.1.0",
+    "strip-ansi": "^5.2.0"
   },
   "devDependencies": {
     "eslint": "^5.12.0",

functions/util/fbAuth.js

@@ -4,6 +4,13 @@ const { admin, db } = require('./admin');
 // The function will only execute if the user is logged in, or rather, they have
 // a valid token
 module.exports = (req, res, next) => {
+    console.log(req);
+    console.log(req.body);
+    console.log(req.headers);
+    console.log(req.headers.authorization);
+    console.log(JSON.stringify(req.body));
+    console.log(JSON.stringify(req.header));
+
     let idToken;
     
     // Checking that the token exists in the header of the request
@@ -25,6 +32,7 @@ module.exports = (req, res, next) => {
         .then((data) => {
             req.user.handle = data.docs[0].data().handle;  // Save username
             req.user.imageUrl = data.docs[0].data().imageUrl;
+            req.userData = data.docs[0].data();  // Stores all user data from the database
             return next();
         })
         .catch((err) => {

functions/util/validator.js

@@ -9,23 +9,39 @@ const isEmpty = (str) => {
   else return false;
 };
 
-exports.validateUpdateProfileInfo = (data) => {
+exports.validateUpdateProfileInfo = (req) => {
+  const newData = req.body;
+  // const oldData = req.userData;
   let errors = {};
-  let profileData = {};
+  let profileData = req.userData;
 
   // ?: Should users be able to change their handles and emails?
 
-  // Only adds the key to the database if the values are not empty
+  // Deletes any unused keys so that they aren't stored in the database
-  if (!isEmpty(data.firstName)) profileData.firstName = data.firstName.trim();
+  if (newData.firstName) {
-  if (!isEmpty(data.lastName)) profileData.lastName = data.lastName.trim();
+    profileData.firstName = newData.firstName.toString().trim();
-  if (!isEmpty(data.bio)) profileData.bio = data.bio.trim();
+  } else {
+    delete profileData.firstName;
+  }
 
-  if (isEmpty(data.email)) {
+  if (newData.lastName) {
+    profileData.lastName = newData.lastName.toString().trim();
+  } else {
+    delete profileData.lastName;
+  }
+
+  if (newData.bio) {
+    profileData.bio = newData.bio.toString().trim();
+  } else {
+    delete profileData.bio;
+  }
+
+  if (isEmpty(newData.email)) {
     errors.email = "Must not be empty.";
-  } else if (!isEmail(data.email)) {
+  } else if (!isEmail(newData.email)) {
     errors.email = "Must be a valid email.";
   } else {
-    profileData.email = data.email;
+    profileData.email = newData.email;
   }
 
   return {

package-lock.json

@@ -16,6 +16,15 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
+    "axios": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
+      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+      "requires": {
+        "follow-redirects": "1.5.10",
+        "is-buffer": "^2.0.2"
+      }
+    },
     "body-parser": {
       "version": "1.19.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
@@ -164,6 +173,24 @@
         "unpipe": "~1.0.0"
       }
     },
+    "follow-redirects": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "requires": {
+        "debug": "=3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
     "forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -204,6 +231,16 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
       "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
     },
+    "is-buffer": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
+    },
+    "jwt-decode": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz",
+      "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk="
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",

twistter-e4649-firebase-adminsdk-pgjve-1e57494429.json

@@ -1,12 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "twistter-e4649",
-  "private_key_id": "1e57494429e4fd7d17f6fc28524e14b8e5227596",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCyRdMZwXrpf3HB\nsVrGZVoPt+S+ahkT4SCCEWV/Q4O4hVyW277Rs0p7k5ZkZfkhcVVBUqKGMgW/Esvz\npx0VIgpg3gg308kMRmC3MGzYbodjynVyDHatyAZhhUi9cg0N2K9+vSsW5eSmWROe\nfVvB8hvr6m5xGVdJFA7DV4/0vm2cfy+Q/FlFb6vFmQTZtPZzGFf5BKoNMe7pMxey\n4zspAIZgRmxWDbAqqzX0PYk/WbXFgH/wn2X25S+ArHhoay2Hms65/NbWCV6mpFUJ\nYqzrlCn/WcwXGAm7tjmu00yD+bARabImh8R7+PSBaHMQ+SGdri2snIXWsvB/xi9/\nSNFqzHynAgMBAAECggEAVty/zapg1bnTt0FPziBfIA6FpaPzoSSN3uJUFozSdwuA\nAD+E/A9EiO7yFew71egvVrtJVmK0OxQRDSDNglkKPoWg8na+XL1D7a5qMpC0ZlKl\nJBNfljBCr6yuMySJqMf+Rp4siyUr4kO/0/cXyOnLYglhk7j5tzFPOi4FhgZtSRU9\nYckk5wwcBObUFE0Rmqf0gPcI9WuFUkusIjz3rjuEju1/U6E/VV5gHmMuQy3f9LHB\nnsiLAobx9+TGgs12CvkjWYpW5raUCCn5z/EYNPZSt7rg9CSWqXW009HCfTqi6i7o\nNpZ7qpp5DVQdHNFJunSGvI+k44+i8OE7HEY4xXt+OQKBgQDZ/E1QwJQoHuzPkrGW\nAc0a+NQeG8NwaXwsezlvYXMTbL27SxKXC3dzPT1WgNUKpaKj3wLJPar4NgPPSPi3\nqgmcvMqgwm4B+HPbXc1oxBS7/jD3pWJVyPO9Re17Uc0RYV/DORQhWe1Yq7TyMHvl\nbD/KqIvOxswigVxK4JMIxp4s7wKBgQDRXJfb4BHdR7CGfuTVQ19gH5uLgrK9ezBk\nQOLK+u9yBpoKyYSnD3OH/i0wG5bm3rUegzvwHGKKhDfiLbajMIt04n2DuVUm57HQ\n+Jca29V8XMWfhTbu3kDl+OOFmLvPCwg8C9edNTJWUVYu3EbwsyzCQY5TDroWGQdF\n6cQIkAIbyQKBgQCUtWd1UHuCR16cWOHniQEIhnoGtEAHHx9EJShQkLV1qfhhnlxn\nSL5LkpqWubsc0VR74LbA3N4XCJpevdRXT5vRHoZJV3q+w2UeYQaxkxrmCQoU1/GW\nvklxdRQGzg5M7hXrU7Qk8HlXxYPiuSq8n7WBJqyB+uLmI0P4HO6RzRW5ZwKBgBkr\nf5pQkvU+dCuHP+2fvuyogCPCn8iF8ehroJh0mKrlvklDtu36vpH/7eDVwEubRL0Z\nW/BfCT3L7YgEpOtzn6B6xko60tDtlAQijtAM09qysJOgCV2oXLcJOBlMpm+azO+j\nINXmmlmkR680jlbLw7rK9NhpcdfMRIKUOxwobAh5AoGBAJMN6n7Hy8nJRJZ18iHY\n3hEkVbKrLLMMHFDQj5BZQCeAp1v0Fj30RYJWS4hTzR9ht0MtdmPub460lh9hhqCM\nl3UnCJoz00ApF3Z2FRN/l0KpCFD9Gw2Hjyc3u9sEUpqd8G3cg3IZE6eZ6CZWljFT\nHcuQ2cTFdB8bq8oLUxXeY3Yv\n-----END PRIVATE KEY-----\n",
-  "client_email": "firebase-adminsdk-pgjve@twistter-e4649.iam.gserviceaccount.com",
-  "client_id": "102241295911303209723",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-pgjve%40twistter-e4649.iam.gserviceaccount.com"
-}

twistter-e4649-firebase-adminsdk-pgjve-382fc005e1.json

@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "twistter-e4649",
+  "private_key_id": "382fc005e17340a21dd39079feca75371330644d",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDL1bwTpEluR6dJ\nVfS/K1d76j2I3Wrn4qSbrTYm4/cAPBPlsBRO0bwrkhr+g0I6rwW/fFz8udjNAFB1\nfDfz769buR6go5us71I5LxMNviIhzFr59ZsEkcnUCgW8G7koicLEjWdstI4lJxZT\nRRolH+SFpPwsQAY399zjdBiCC8STbavVVhe+ChEDl/S2K72W7A7nWSMbLsyGsz2o\nQ9uIG3onwFNE7WRIeObWCxSBKlydMmTJ+p/CsTdFY4fUHb97QsMEmzRJox10kmyt\nP9l5wfJ2wUYvRXRJKq7Mwx1UnLduXP2oe/XvR5fzJLJ780HO6BNBf5IKcTHXHVBA\ne6ZtiL5dAgMBAAECggEAFvfN1NttjXL0KKak3hMA1+z8Y2WqXC1aUFMOMlz8Qhct\nmXNjy8CFAYEvGtVTgHqkR9Vi7PShYfLSc3U8diI155H5H4S6pUaPmfNHTwRzosyn\ncQRPJA6sEqvRGvHMxVfwjbvultMpiTTZpnxiMSNiLqT5PUs26CuSb5bErt1V7dP5\nn/lhY+4rzfXSrw38ZsO/gEvLZ/7iRA+JZgqE3Qs2cD5idxqqOcOLLiW741JpXTmd\n5ug/urJgSyvz+cNo3yHnajEtAxiSfkpU4sUHZ/WWqaRGWxpt3XWILtR9Q/4afPeM\n/T82YvddoW5pUwDpgvZxdVYjopuoxvnS298L0AGySQKBgQDqDD7Yh6SbOR3w4ZN9\nRO7q5KiJbyZmVdZ3lLZddsL/vto9JkUtnLDOMpYnb2TezGfN6ErzAkRQCSUsWK4m\nERbSK6oyUvevhlt/gHGP34uc/OCxGk2D7WCAS3s54ofDt2369tzIpGjsnkYM+h3b\nuZ5lFoWHG1YM3JtgcIIU6UygTwKBgQDe9ArV08wPDuXf4rcldmImQDB7xhGcg9xU\njAKEn5FZW1mvmBy3Sq1qpZj0baZz6eEDn6FBLwH1Ke5gdfrd8WnESUNnFnBBqpA1\nospIgUmKZ1sjyly9CHMQ11Kbzt7+kA9GYZrMbaMjS8M18qFEBZ7CoPLv5DLyabJW\nOkPzTwb/kwKBgQDR3fUkmEzj202bx8pHE97gxfTSd9aJAQN06uaz3GByjyKGnqB9\ni/mGjBnUdrCOj9+s5VT/ntK+qdSpdUODYuOBxiGxSnBK9kFpjTVHe35nYOHiLOHB\nIMPdhtGSUCzJNNvrpBzJ1ZM4SZwq2sSXWFRN9On7Amog0liJG5mpQqGxRQKBgHmP\nzFycF3XaZKH2xm8ppgg/FXBXJYEWMEr07+aJ7kEvWq4wHPAfSoCMe+JB6vDmg2Zr\nYgvdao7W5v83NKpQl5+LZrHNfTWAnxJviSWRQJyzD/Fqw7fZ5Is5K/SCDfn0aC+y\nxilSWhHDnFNM0Hr7KX3rLap43QJpePAk4qnF3AX7AoGBAOe5C1VMKoTapnxvo/FI\nBCvXw05SSEExfXVR0ryoqUxgu1asCkYyJSoWxOZQ+33npQ1/zV1mCXn/lNZcyveW\nZ5/cUw71grW8KBYFrW7LeQIzjZb7xPI3Z4EV0uYd2b69GkQk1buHj/gsswRhGEvx\nJM1DN1SCenbGcVLprM0vVelp\n-----END PRIVATE KEY-----\n",
+  "client_email": "firebase-adminsdk-pgjve@twistter-e4649.iam.gserviceaccount.com",
+  "client_id": "102241295911303209723",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-pgjve%40twistter-e4649.iam.gserviceaccount.com"
+}

twistter-frontend/README.md

@@ -1,5 +1,10 @@
 This project was bootstrapped with [Create React App](https://github.com/facebookincubator/create-react-app).
 
+
+Cloud: https://us-central1-twistter-e4649.cloudfunctions.net/api
+Local: http://localhost:5001/twistter-e4649/us-central1/api (npm install --save firebase)
+
+
 Below you will find some information on how to perform common tasks.<br>
 You can find the most recent version of this guide [here](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md).
 

twistter-frontend/package-lock.json

@@ -61,6 +61,14 @@
         }
       }
     },
+    "@material-ui/icons": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.5.1.tgz",
+      "integrity": "sha512-YZ/BgJbXX4a0gOuKWb30mBaHaoXRqPanlePam83JQPZ/y4kl+3aW0Wv9tlR70hB5EGAkEJGW5m4ktJwMgxQAeA==",
+      "requires": {
+        "@babel/runtime": "^7.4.4"
+      }
+    },
     "@material-ui/styles": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.5.0.tgz",
@@ -454,9 +462,9 @@
           }
         },
         "is-buffer": {
-          "version": "2.0.3",
+          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
         }
       }
     },
@@ -5277,6 +5285,11 @@
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
       "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE="
     },
+    "jwt-decode": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz",
+      "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk="
+    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -9712,6 +9725,11 @@
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
+    "typeface-roboto": {
+      "version": "0.0.75",
+      "resolved": "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-0.0.75.tgz",
+      "integrity": "sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg=="
+    },
     "uglify-js": {
       "version": "3.4.10",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",

twistter-frontend/package.json

@@ -4,12 +4,14 @@
   "private": true,
   "dependencies": {
     "@material-ui/core": "^4.4.3",
+    "@material-ui/icons": "^4.5.1",
     "@material-ui/styles": "^4.5.0",
     "@material-ui/system": "^4.5.0",
     "axios": "^0.19.0",
     "clsx": "^1.0.4",
     "create-react-app": "^3.1.2",
     "install": "^0.13.0",
+    "jwt-decode": "^2.2.0",
     "node-pre-gyp": "^0.13.0",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
@@ -17,7 +19,8 @@
     "react-router-dom": "^5.1.0",
     "react-scripts": "0.9.5",
     "redux": "^4.0.4",
-    "redux-thunk": "^2.3.0"
+    "redux-thunk": "^2.3.0",
+    "typeface-roboto": "0.0.75"
   },
   "devDependencies": {},
   "scripts": {

twistter-frontend/src/App.css

@@ -1,3 +1,7 @@
+html,
+body {
+  background-color: rgb(245, 245, 245);
+}
 .app {
   font-family: "Segoe UI";
   font-size: large;
@@ -22,7 +26,7 @@
   white-space: nowrap;
 }
 
-.register {
+.signup {
   background-color: #1da1f2;
   border: 1px solid #fff;
   color: #fff;

twistter-frontend/src/App.js

@@ -1,45 +1,87 @@
 /* eslint-disable */
-import React, { Component } from 'react';
+import React, { Component } from "react";
+import "./App.css";
+import axios from "axios";
 
-import './App.css';
+import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
+import Navbar from "./components/layout/NavBar";
+import jwtDecode from "jwt-decode";
+
+// Redux
+import { Provider } from "react-redux";
+import store from "./redux/store";
 import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider';
 import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
-
-import { BrowserRouter as Router } from 'react-router-dom';
-import Route from 'react-router-dom/Route';
-import Navbar from './components/layout/NavBar';
 import themeObject from './util/theme';
+import { SET_AUTHENTICATED } from './redux/types';
+import { logoutUser, getUserData } from './redux/actions/userActions';
 
+// Components
+import AuthRoute from "./util/AuthRoute";
+
+// axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api';
+
+// Pages
 import home from './pages/Home';
-import register from './pages/Register';
+import signup from './pages/Signup';
 import login from './pages/Login';
 import user from './pages/user';
-
+import logout from './pages/Logout';
+import Delete from './pages/Delete';
 import writeMicroblog from './Writing_Microblogs.js';
-import edit from './pages/edit.js';
+import editProfile from './pages/editProfile';
 import userLine from './Userline.js';
 
 const theme = createMuiTheme(themeObject);
 
+const token = localStorage.FBIdToken;
+if (token) {
+
+  try {
+    const decodedToken = jwtDecode(token);
+    if (decodedToken.exp * 1000 < Date.now()) {
+      store.dispatch(logoutUser());
+      window.location.href = "/login";
+    } else {
+      store.dispatch({ type: SET_AUTHENTICATED });
+      axios.defaults.headers.common['Authorization'] = token;
+      store.dispatch(getUserData());
+    }
+  } catch (invalidTokenError) {
+    store.dispatch(logoutUser());
+    window.location.href = "/login";
+  }
+}
+
+
 class App extends Component {
   render() {
     return (
       <MuiThemeProvider theme={theme}>
+        <Provider store={store}>
           <Router>
             <div className='container' >
               <Navbar />
             </div>
+
             <div className="app">
-          <Route exact path="/" component={home}/>
+              <Switch>
-          <Route exact path="/register" component={register}/>
+              {/* AuthRoute checks if the user is logged in and if they are it redirects them to /home */}
-          <Route exact path="/login" component={login}/>
+              <AuthRoute exact path="/signup" component={signup} />
+              <AuthRoute exact path="/login" component={login} />
+              <Route exact path="/logout" component={logout} />
+              <Route exact path="/delete" component={Delete} />
+
               <Route exact path="/user" component={user} />
               <Route exact path="/home" component={writeMicroblog} />
-          <Route exact path="/edit" component={edit}/>
+              <Route exact path="/edit" component={editProfile} />
-          <Route exact path="/user" component={userLine}/>
+
+              <AuthRoute exact path="/" component={home}/>
+              </Switch>
             </div>
 
           </Router>
+        </Provider>
       </MuiThemeProvider>
     );
   }

twistter-frontend/src/Logout.js

@@ -1,22 +0,0 @@
-/* eslint-disable */
-import React, { Component} from 'react';
-import './App.css';
-import logo from './images/twistter-logo.png';
-import TextField from '@material-ui/core/TextField';
-
-class Logout extends Component {
-  render() {
-    return(
-      <div>
-	    <img src={logo} className="app-logo" alt="logo" />
-      <br/><br/>
-	    <b>Logout of your Twistter Account</b>
-      <br/><br/>
-      <br/><br/>
-	    <button className="authButtons register" type="submit">Sign Out</button>
-      </div>
-    );
-  };
-}
-
-export default Logout;

twistter-frontend/src/Userline.js

@@ -23,7 +23,7 @@ class Userline extends Component {
 
      componentDidMount() {
 
-         axios.get('http://localhost:5001/twistter-e4649/us-central1/api/getallPostsforUser')
+         axios.get('/getallPostsforUser')
             .then(res => {
                 const post = res.data;
                 this.setState({microBlogs : post})

twistter-frontend/src/Writing_Microblogs.js

@@ -33,22 +33,27 @@ class Writing_Microblogs extends Component {
     }
 
     handleSubmit(event) {
-        // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value);
 
-        const response = axios.post(
+        const postData = {
-            'http://localhost:5001/twistter-e4649/us-central1/api/putPost',
+            body: this.state.value,  
-            { body: this.state.value,  
-              userHandle: "new user",
             userImage: "bing-url",
             microBlogTitle: this.state.title,
             microBlogTopics: this.state.topics.split(', ')
+        }
+        const headers = {
+            headers: { 'Content-Type': 'application/json'}
+        }
         
-            },
+        axios
-            { headers: { 'Content-Type': 'application/json'} }
+            .post("/putPost", postData, headers)
-            
+            .then((res) =>{
-        )
+                alert('Post was shared successfully!')
-        console.log(response.data);
+                console.log(res.data);
-        alert('Post was shared successfully!');
+            })
+            .catch((err) => {
+                alert('An error occured.');
+                console.error(err);
+            })
         event.preventDefault();
         this.setState({value: '', title: '',characterCount: 250, topics: ''})
     }

twistter-frontend/src/components/layout/NavBar.js

@@ -1,31 +1,75 @@
 /* eslint-disable */
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
+import PropTypes from 'prop-types';
+
+// Material UI stuff
 import AppBar from '@material-ui/core/AppBar';
 import ToolBar from '@material-ui/core/Toolbar';
 import Button from '@material-ui/core/Button';
+import withStyles from "@material-ui/core/styles/withStyles";
+
+// Redux stuff
+// import { logoutUser } from '../../redux/actions/userActions';
+import { connect } from 'react-redux';
+
+const styles = {
+    form: {
+      textAlign: "center"
+    },
+    textField: {
+      marginBottom: 30
+    },
+    pageTitle: {
+      marginBottom: 40
+    },
+    button: {
+      positon: "relative",
+      marginBottom: 30
+    },
+    progress: {
+      position: "absolute"
+    }
+  };
   
 export class Navbar extends Component {
     render() {
+        const authenticated = this.props.user.authenticated;
         return (
             <AppBar>
                 <ToolBar>
                     <Button component={ Link } to='/'>
                         Home
                     </Button>
-                    <Button component={ Link } to='/login'>
+                    {!authenticated && <Button component={ Link } to='/login'>
                         Login
-                    </Button>
+                    </Button>}
-                    <Button component={ Link } to='/register'>
+                    {!authenticated && <Button component={ Link } to='/signup'>
-                        Register
+                        Sign Up
-                    </Button>
+                    </Button>}
-		    <Button component={ Link } to='/logout'>
+                    {authenticated && <Button component={ Link } to='/logout'>
                         Logout
-		    </Button>
+                    </Button>}
+                    {authenticated && <Button component={ Link } to='/delete'>
+                        Delete Account
+                    </Button>}
                 </ToolBar>
             </AppBar>
         )
     }
 }
 
-export default Navbar;
+const mapStateToProps = (state) => ({
+    user: state.user
+})
+
+// const mapActionsToProps = { logoutUser };
+
+Navbar.propTypes = {
+    user: PropTypes.object.isRequired,
+    classes: PropTypes.object.isRequired
+}
+
+export default connect(mapStateToProps)(withStyles(styles)(Navbar));
+
+// export default Navbar;

twistter-frontend/src/components/profile/Profile.js

@@ -0,0 +1,48 @@
+import React, { Component, Fragment } from "react";
+import PropTypes from "prop-types";
+import axios from "axios";
+import { connect } from 'react-redux';
+
+//MUI
+import withStyles from "@material-ui/core/styles/withStyles";
+import Card from "@material-ui/core/CardMedia";
+import Typography from "@material-ui/core/Typography";
+import Button from "@material-ui/core/Button";
+import { Paper } from "@material-ui/core";
+
+const styles = theme => ({
+  ...theme
+});
+
+class Profile extends Component {
+  state = {
+    profile: null
+  };
+
+  componentDidMount() {
+    axios
+      .get("/user")
+      .then(res => {
+        console.log(res.data.userData.credentials.handle);
+        this.setState({
+          profile: res.data.userData.credentials.handle
+        });
+      })
+      .catch(err => console.log(err));
+  }
+  render() {
+    let profileMarkup = this.state.profile ? (
+        <p>
+        <Typography variant='h5'>{this.state.profile}</Typography>
+        </p>) : <p>loading profile...</p>
+
+    return profileMarkup;
+  }
+}
+
+const mapStateToProps = state => ({
+  user: state.user,
+  classes: PropTypes.object.isRequired
+});
+
+export default connect(mapStateToProps)(withStyles(styles)(Profile));

twistter-frontend/src/index.js

@@ -1,8 +1,11 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
+import * as serviceWorker from './serviceWorker';
 
 ReactDOM.render(
   <App />,
   document.getElementById('root')
 );
+
+serviceWorker.unregister();

twistter-frontend/src/pages/Delete.js

@@ -0,0 +1,60 @@
+/* eslint-disable */
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+
+// Material UI stuff
+import Button from "@material-ui/core/Button";
+import withStyles from "@material-ui/core/styles/withStyles";
+
+// Redux stuff
+//import { logoutUser } from "../redux/actions/userActions";
+import { deleteUser } from "../redux/actions/userActions";
+import { connect } from "react-redux";
+
+const styles = {
+  form: {
+    textAlign: "center"
+  },
+  textField: {
+    marginBottom: 30
+  },
+  pageTitle: {
+    marginBottom: 40
+  },
+  button: {
+    positon: "relative",
+    marginBottom: 30
+  },
+  progress: {
+    position: "absolute"
+  }
+};
+
+export class Delete extends Component {
+
+  componentDidMount() {
+    //this.props.logoutUser();
+    this.props.deleteUser();
+    this.props.history.push('/');
+  }
+
+  render() {
+    return null;
+  }
+}
+
+const mapStateToProps = (state) => ({
+  user: state.user
+});
+
+//const mapActionsToProps = { logoutUser };
+const mapActionsToProps = { deleteUser };
+
+Delete.propTypes = {
+  //logoutUser: PropTypes.func.isRequired,
+  deleteUser: PropTypes.func.isRequired,
+  user: PropTypes.object.isRequired,
+  classes: PropTypes.object.isRequired
+};
+
+export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(Delete));

twistter-frontend/src/pages/Home.js

@@ -21,8 +21,8 @@ class Home extends Component {
         <div>                    
           <b>Join today or sign in if you already have an account.</b> 
           <br/><br/>
-          <form action="./register">
+          <form action="./signup">
-            <button className="authButtons register">Sign up</button> 
+            <button className="authButtons signup">Sign up</button> 
           </form>
           <br/>
           <form action="./login">

twistter-frontend/src/pages/Login.js

@@ -1,73 +1,192 @@
 /* eslint-disable */
 import React, { Component } from 'react';
-import '../App.css';
+// import '../App.css';
-import axios from 'axios';
 import PropTypes from 'prop-types';
 
 import logo from '../images/twistter-logo.png';
-import TextField from '@material-ui/core/TextField';
 
-class Login extends Component {
+// Material-UI stuff
+import Button from "@material-ui/core/Button";
+import CircularProgress from "@material-ui/core/CircularProgress";
+import Grid from "@material-ui/core/Grid";
+import TextField from "@material-ui/core/TextField";
+import Typography from "@material-ui/core/Typography";
+import withStyles from "@material-ui/core/styles/withStyles";
+
+// Redux stuff
+import { connect } from 'react-redux';
+import { loginUser } from '../redux/actions/userActions';
+import { fontFamily } from '@material-ui/system';
+
+//Theme
+const styles = {
+  form: {
+    textAlign: "center"
+  },
+  textField: {
+    marginBottom: 20
+  },
+  pageTitle: {
+    // marginTop: 20,
+    marginBottom: 40
+  },
+  button: {
+    positon: "relative",
+    marginBottom: 30
+  },
+  progress: {
+    position: "absolute"
+  },
+  p: {
+    fontFamily: "cursive",
+  }
+};
+
+export class Login extends Component {
+  // componentDidMount() {
+  //   axios
+  //     .get("/getProfileInfo")
+  //     .then((res) => {
+  //       this.setState({
+  //         firstName: res.data.firstName,
+  //         lastName: res.data.lastName,
+  //         email: res.data.email,
+  //         handle: res.data.handle,
+  //         bio: res.data.bio
+  //       });
+  //     })
+  //     .catch((err) => {
+  //       console.error(err);
+  //     });
+  // }
+
+  // Constructor for the state
   constructor() {
     super();
     this.state = {
-        email: '',
+      email: "",
-        password: '',
+      password:"",
       errors: {}
     };
-    this.handleChange = this.handleChange.bind(this);
+  }
-    this.handleSubmit = this.handleSubmit.bind(this);
+
-};
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.UI.errors) {
+      this.setState({ errors: nextProps.UI.errors });
+    }
+  }
+
+  // Runs whenever the submit button is clicked.
+  // Updates the database entry of the signed in user with the
+  // data stored in the state.
   handleSubmit = (event) => {
     event.preventDefault();
-    const userData = {
+    const loginData = {
       email: this.state.email,
-        password: this.state.password
+      password: this.state.password,
     };
-    axios.post('http://localhost:5001/twistter-e4649/us-central1/api/login', userData)
+    this.props.loginUser(loginData, this.props.history);
-    .then(res => {
-        console.log(res.data);
-        localStorage.setItem('firebaseIdToken', `Bearer ${res.data.token}`);
-        this.props.history.push('/home');
-    })
-    .catch(err => {
-        this.setState({
-            errors: err.response.data
-        });
-    });
   };
+
+  // Updates the state whenever one of the textboxes changes.
+  // The key is the name of the textbox and the value is the
+  // value in the text box.
   handleChange = (event) => {
     this.setState({
-        [event.target.name]: event.target.value
+      [event.target.name]: event.target.value,
+      errors: {
+        [event.target.name]: null
+      }
     });
   };
 
   render() {
-    const { classes } = this.props;
+    const { classes, UI: { loading } } = this.props;
     const { errors } = this.state;
-    return (
-      <div>
-        <img src={logo} className="app-logo" alt="logo" />
-        <br/><br/>
-        <b>Log in to Twistter</b>
-        <br/><br/>
-        <form noValidate onSubmit={this.handleSubmit}>
-        <TextField className="authInput" id="email" name="email" label="Email" helperText={errors.email} error={errors.email ? true : false} 
-                        value={this.state.email} onChange={this.handleChange} />
-        <br/><br/>
-        <TextField className="authInput" id="password" name="password" label="Password" helperText={errors.password} error={errors.password ? true : false} 
-                        value={this.state.password} onChange={this.handleChange}  />
-        <br/><br/>
 
-        <button className="authButtons register" type="submit">Sign in</button>
+    return (
+      <Grid container className={classes.form}>
+        <Grid item sm />
+        <Grid item sm>
+        <img src={logo} className="app-logo" alt="logo" />
+          <br></br>
+          <Typography variant="p" className={classes.pageTitle} fontFamily = "Georgia, serif">
+            <b>Log in to Twistter</b>
+            <br></br>
+          </Typography>
+          <br></br>
+          <form noValidate onSubmit={this.handleSubmit}>
+            <TextField
+              id="email"
+              name="email"
+              label="Email*"
+              className={classes.textField}
+              value={this.state.email}
+              helperText={errors.email}
+              error={errors.email ? true : false}
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <TextField
+              id="password"
+              name="password"
+              label="Password*"
+              className={classes.textField}
+              value={this.state.password}
+              helperText={errors.password}
+              error={errors.password ? true : false}
+              type="password"
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <Button
+              type="submit"
+              variant="contained"
+              color="primary"
+              className={classes.button}
+              disabled={loading}
+            >
+              Login
+              {loading && (
+                <CircularProgress size={30} className={classes.progress} />
+              )}
+            </Button>
+            {errors.general && (
+              <Typography color="error">Invalid username/email or password</Typography>
+            )}
           </form>
-      </div>
+        </Grid>
+        <Grid item sm />
+      </Grid>
     );
-  };
   }
+}
+
+// Proptypes just confirms that all data in it exists and is of the type that it
+// is declared to be
+Login.propTypes = {
+  classes: PropTypes.object.isRequired,
+  loginUser: PropTypes.func.isRequired,
+  user: PropTypes.object.isRequired,
+  UI: PropTypes.object.isRequired
+};
+
+const mapStateToProps = (state) => ({
+  user: state.user,
+  UI: state.UI,
+});
+
+const mapActionsToProps = {
+  loginUser
+}
+
 Login.propTypes = {
   classes: PropTypes.object.isRequired
 };
 
+// This mapStateToProps is just synchronizing the 'state' to 'this.props' so we can access it
+// The state contains info about the current logged in user
 
-export default Login;
+export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(Login));

twistter-frontend/src/pages/Logout.js

@@ -0,0 +1,56 @@
+/* eslint-disable */
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+
+// Material UI stuff
+import Button from "@material-ui/core/Button";
+import withStyles from "@material-ui/core/styles/withStyles";
+
+// Redux stuff
+import { logoutUser } from "../redux/actions/userActions";
+import { connect } from "react-redux";
+
+const styles = {
+  form: {
+    textAlign: "center"
+  },
+  textField: {
+    marginBottom: 30
+  },
+  pageTitle: {
+    marginBottom: 40
+  },
+  button: {
+    positon: "relative",
+    marginBottom: 30
+  },
+  progress: {
+    position: "absolute"
+  }
+};
+
+export class Logout extends Component {
+
+  componentDidMount() {
+    this.props.logoutUser();
+    this.props.history.push('/');
+  }
+
+  render() {
+    return null;
+  }
+}
+
+const mapStateToProps = (state) => ({
+  user: state.user
+});
+
+const mapActionsToProps = { logoutUser };
+
+Logout.propTypes = {
+  logoutUser: PropTypes.func.isRequired,
+  user: PropTypes.object.isRequired,
+  classes: PropTypes.object.isRequired
+};
+
+export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(Logout));

twistter-frontend/src/pages/Register.js

@@ -1,97 +0,0 @@
-import React, { Component } from 'react';
-import '../App.css';
-
-import logo from '../images/twistter-logo.png';
-import axios from 'axios';
-import TextField from '@material-ui/core/TextField';
-import PropTypes from 'prop-types';
-
-
-class Register extends Component {
-
-  constructor() {
-    super();
-    this.state = {
-        email: '',
-        handle: '',
-        password: '',
-        confirmPassword: '',
-        errors: {}
-    };
-
-    this.handleSubmit = this.handleSubmit.bind(this);
-    this.handleChange = this.handleChange.bind(this);
-};
-
-
-handleSubmit = (event) => {
-   const newUserData = {
-      email: this.state.email,
-      handle: this.state.handle,
-      password: this.state.password,
-      confirmPassword: this.state.confirmPassword
-  };
-  axios.post('http://localhost:5001/twistter-e4649/us-central1/api/signup', newUserData)
-  .then(res => {
-      console.log(res.data);
-      localStorage.setItem('firebaseIdToken', `Bearer ${res.data.token}`);
-      this.props.history.push('/');
-  })
-  .catch(err => {
-      this.setState({
-          errors: err.response.data
-      });
-  });
-  alert("You successfully registered");
-  event.preventDefault();
-  this.setState({email: '', handle: '', password: '', confirmPassword: ''});
-};
- 
- 
-handleChange = (event) => {
-  this.setState({
-      [event.target.name]: event.target.value
-  });
-};
-
-  render() {
-    const { classes } = this.props;
-    const { errors } = this.state;
-    return (
-      <div>
-        <img src={logo} className="app-logo" alt="logo" />
-        <br/><br/>
-        <b>Create your account</b>
-        <br/><br/>
-        <form noValidate onSubmit={this.handleSubmit}>
-
-        <TextField className="authInput" id="email" name="email" label="Email" helperText={errors.email} error={errors.email ? true : false} 
-                        value={this.state.email} onChange={this.handleChange}/>
-        <br/><br/>
-        <TextField className="authInput" id="username" name="handle" label="Username" helperText={errors.handle} error={errors.handle ? true : false} 
-                        value={this.state.handle} onChange={this.handleChange} />
-        <br/><br/>
-        <TextField className="authInput" id="password" name="password" label="Password" helperText={errors.password} error={errors.password ? true : false} 
-                        value={this.state.password} onChange={this.handleChange} />
-        <br/><br/>
-        <TextField className="authInput" id="confirmPassword" name="confirmPassword" label="Confirm Password" helperText={errors.confirmPassword} error={errors.confirmPassword ? true : false} 
-                        value={this.state.confirmPassword} onChange={this.handleChange} />
-        <br/><br/>
-        {
-                            errors.general && 
-                            (<div className={classes.customError}>
-                                {errors.general}
-                            </div>)
-        }
-        <button class="authButtons register" id="submit">Sign up</button>
-        </form>
-      </div>
-    );
-  }
-  
-}
-Register.propTypes = {
-  classes: PropTypes.object.isRequired
-};
-
-export default Register;

twistter-frontend/src/pages/Signup.js

@@ -0,0 +1,214 @@
+/* eslint-disable */
+import React, { Component } from 'react';
+// import '../App.css';
+import PropTypes from 'prop-types';
+
+import logo from '../images/twistter-logo.png';
+
+// Material-UI stuff
+import Button from "@material-ui/core/Button";
+import CircularProgress from "@material-ui/core/CircularProgress";
+import Grid from "@material-ui/core/Grid";
+import TextField from "@material-ui/core/TextField";
+import Typography from "@material-ui/core/Typography";
+import withStyles from "@material-ui/core/styles/withStyles";
+
+// Redux stuff
+import { connect } from 'react-redux';
+import { signupUser } from '../redux/actions/userActions';
+import { border } from '@material-ui/system';
+
+const styles = {
+  form: {
+    textAlign: "center"
+  },
+  textField: {
+    marginBottom: 20,
+    //border: "1px solid #234",
+    display: "inline-block",
+    boxSizing: "border-box",
+  },
+  pageTitle: {
+    marginBottom: 40
+  },
+  button: {
+    positon: "relative",
+    marginBottom: 30
+  },
+  progress: {
+    position: "absolute"
+  },
+  div: {
+    borderRadius: "5px",
+    backgroundColor: "grey",
+    padding: "20px",
+  },
+  p: {
+    fontFamily: "Segoe UI",
+  }
+};
+
+export class Signup extends Component {
+
+  // Constructor for the state
+  constructor() {
+    super();
+    this.state = {
+      handle: "",
+      email: "",
+      password:"",
+      confirmPassword: "",
+      errors: {}
+    };
+  }
+
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.UI.errors) {
+      this.setState({ errors: nextProps.UI.errors });
+    }
+  }
+
+  // Runs whenever the submit button is clicked.
+  // Updates the database entry of the signed in user with the
+  // data stored in the state.
+  handleSubmit = (event) => {
+    event.preventDefault();
+    const signupData = {
+      handle: this.state.handle,
+      email: this.state.email,
+      password: this.state.password,
+      confirmPassword: this.state.confirmPassword
+    };
+    console.log(signupData)
+    this.props.signupUser(signupData, this.props.history);
+  };
+
+  // Updates the state whenever one of the textboxes changes.
+  // The key is the name of the textbox and the value is the
+  // value in the text box.
+  handleChange = (event) => {
+    this.setState({
+      [event.target.name]: event.target.value,
+      errors: {
+        [event.target.name]: null
+      }
+    });
+  };
+
+  render() {
+    const { classes, UI: { loading } } = this.props;
+    const { errors } = this.state;
+
+    return (
+      <Grid container className={classes.form}>
+        <Grid item sm />
+        <Grid item sm>
+        <img src={logo} className="app-logo" alt="logo" />
+          <br></br>
+          <Typography variant="p" className={classes.pageTitle}>
+            <b>Create a new account</b>
+            <br></br>
+          </Typography>
+          <br></br>
+          <form noValidate onSubmit={this.handleSubmit}>
+          <TextField
+              id="handle"
+              name="handle"
+              label="Username*"
+              className={classes.textField}
+              value={this.state.handle}
+              helperText={errors.handle}
+              error={errors.handle ? true : false}
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <TextField
+              id="email"
+              name="email"
+              label="Email*"
+              className={classes.textField}
+              value={this.state.email}
+              helperText={errors.email}
+              error={errors.email ? true : false}
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <TextField
+              id="password"
+              name="password"
+              label="Password*"
+              className={classes.textField}
+              value={this.state.password}
+              helperText={errors.password}
+              error={errors.password ? true : false}
+              type="password"
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <TextField
+              id="confirmPassword"
+              name="confirmPassword"
+              label="Confirm Password*"
+              className={classes.textField}
+              value={this.state.confirmPassword}
+              helperText={errors.confirmPassword}
+              error={errors.confirmPassword ? true : false}
+              type="password"
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <br></br>
+            <br></br>
+            <Button
+              type="submit"
+              variant="contained"
+              color="primary"
+              className={classes.button}
+              disabled={loading}
+            >
+              Sign Up
+              {loading && (
+                <CircularProgress size={30} className={classes.progress} />
+              )}
+            </Button>
+            {errors.general && (
+              <Typography color="error">Invalid username/email or password</Typography>
+            )}
+          </form>
+        </Grid>
+        <Grid item sm />
+      </Grid>
+    );
+  }
+}
+
+// Proptypes just confirms that all data in it exists and is of the type that it
+// is declared to be
+Signup.propTypes = {
+  classes: PropTypes.object.isRequired,
+  signupUser: PropTypes.func.isRequired,
+  user: PropTypes.object.isRequired,
+  UI: PropTypes.object.isRequired
+};
+
+const mapStateToProps = (state) => ({
+  user: state.user,
+  UI: state.UI,
+});
+
+const mapActionsToProps = {
+  signupUser
+}
+
+Signup.propTypes = {
+  classes: PropTypes.object.isRequired
+};
+
+// This mapStateToProps is just synchronizing the 'state' to 'this.props' so we can access it
+// The state contains info about the current logged in user
+
+export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(Signup));

twistter-frontend/src/pages/editProfile.js

@@ -50,6 +50,12 @@ export class edit extends Component {
       })
       .catch((err) => {
         console.error(err);
+        if (err.response.status === 403) {
+          alert("You are not logged in");
+          // TODO: Redirect them, to the profile they are trying to edit
+          // If they are on /itsjimmy/edit, they will be redirected to /itsjimmy
+          this.props.history.push('../');
+        }
       });
   }
 
@@ -82,9 +88,18 @@ export class edit extends Component {
       handle: this.state.handle,
       bio: this.state.bio
     };
+    
+    // Removes all keys from newProfileData that are empty, undefined, or null
+    Object.keys(newProfileData).forEach(key => {
+      if (newProfileData[key] === "" || newProfileData[key] === undefined || newProfileData[key] === null) {
+        delete newProfileData[key];
+      }
+    })
+      
     axios
       .post("/updateProfileInfo", newProfileData)
       .then((res) => {
+        console.log(res);
         this.setState({
           loading: false
         });
@@ -92,6 +107,7 @@ export class edit extends Component {
         // TODO: Need to redirect user to their profile page
       })
       .catch((err) => {
+        console.log(err);
         this.setState({
           errors: err.response.data,
           loading: false
@@ -102,6 +118,7 @@ export class edit extends Component {
   // Updates the state whenever one of the textboxes changes.
   // The key is the name of the textbox and the value is the
   // value in the text box.
+  // Also sets errors to null of textboxes that have been edited
   handleChange = (event) => {
     this.setState({
       [event.target.name]: event.target.value,

twistter-frontend/src/pages/user.js

@@ -1,35 +1,124 @@
 /* eslint-disable */
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import axios from 'axios';
 //import '../App.css';
 import { makeStyles, styled } from '@material-ui/core/styles';
 import Grid from '@material-ui/core/Grid';
 import Card from '@material-ui/core/Card';
-import CardMedia from '@material-ui/core/CardMedia';
+import Chip from '@material-ui/core/Chip';
-import CardContent from '@material-ui/core/CardContent';
+import Typography from "@material-ui/core/Typography";
+import AddCircle from '@material-ui/icons/AddCircle';
+import TextField from '@material-ui/core/TextField';
 
-const PostCard = styled(Card)({
+// component
-  background: 'linear-gradient(45deg, #1da1f2 90%)',
+import Userline from '../Userline';
-  border: 3,
+import noImage from '../images/no-img.png';
-  borderRadius: 3,
+
-  height:225,
+const MyChip = styled(Chip)({
-  width: 645,
+  margin: 2,
-  padding: '0 30px',
+  color: 'primary'
 });
 
 class user extends Component {  
+  state = {
+    profile: null,
+    imageUrl: null,
+    topics: null,
+    newTopic: null
+  };
+  
+  handleDelete = (topic) => {
+    alert(`Delete topic: ${topic}!`);
+  }
+  
+  handleAddCircle = () => {
+    axios.post('/putTopic', {
+      topic: this.state.newTopic
+    })
+    .then(function () {
+      location.reload();
+    })
+    .catch(function (err) {
+      console.log(err);
+    });
+  }
+
+  handleChange(event) {
+    this.setState({
+      newTopic: event.target.value
+    })
+  }
+
+  componentDidMount() {
+    axios
+      .get("/user")
+      .then(res => {
+        this.setState({
+          profile: res.data.credentials.handle,
+          imageUrl: res.data.credentials.imageUrl
+        });
+      })
+      .catch(err => console.log(err));
+    axios
+      .get("/getAllTopics")
+      .then(res => {
+        this.setState({
+          topics: res.data
+        })
+      })
+      .catch(err => console.log(err));
+  }
   render() {
+    const classes = this.props;
+    let profileMarkup = this.state.profile ? (
+      <p>
+      <Typography variant='h5'>{this.state.profile}</Typography>
+      </p>) : (<p>loading username...</p>);
+    
+
+    let topicsMarkup = this.state.topics ? (
+      this.state.topics.map(topic => <MyChip 
+        label={{topic}.topic.topic}
+        key={{topic}.topic.topicId}
+        onDelete={ (topic) => this.handleDelete(topic)}/>)
+    ) : (<p> loading topics...</p>);
+
+    let imageMarkup = this.state.imageUrl ? (
+      <img
+      src={this.state.imageUrl}
+      height="250"
+      width="250"
+      />
+    ) : (<img src={noImage}/>);
 
     return (
-      <div>
+      <Grid container spacing={16}>
-        <h1>User Profile</h1>
+        <Grid item sm={8} xs={12}>
-        <br/><br/>
+          <p>Post</p>
-        <PostCard>Some card and content</PostCard>
+        </Grid>
-        <br/><br/>
+        <Grid item sm={4} xs={12}>
-      </div>
+          {imageMarkup}
-    )
+          {profileMarkup}
+          {topicsMarkup}
+          <TextField
+          id="newTopic"
+          label="new topic"
+          defaultValue=""
+          margin="normal"
+          variant="outlined"
+          value={this.state.newTopic}
+          onChange={ (event) => this.handleChange(event)}
+          />
+          <AddCircle
+            color="primary"
+            clickable
+            onClick={this.handleAddCircle}
+          />
+        </Grid>
+      </Grid>
+    );
   }
 }
 
-
-
 export default user;

twistter-frontend/src/redux/actions/userActions.js

@@ -0,0 +1,88 @@
+import {SET_USER, SET_ERRORS, CLEAR_ERRORS, LOADING_UI, SET_AUTHENTICATED, SET_UNAUTHENTICATED} from '../types';
+import axios from 'axios';
+
+
+export const getUserData = () => (dispatch) => {
+    axios.get('/user')
+        .then((res) => {
+            dispatch({
+                type: SET_USER,
+                payload: res.data,
+            })
+        })
+        .catch((err) => console.error(err));
+}
+
+export const loginUser = (loginData, history) => (dispatch) => {
+    dispatch({ type: LOADING_UI });
+    axios
+      .post("/login", loginData)
+      .then((res) => {
+        // Save the login token
+        setAuthorizationHeader(res.data.token);
+        dispatch(getUserData());
+        dispatch({ type: CLEAR_ERRORS })
+        // Redirects to home page
+        history.push('/home');
+      })
+      .catch((err) => {
+        dispatch ({
+            type: SET_ERRORS,
+            payload: err.response.data,
+        })
+      });
+};
+
+export const signupUser = (newUserData, history) => (dispatch) => {
+    dispatch({ type: LOADING_UI });
+    axios
+      .post("/signup", newUserData)
+      .then((res) => {
+        console.log(res);
+        console.log(res.data);
+        // Save the signup token
+        setAuthorizationHeader(res.data.token);
+        dispatch(getUserData());
+        dispatch({ type: CLEAR_ERRORS })
+        // Redirects to home page
+        history.push('/home');
+      })
+      .catch((err) => {
+        dispatch ({
+            type: SET_ERRORS,
+            payload: err.response.data,
+        })
+      });
+};
+
+export const logoutUser = () => (dispatch) => {
+    localStorage.removeItem('FBIdToken');
+    delete axios.defaults.headers.common['Authorization'];
+    dispatch({ type: SET_UNAUTHENTICATED });
+}
+
+export const deleteUser = () => (dispatch) => {
+  axios
+    .delete("/delete")
+    .then((res) => {
+      console.log(res);
+      console.log("User account successfully deleted.");
+    }
+    )
+    .catch((err) => {
+      dispatch ({
+        type: SET_ERRORS,
+        payload: err.response.data,
+      })
+    });
+
+  localStorage.removeItem('FBIdToken');
+  delete axios.defaults.headers.common['Authorization'];
+  dispatch({ type: SET_UNAUTHENTICATED });
+}
+
+const setAuthorizationHeader = (token) => {
+    const FBIdToken = `Bearer ${token}`;
+    localStorage.setItem('FBIdToken', FBIdToken);
+    axios.defaults.headers.common['Authorization'] = FBIdToken;
+}

twistter-frontend/src/redux/reducers/uiReducer.js

@@ -0,0 +1,30 @@
+import { SET_ERRORS, CLEAR_ERRORS, LOADING_UI } from '../types';
+
+const initialState = {
+    loading: false,
+    errors: null
+};
+
+export default function(state = initialState, action) {
+    switch(action.type) {
+        case SET_ERRORS:
+            return {
+                ...state,
+                loading: false,
+                errors: action.payload
+            };
+        case CLEAR_ERRORS:
+            return {
+                ...state,
+                loading: false,
+                errors: null
+            };
+        case LOADING_UI:
+            return {
+                ...state,
+                loading: true
+            }
+        default:
+            return state;
+    }
+}

twistter-frontend/src/redux/reducers/userReducer.js

@@ -0,0 +1,28 @@
+import {SET_USER, SET_ERRORS, CLEAR_ERRORS, LOADING_UI, SET_AUTHENTICATED, SET_UNAUTHENTICATED} from '../types';
+
+const initialState = {
+    authenticated: false,
+    credentials: {},
+    likes: [],
+    notifications: []
+};
+
+export default function(state = initialState, action) {
+    switch(action.type) {
+        case SET_AUTHENTICATED:
+            return {
+                ...state, 
+                authenticated: true,
+
+            };
+        case SET_UNAUTHENTICATED:
+            return initialState;
+        case SET_USER:
+            return {
+                authenticated: true,
+                ...action.payload,
+            };
+        default:
+            return state;
+    }
+}

twistter-frontend/src/redux/store.js

@@ -0,0 +1,28 @@
+import { createStore, combineReducers, applyMiddleware, compose } from "redux";
+import thunk from "redux-thunk";
+
+import userReducer from "./reducers/userReducer";
+import dataReducer from "./reducers/dataReducer";
+import uiReducer from "./reducers/uiReducer";
+
+const initialState = {};
+
+const middleWare = [thunk];
+
+const reducers = combineReducers({
+  user: userReducer,
+  data: dataReducer,
+  UI: uiReducer
+});
+
+
+const store = createStore(
+  reducers,
+  initialState,
+  compose(
+    applyMiddleware(...middleWare),
+    window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f // Can be removed after debugging is finished
+  )
+);
+
+export default store;

twistter-frontend/src/redux/types.js

@@ -0,0 +1,12 @@
+// User reducer types
+export const SET_AUTHENTICATED = 'SET_AUTHENTICATED';
+export const SET_UNAUTHENTICATED = 'SET_UNAUTHENTICATED';
+export const SET_USER = 'SET_USER';
+export const LOADING_USER = 'LOADING_USER';
+
+// UI reducer types
+export const SET_ERRORS = 'SET_ERRORS';
+export const LOADING_UI = 'LOADING_UI';
+export const CLEAR_ERRORS = 'CLEAR_ERRORS';
+
+// Data reducer types

twistter-frontend/src/serviceWorker.js

@@ -0,0 +1,135 @@
+// This optional code is used to register a service worker.
+// register() is not called by default.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on subsequent visits to a page, after all the
+// existing tabs open on the page have been closed, since previously cached
+// resources are updated in the background.
+
+// To learn more about the benefits of this model and instructions on how to
+// opt-in, read https://bit.ly/CRA-PWA
+
+const isLocalhost = Boolean(
+    window.location.hostname === 'localhost' ||
+      // [::1] is the IPv6 localhost address.
+      window.location.hostname === '[::1]' ||
+      // 127.0.0.1/8 is considered localhost for IPv4.
+      window.location.hostname.match(
+        /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+      )
+  );
+  
+  export function register(config) {
+    if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+      // The URL constructor is available in all browsers that support SW.
+      const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
+      if (publicUrl.origin !== window.location.origin) {
+        // Our service worker won't work if PUBLIC_URL is on a different origin
+        // from what our page is served on. This might happen if a CDN is used to
+        // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+        return;
+      }
+  
+      window.addEventListener('load', () => {
+        const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+  
+        if (isLocalhost) {
+          // This is running on localhost. Let's check if a service worker still exists or not.
+          checkValidServiceWorker(swUrl, config);
+  
+          // Add some additional logging to localhost, pointing developers to the
+          // service worker/PWA documentation.
+          navigator.serviceWorker.ready.then(() => {
+            console.log(
+              'This web app is being served cache-first by a service ' +
+                'worker. To learn more, visit https://bit.ly/CRA-PWA'
+            );
+          });
+        } else {
+          // Is not localhost. Just register service worker
+          registerValidSW(swUrl, config);
+        }
+      });
+    }
+  }
+  
+  function registerValidSW(swUrl, config) {
+    navigator.serviceWorker
+      .register(swUrl)
+      .then(registration => {
+        registration.onupdatefound = () => {
+          const installingWorker = registration.installing;
+          if (installingWorker == null) {
+            return;
+          }
+          installingWorker.onstatechange = () => {
+            if (installingWorker.state === 'installed') {
+              if (navigator.serviceWorker.controller) {
+                // At this point, the updated precached content has been fetched,
+                // but the previous service worker will still serve the older
+                // content until all client tabs are closed.
+                console.log(
+                  'New content is available and will be used when all ' +
+                    'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
+                );
+  
+                // Execute callback
+                if (config && config.onUpdate) {
+                  config.onUpdate(registration);
+                }
+              } else {
+                // At this point, everything has been precached.
+                // It's the perfect time to display a
+                // "Content is cached for offline use." message.
+                console.log('Content is cached for offline use.');
+  
+                // Execute callback
+                if (config && config.onSuccess) {
+                  config.onSuccess(registration);
+                }
+              }
+            }
+          };
+        };
+      })
+      .catch(error => {
+        console.error('Error during service worker registration:', error);
+      });
+  }
+  
+  function checkValidServiceWorker(swUrl, config) {
+    // Check if the service worker can be found. If it can't reload the page.
+    fetch(swUrl)
+      .then(response => {
+        // Ensure service worker exists, and that we really are getting a JS file.
+        const contentType = response.headers.get('content-type');
+        if (
+          response.status === 404 ||
+          (contentType != null && contentType.indexOf('javascript') === -1)
+        ) {
+          // No service worker found. Probably a different app. Reload the page.
+          navigator.serviceWorker.ready.then(registration => {
+            registration.unregister().then(() => {
+              window.location.reload();
+            });
+          });
+        } else {
+          // Service worker found. Proceed as normal.
+          registerValidSW(swUrl, config);
+        }
+      })
+      .catch(() => {
+        console.log(
+          'No internet connection found. App is running in offline mode.'
+        );
+      });
+  }
+  
+  export function unregister() {
+    if ('serviceWorker' in navigator) {
+      navigator.serviceWorker.ready.then(registration => {
+        registration.unregister();
+      });
+    }
+  }

twistter-frontend/src/util/AuthRoute.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Route, Redirect } from 'react-router-dom';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+
+const AuthRoute = ({ component: Component, authenticated, ...rest }) => (
+  <Route
+    {...rest}
+    render={(props) =>
+      authenticated === true ? <Redirect to="/home" /> : <Component {...props} />
+    }
+  />
+);
+
+const mapStateToProps = (state) => ({
+  authenticated: state.user.authenticated
+});
+
+AuthRoute.propTypes = {
+  user: PropTypes.object
+};
+
+export default connect(mapStateToProps)(AuthRoute);

twistter-frontend/src/util/theme.js

@@ -50,7 +50,13 @@ export default {
       marginBottom: 20
     },
     paper: {
-      padding: 20
+      padding: 10,
+      display: 'flex',
+      justifyContent: 'center',
+      flexWrap: 'wrap'
+    },
+    chip: {
+      margin: 0.5,
     },
     profile: {
       '& .image-wrapper': {