From 6184a22607b5c7a7c76539ae8764ac66fda5a837 Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Sun, 17 Nov 2019 10:32:59 -0500 Subject: [PATCH] Fixed conflicts with Sprint 2 checkpoint and the most up-to-date version --- functions/handlers/post.js | 6 - functions/handlers/topic.js | 80 ++-- functions/handlers/users.js | 420 ++++++-------------- functions/index.js | 34 +- twistter-frontend/src/App.js | 43 +- twistter-frontend/src/Writing_Microblogs.js | 205 +++++----- twistter-frontend/src/pages/Login.js | 14 +- twistter-frontend/src/pages/Signup.js | 23 +- twistter-frontend/src/pages/user.js | 117 ++---- 9 files changed, 310 insertions(+), 632 deletions(-) diff --git a/functions/handlers/post.js b/functions/handlers/post.js index a57cfe1..48fbbcc 100644 --- a/functions/handlers/post.js +++ b/functions/handlers/post.js @@ -1,4 +1,3 @@ -/* eslint-disable prefer-arrow-callback */ /* eslint-disable promise/always-return */ const admin = require('firebase-admin'); @@ -17,7 +16,6 @@ exports.putPost = (req, res) => { admin.firestore().collection('posts').add(newPost) .then((doc) => { - doc.update({postId: doc.id}) const resPost = newPost; resPost.postId = doc.id; return res.status(200).json(resPost); @@ -65,7 +63,3 @@ exports.getallPosts = (req, res) => { res.status(500).send("Failed to retrieve posts from database.", err); }); }; - -exports.getFilteredPosts = (req, res) => { - admin.firestore().collection('posts').where('userHandle', '==', 'new user').where('microBlogTopics', '==') -}; diff --git a/functions/handlers/topic.js b/functions/handlers/topic.js index a55f748..4d3dc3d 100644 --- a/functions/handlers/topic.js +++ b/functions/handlers/topic.js @@ -1,60 +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; - return res.status(200).json(resTopic); + 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" }); + .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({ - topic: doc.data().topic, - id: doc.id + admin.firestore().collection('topics').get() + .then((data) => { + let topics = []; + data.forEach(function(doc) { + topics.push(doc.data()); }); - }); - return res.status(200).json(topics); + return res.status(200).json(topics); + }) + .catch((err) => { + console.error(err); + return res.status(500).json({error: 'Failed to fetch all 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(); - } + 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(() => { - return res.json({ message: "Topic successfully deleted!" }); + res.json({ message: 'Topic successfully deleted!'}); }) - .catch(err => { - console.error(err); - return res.status(500).json({ error: "Failed to delete topic." }); - }); -}; + .catch((err) => { + console.error(err); + return res.status(500).json({error: 'Failed to delete topic.'}) + }) +} \ No newline at end of file diff --git a/functions/handlers/users.js b/functions/handlers/users.js index 2fdcd51..b455b02 100644 --- a/functions/handlers/users.js +++ b/functions/handlers/users.js @@ -54,7 +54,7 @@ exports.signup = (req, res) => { db.doc(`/users/${newUser.handle}`) .get() - .then(doc => { + .then((doc) => { if (doc.exists) { return res .status(400) @@ -64,28 +64,25 @@ exports.signup = (req, res) => { .auth() .createUserWithEmailAndPassword(newUser.email, newUser.password); }) - .then(data => { + .then((data) => { userId = data.user.uid; return data.user.getIdToken(); }) - .then(idToken => { + .then((idToken) => { token = idToken; - const defaultImageUrl = `https://firebasestorage.googleapis.com/v0/b/${config.storageBucket}/o/no-img.png?alt=media`; const userCred = { email: newUser.email, handle: newUser.handle, createdAt: newUser.createdAt, userId, - followedTopics: [], - imageUrl: defaultImageUrl, - verified: false + followedTopics: [] }; return db.doc(`/users/${newUser.handle}`).set(userCred); }) .then(() => { return res.status(201).json({ token }); }) - .catch(err => { + .catch((err) => { console.error(err); if (err.code === "auth/email-already-in-use") { return res.status(500).json({ email: "This email is already taken." }); @@ -123,156 +120,116 @@ exports.login = (req, res) => { // 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) { + 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." }); + } + else { + return res.status(403).json({ general: "Invalid credentials. Please try again." }); } return; + }) + .then(function() { + firebase + .auth() + .signInWithEmailAndPassword(user.email, user.password) + .then((data) => { + return data.user.getIdToken(); }) - .then(function() { - 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 }); - }); - return; + .then((token) => { + return res.status(200).json({ token }); }) - .catch(function(err) { - if (!doc.exists) { - return res - .status(403) - .json({ general: "Invalid credentials. Please try again." }); + .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).send(err); + 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 }); - }); + .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 and all associated data +//Deletes user account exports.deleteUser = (req, res) => { - // Get the profile image filename - // `https://firebasestorage.googleapis.com/v0/b/${config.storageBucket}/o/${imageFileName}?alt=media` - let imageFileName; - req.userData.imageUrl - ? (imageFileName = req.userData.imageUrl.split("/o/")[1].split("?alt=")[0]) - : (imageFileName = "no-img.png"); - - const userId = req.userData.userId; - let errors = {}; - - function thenFunction(data) { - console.log(`${data} data for ${req.userData.handle} has been deleted.`); - } - - function catchFunction(data, err) { - console.error(err); - errors[data] = err; - } - - // Deletes user from authentication - let auth = admin.auth().deleteUser(userId); - - // Deletes database data - let data = db - .collection("users") - .doc(`${req.user.handle}`) - .delete(); - - // Deletes any custom profile image - let image; - if (imageFileName !== "no-img.png") { - image = admin - .storage() - .bucket() - .file(imageFileName) - .delete(); - } else { - image = Promise.resolve(); - } - - // Deletes all users posts - let posts = db - .collection("posts") - .where("userHandle", "==", req.user.handle) - .get() - .then(query => { - query.forEach(snap => { - snap.ref.delete(); - }); - return; - }); - - let promises = [ - auth.then(thenFunction("auth")).catch(err => catchFunction("auth", err)), - data.then(thenFunction("data")).catch(err => catchFunction("data", err)), - image.then(thenFunction("image")).catch(err => catchFunction("image", err)), - posts.then(thenFunction("posts")).catch(err => catchFunction("image", err)) - ]; - - // Wait for all promises to resolve - let waitPromise = Promise.all(promises); - - waitPromise - .then(() => { - if (Object.keys(errors) > 0) { - return res.status(500).json(errors); - } else { - return res.status(200).json({ - message: `All data for ${req.userData.handle} has been deleted.` + 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(); }); - } - }) - .catch(err => { - return res.status(500).json({ error: err }); - }); + 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 @@ -280,10 +237,10 @@ exports.getProfileInfo = (req, res) => { db.collection("users") .doc(req.user.handle) .get() - .then(data => { + .then((data) => { return res.status(200).json(data.data()); }) - .catch(err => { + .catch((err) => { console.error(err); return res.status(500).json(err); }); @@ -301,11 +258,13 @@ exports.updateProfileInfo = (req, res) => { .set(profileData, { merge: true }) .then(() => { console.log(`${req.user.handle}'s profile info has been updated.`); - return res.status(201).json({ - general: `${req.user.handle}'s profile info has been updated.` - }); + return res + .status(201) + .json({ + general: `${req.user.handle}'s profile info has been updated.` + }); }) - .catch(err => { + .catch((err) => { console.error(err); return res.status(500).json({ error: "Error updating profile data" @@ -317,15 +276,14 @@ exports.getUserDetails = (req, res) => { let userData = {}; db.doc(`/users/${req.body.handle}`) .get() - .then(doc => { + .then((doc) => { if (doc.exists) { userData = doc.data(); - return res.status(200).json({ userData }); - } else { - return res.status(400).json({ error: "User not found." }); - } - }) - .catch(err => { + return res.status(200).json({userData}); + } else { + return res.status(400).json({error: "User not found."}) + }}) + .catch((err) => { console.error(err); return res.status(500).json({ error: err.code }); }); @@ -335,159 +293,17 @@ exports.getAuthenticatedUser = (req, res) => { let credentials = {}; db.doc(`/users/${req.user.handle}`) .get() - .then(doc => { + .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 => { + 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 }); }); }; -// Verifies the user sent to the request -// Must be run by the Admin user -exports.verifyUser = (req, res) => { - if (req.userData.handle !== "Admin") { - return res.status(403).json({ error: "This must be done as Admin" }); - } - db.doc(`/users/${req.body.user}`) - .get() - .then(doc => { - if (doc.exists) { - let verifiedUser = doc.data(); - verifiedUser.verified = true; - return db - .doc(`/users/${req.body.user}`) - .set(verifiedUser, { merge: true }); - } else { - return res - .status(400) - .json({ error: `User ${req.body.user} was not found` }); - } - }) - .then(() => { - return res - .status(201) - .json({ message: `${req.body.user} is now verified` }); - }) - .catch(err => { - console.error(err); - return res.status(500).json({ error: err.code }); - }); -}; - -// Unverifies the user sent to the request -// Must be run by admin -exports.unverifyUser = (req, res) => { - if (req.userData.handle !== "Admin") { - return res.status(403).json({ error: "This must be done as Admin" }); - } - - db.doc(`/users/${req.body.user}`) - .get() - .then(doc => { - if (doc.exists) { - let unverifiedUser = doc.data(); - unverifiedUser.verified = false; - return db - .doc(`/users/${req.body.user}`) - .set(unverifiedUser, { merge: true }); - } else { - return res - .status(400) - .json({ error: `User ${req.body.user} was not found` }); - } - }) - .then(() => { - return res - .status(201) - .json({ message: `${req.body.user} is no longer verified` }); - }) - .catch(err => { - console.error(err); - return res.status(500).json({ error: err.code }); - }); -}; -exports.getUserHandles = (req, res) => { - admin - .firestore() - .collection("users") - .get() - .then(data => { - let users = []; - data.forEach(function(doc) { - users.push(doc.data().handle); - }); - return res.status(200).json(users); - }) - .catch(err => { - console.error(err); - return res.status(500).json({ error: "Failed to get all user handles." }); - }); -}; - -exports.addSubscription = (req, res) => { - let new_following = []; - let userRef = db.doc(`/users/${req.userData.handle}`); - userRef.get().then(doc => { - new_following = doc.data().following; - new_following.push(req.body.following); - - // add stuff - userRef - .set({ following: new_following }, { merge: true }) - .then(doc => { - return res - .status(201) - .json({ message: `Following ${req.body.following}` }); - }) - .catch(err => { - return res.status(500).json({ err }); - }); - }); -}; - -exports.getSubs = (req, res) => { - let data = []; - db.doc(`/users/${req.userData.handle}`) - .get() - .then(doc => { - data = doc.data().following; - return res.status(200).json({ data }); - }) - .catch(err => { - return res.status(500).json({ err }); - }); -}; - -exports.removeSub = (req, res) => { - let new_following = []; - let userRef = db.doc(`/users/${req.userData.handle}`); - userRef.get().then(doc => { - new_following = doc.data().following; - // remove username from array - new_following.forEach(function(follower, index) { - if (follower === `${req.body.unfollow}`) { - new_following.splice(index, 1); - } - }); - - // update database - userRef - .set({ following: new_following }, { merge: true }) - .then(doc => { - return res - .status(202) - .json({ message: `Successfully unfollow ${req.body.unfollow}` }); - }) - .catch(err => { - return res.status(500).json({ err }); - }); - }); -}; diff --git a/functions/index.js b/functions/index.js index 86231d0..12bb46d 100644 --- a/functions/index.js +++ b/functions/index.js @@ -16,13 +16,7 @@ const { login, signup, deleteUser, - updateProfileInfo, - verifyUser, - unverifyUser, - getUserHandles, - addSubscription, - getSubs, - removeSub + updateProfileInfo } = require("./handlers/users"); // Adds a user to the database and registers them in firebase with @@ -47,26 +41,6 @@ app.post("/updateProfileInfo", fbAuth, updateProfileInfo); app.get("/user", fbAuth, getAuthenticatedUser); -// Verifies the user sent to the request -// Must be run by the Admin user -app.post("/verifyUser", fbAuth, verifyUser); - -// Unverifies the user sent to the request -// Must be run by admin -app.post("/unverifyUser", fbAuth, unverifyUser); - -// get user handles with search phase -app.get("/getUserHandles", fbAuth, getUserHandles); - -// get user's subscription -app.get("/getSubs", fbAuth, getSubs); - -// add user to another user's "following" data field -app.post("/addSubscription", fbAuth, addSubscription); - -// remove one subscription -app.delete("/removeSub", fbAuth, removeSub); - /*------------------------------------------------------------------* * handlers/post.js * *------------------------------------------------------------------*/ @@ -82,7 +56,11 @@ app.post("/putPost", fbAuth, putPost); /*------------------------------------------------------------------* * handlers/topic.js * *------------------------------------------------------------------*/ -const { putTopic, getAllTopics, deleteTopic } = require("./handlers/topic"); +const { + putTopic, + getAllTopics, + deleteTopic +} = require("./handlers/topic"); // add topic to database app.post("/putTopic", fbAuth, putTopic); diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js index aeec8ee..d3a3163 100644 --- a/twistter-frontend/src/App.js +++ b/twistter-frontend/src/App.js @@ -10,11 +10,11 @@ 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 themeObject from "./util/theme"; -import { SET_AUTHENTICATED } from "./redux/types"; -import { logoutUser, getUserData } from "./redux/actions/userActions"; +import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider'; +import createMuiTheme from '@material-ui/core/styles/createMuiTheme'; +import themeObject from './util/theme'; +import { SET_AUTHENTICATED } from './redux/types'; +import { logoutUser, getUserData } from './redux/actions/userActions'; // Components import AuthRoute from "./util/AuthRoute"; @@ -22,22 +22,21 @@ import AuthRoute from "./util/AuthRoute"; // axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api'; // Pages -import home from "./pages/Home"; -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 editProfile from "./pages/editProfile"; -import userLine from "./Userline.js"; -import verify from "./pages/verify"; -import Search from "./pages/Search.js"; +import home from './pages/Home'; +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 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()) { @@ -45,7 +44,7 @@ if (token) { window.location.href = "/login"; } else { store.dispatch({ type: SET_AUTHENTICATED }); - axios.defaults.headers.common["Authorization"] = token; + axios.defaults.headers.common['Authorization'] = token; store.dispatch(getUserData()); } } catch (invalidTokenError) { @@ -54,19 +53,18 @@ if (token) { } } + class App extends Component { render() { return ( -
+
- - {/* AuthRoute checks if the user is logged in and if they are it redirects them to /home */} @@ -77,11 +75,6 @@ class App extends Component { - - - - -
diff --git a/twistter-frontend/src/Writing_Microblogs.js b/twistter-frontend/src/Writing_Microblogs.js index 9cac7b7..0734d1c 100644 --- a/twistter-frontend/src/Writing_Microblogs.js +++ b/twistter-frontend/src/Writing_Microblogs.js @@ -1,128 +1,107 @@ import React, { Component } from "react"; -import { BrowserRouter as Router } from "react-router-dom"; -import Route from "react-router-dom/Route"; -import axios from "axios"; +import { BrowserRouter as Router } from 'react-router-dom'; +import Route from 'react-router-dom/Route'; +import axios from 'axios'; + class Writing_Microblogs extends Component { - constructor(props) { - super(props); - this.state = { - value: "", - title: "", - topics: "", - characterCount: 250 - }; - this.handleChange = this.handleChange.bind(this); - this.handleSubmit = this.handleSubmit.bind(this); - this.handleChangeforPost = this.handleChangeforPost.bind(this); - this.handleChangeforTopics = this.handleChangeforTopics.bind(this); - } + constructor(props) { + super(props); + this.state = { + value: '', + title: '', + topics: '', + characterCount: 250 + + }; - handleChange(event) { - this.setState({ title: event.target.value }); - } + + this.handleChange = this.handleChange.bind(this); + this.handleSubmit = this.handleSubmit.bind(this); + this.handleChangeforPost = this.handleChangeforPost.bind(this); + this.handleChangeforTopics = this.handleChangeforTopics.bind(this); + + } - handleChangeforTopics(event) { - this.setState({ topics: event.target.value }); - } + handleChange(event) { + this.setState( {title: event.target.value }); + } - handleSubmit(event) { - // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value); - const postData = { - body: this.state.value, - userImage: "bing-url", - microBlogTitle: this.state.title, - microBlogTopics: this.state.topics.split(", ") - }; - const headers = { - headers: { "Content-Type": "application/json" } - }; + handleChangeforTopics(event) { + this.setState( {topics: event.target.value}); + } - axios - .post("/putPost", postData, headers) - .then(res => { - alert("Post was shared successfully!"); - console.log(res.data); - }) - .catch(err => { - alert("An error occured."); - console.error(err); - }); - event.preventDefault(); - this.setState({ value: "", title: "", characterCount: 250, topics: "" }); - } + handleSubmit(event) { - handleChangeforPost(event) { - this.setState({ value: event.target.value }); - } + const postData = { + body: this.state.value, + userImage: "bing-url", + microBlogTitle: this.state.title, + microBlogTopics: this.state.topics.split(', ') + } + const headers = { + headers: { 'Content-Type': 'application/json'} + } + + axios + .post("/putPost", postData, headers) + .then((res) =>{ + alert('Post was shared successfully!') + console.log(res.data); + }) + .catch((err) => { + alert('An error occured.'); + console.error(err); + }) + event.preventDefault(); + this.setState({value: '', title: '',characterCount: 250, topics: ''}) + } - handleChangeforCharacterCount(event) { - const charCount = event.target.value.length; - const charRemaining = 250 - charCount; - this.setState({ characterCount: charRemaining }); - } + handleChangeforPost(event) { + this.setState({value: event.target.value }) + } - render() { - return ( -
-
-
-