commit before new branch

Author: andrewjcho84

server/controllers/projectController.js

@@ -0,0 +1,56 @@
+const { Projects } = require('../models/reactypeModels');
+const projectController = {};
+
+// saveProject saves current workspace to database
+
+projectController.saveProject = (req, res, next) => {
+  console.log('Inside projectController.saveProject...');
+  // pull project name and project itself from body
+  const { name, project } = req.body;
+  // pull ssid from cookies for user id
+  const userId = req.cookies.ssid;
+  Projects.findOneAndUpdate(
+    { name, userId },
+    // pushes the saved project into projects array of project
+    { project },
+    // this options returns as result the new project that was saved, otherwise result would be the projects array before it was updated
+    { upsert: true, new: true },
+    (err, result) => {
+      if (err) {
+        return next({
+          log: `Error in projectController.saveProject: ${err}`,
+          message: {
+            err: `Error in projectController.saveProject, check server logs for details`
+          }
+        });
+      } else {
+        res.locals.savedProject = result;
+        console.log('Successful saveProject');
+        return next();
+      }
+    }
+  );
+};
+
+// gets all of current project's projects
+
+projectController.getProjects = (req, res, next) => {
+  console.log('Inside projectController.getProjects...');
+  const userId = req.cookies.ssid;
+  Projects.find({ userId }, (err, projects) => {
+    if (err) {
+      return next({
+        log: `Error in projectController.getProjects: ${err}`,
+        message: {
+          err: `Error in projectController.getProjects, check server logs for details`
+        }
+      });
+    } else {
+      console.log('Successful getProjects');
+      res.locals.projects = projects;
+      return next();
+    }
+  });
+};
+
+module.exports = projectController;

server/controllers/sessionController.js

@@ -3,6 +3,8 @@ const sessionController = {};
 
 // isLoggedIn finds appropriate session for this request in database, then verifies whether or not the session is still valid
 sessionController.isLoggedIn = (req, res, next) => {
+  console.log('Inside isLoggedIn');
+  console.log('req.cookies is', req.cookies);
   // find session from request session ID in mongodb
   Sessions.findOne({ cookieId: req.cookies.ssid }, (err, session) => {
     if (err) {
@@ -14,9 +16,11 @@ sessionController.isLoggedIn = (req, res, next) => {
       });
       // no session found, redirect to signup page
     } else if (!session) {
+      console.log('No session found, redirecting to signup page');
       return res.redirect('/signup');
     } else {
       // session found, move onto next middleware
+      console.log('Session found, moving onto next middleware');
       return next();
     }
   });

server/controllers/userController.js

@@ -9,6 +9,7 @@ userController.createUser = (req, res, next) => {
   console.log('Creating user...');
   const { email, username, password } = req.body;
   // error handling if username or password is missing
+  // TODO make this more vague for security purposes
   if (!username) {
     return res.status(400).json('No username input');
   }
@@ -20,7 +21,7 @@ userController.createUser = (req, res, next) => {
   }
 
   // create user using username and password
-  Users.create({ email, username, password, projects: [] }, (err, newUser) => {
+  Users.create({ username, password, email }, (err, newUser) => {
     if (err) {
       return next({
         log: `Error in userController.createUser: ${err}`,
@@ -76,55 +77,4 @@ userController.verifyUser = (req, res, next) => {
   });
 };
 
-// saveProject saves current workspace to database
-
-userController.saveProject = (req, res, next) => {
-  console.log('Inside userController.saveProject...');
-  const project = req.body;
-  // pull user id from cookie to find current user in db
-  const _id = req.cookies.ssid;
-  Users.findByIdAndUpdate(
-    { _id },
-    // pushes the saved project into projects array of user
-    { $push: { projects: project } },
-    // this options returns as result the new project that was saved, otherwise result would be the projects array before it was updated
-    { new: true },
-    (err, result) => {
-      if (err) {
-        return next({
-          log: `Error in userController.saveProject: ${err}`,
-          message: {
-            err: `Error in userController.saveProject, check server logs for details`
-          }
-        });
-      } else {
-        res.locals.savedProject = result.projects[result.projects.length - 1];
-        console.log('Successful saveProject');
-        return next();
-      }
-    }
-  );
-};
-
-// gets all of current user's projects
-
-userController.getProjects = (req, res, next) => {
-  console.log('Inside userController.getProjects...');
-  const _id = req.cookies.ssid;
-  Users.findOne({ _id }, (err, user) => {
-    if (err) {
-      return next({
-        log: `Error in userController.getProjects: ${err}`,
-        message: {
-          err: `Error in userController.getProjects, check server logs for details`
-        }
-      });
-    } else {
-      console.log('Successful getProjects');
-      res.locals.projects = user.projects;
-      return next();
-    }
-  });
-};
-
 module.exports = userController;

server/models/reactypeModels.js

@@ -21,13 +21,7 @@ const Schema = mongoose.Schema;
 const userSchema = new Schema({
   username: { type: String, required: true, unique: true },
   email: { type: String, required: false, unique: true },
-  password: { type: String, required: true },
-  projects: [
-    {
-      name: String,
-      project: { type: Object }
-    }
-  ]
+  password: { type: String, required: true }
 });
 
 // salt will go through 10 rounds of hashing
@@ -57,7 +51,18 @@ const sessionSchema = new Schema({
   createdAt: { type: Date, expires: 3600, default: Date.now }
 });
 
+const projectSchema = new Schema({
+  name: { type: String, required: true, unique: true },
+  project: Object,
+  userId: {
+    type: Schema.Types.ObjectId,
+    ref: 'Users'
+  },
+  createdAt: { type: Date, default: Date.now }
+});
+
 const Users = mongoose.model('Users', userSchema);
 const Sessions = mongoose.model('Sessions', sessionSchema);
+const Projects = mongoose.model('Projects', projectSchema);
 
-module.exports = { Users, Sessions };
+module.exports = { Users, Sessions, Projects };

server/server.js

@@ -8,6 +8,7 @@ const cookieParser = require('cookie-parser');
 const userController = require('./controllers/userController');
 const cookieController = require('./controllers/cookieController');
 const sessionController = require('./controllers/sessionController');
+const projectController = require('./controllers/projectController');
 const app = express();
 
 const PORT = 8080;
@@ -69,7 +70,7 @@ app.post(
 app.post(
   '/saveProject',
   sessionController.isLoggedIn,
-  userController.saveProject,
+  projectController.saveProject,
   (req, res) => {
     return res.status(200).json(res.locals.savedProject);
   }
@@ -78,7 +79,7 @@ app.post(
 app.get(
   '/getProjects',
   sessionController.isLoggedIn,
-  userController.getProjects,
+  projectController.getProjects,
   (req, res) => {
     return res.status(200).json(res.locals.projects);
   }
@@ -105,8 +106,8 @@ app.use((err, req, res, next) => {
 
 //starts server on PORT
 // app.listen(PORT, () => {
-//   console.log(`Server listening on port: ${PORT}`)
-// })
+//   console.log(`Server listening on port: ${PORT}`);
+// });
 
 // For security, if serving app from a server, it should be https
 // https working now, but still needs nodeIntegration on to work <- Electron throws security issue warning because of this

src/components/login/SignIn.tsx

@@ -8,7 +8,7 @@ import {
   useHistory,
   RouteComponentProps
 } from 'react-router-dom';
-import { sessionIsCreated, githubOauth } from '../../helperFunctions/auth';
+import { sessionIsCreated } from '../../helperFunctions/auth';
 
 import Avatar from '@material-ui/core/Avatar';
 import Button from '@material-ui/core/Button';
@@ -144,7 +144,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
           Sign In
         </Button>
 
-        <a href="https://localhost:8080/github">
+        <a href="/github">
           <img src="/images/githublogin.png" />
         </a>
         <br></br>

src/components/login/SignUp.tsx

@@ -83,7 +83,7 @@ const SignUp: React.FC<LoginInt & RouteComponentProps> = props => {
 
   const handleSignUp = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     e.preventDefault();
-    console.log('click fired on handleLogin');
+    console.log('click fired on handleSignup');
     newUserIsCreated(username, email, password).then(userCreated => {
       if (userCreated) {
         console.log('user created');

src/containers/RightContainer.tsx

@@ -1,4 +1,4 @@
-import React, { Component, useState } from 'react';
+import React, { Component, useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { withStyles, Theme } from '@material-ui/core/styles';
 import HtmlAttr from '../components/bottom/HtmlAttr';
@@ -37,7 +37,7 @@ function saveProject(project: ApplicationStateInt, name: String) {
   console.log('Saving project to DB...');
   const body = JSON.stringify({ name, project });
   console.log('Project name is', name);
-  fetch('https://localhost:8080/saveProject', {
+  fetch('/saveProject', {
     method: 'POST',
     headers: {
       'content-type': 'application/json'
@@ -52,14 +52,22 @@ function saveProject(project: ApplicationStateInt, name: String) {
 
 function getProjects() {
   console.log("Loading user's projects...");
-  fetch('https://localhost:8080/getProjects', {
+  fetch('/getProjects', {
     credentials: 'include'
   })
     .then(res => res.json())
-    .then(data => console.log("User's projects are", data))
+    .then(data => {
+      console.log("User's projects are", data);
+      window.localStorage.setItem('Projects', data);
+    })
     .catch(err => console.log(err));
 }
+
 const RightContainer = (props: BottomTabsPropsInt) => {
+  // useEffect(() => {
+  //   getProjects();
+  // });
+
   const { classes, components, focusComponent, focusChild } = props;
   // looks through the children of currently focused component (based on left bar) and finds the number of child html elements it has
   const htmlAttribCount = focusComponent.childrenArray.filter(

src/helperFunctions/auth.ts

@@ -6,7 +6,7 @@ export const sessionIsCreated = (
     username,
     password
   });
-  const result = fetch('https://localhost:8080/login', {
+  const result = fetch('/login', {
     method: 'POST',
     credentials: 'include',
     headers: {
@@ -42,7 +42,7 @@ export const newUserIsCreated = (
     email,
     password
   });
-  const result = fetch('https://localhost:8080/signup', {
+  const result = fetch('/signup', {
     method: 'POST',
     credentials: 'include',
     headers: {
@@ -67,23 +67,3 @@ export const newUserIsCreated = (
     });
   return result;
 };
-
-export const githubOauth = (): Promise<boolean> => {
-  const result = fetch('https://github.com/login/oauth/authorize', {
-    method: 'GET',
-    mode: 'no-cors',
-    params: {
-      client_id: process.env.GITHUB_ID
-    }
-  })
-    .then(res => res.json())
-    .then(data => {
-      console.log('Data from github oauth', data);
-      return true;
-    })
-    .catch(err => {
-      console.log('Error from github oauth', err);
-      return false;
-    });
-  return result;
-};