Merge pull request #30 from oslabs-beta/oauth

Manage project functionality fully implemented

Author: MatteoDiter

app/src/components/right/OpenProjects.tsx

@@ -36,6 +36,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
       (project: any) => project.name === value
     )[0];
     // dispatch({ type: 'OPEN PROJECT', payload: selectedProject });
+    console.log(selectedProject);
     dispatch(openProject(selectedProject))
     onClose();
   };

app/src/helperFunctions/projectGetSaveDel.ts

@@ -33,7 +33,7 @@ export const saveProject = (
 ): Promise<Object> => {
   const body = JSON.stringify({
     name,
-    project: workspace,
+    project: { ...workspace, name },
     userId: window.localStorage.getItem('ssid'),
     username: window.localStorage.getItem('username'),
     comments: []

app/src/redux/reducers/slice/appStateSlice.ts

@@ -774,10 +774,7 @@ const appStateSlice = createSlice({
     },
     updateProjectName: (state, action) => {
       const projectName = action.payload;
-      return {
-        ...state,
-        name: projectName
-      };
+      state.name = projectName;
     },
     deleteElement: (state, action) => {
       let name: string = '';
@@ -867,12 +864,14 @@ const appStateSlice = createSlice({
         componentId: 1,
         childId: null
       };
-      convertToJSX(action.payload.HTMLTypes);
+      // convertToJSX(action.payload.HTMLTypes);
       state.canvasFocus = canvasFocus;
     },
-    openProject: (state, action) => {
-      convertToJSX(action.payload.HTMLTypes);
-      state = action.payload;
+    openProject: ( state, action) => {
+      // convertToJSX(action.payload.HTMLTypes);
+      
+      return action.payload
+
     },
     addElement: (state, action) => {
       const HTMLTypes = [...state.HTMLTypes];

config.js

@@ -4,10 +4,10 @@ const config = {
   DEV_PORT: 5656,
   API_BASE_URL: isProduction
     ? 'http://reactypev15-env.eba-mbvivk7k.us-east-1.elasticbeanstalk.com'
-    : 'http://localhost:5656',
+    : 'http://localhost:8080',
   API_BASE_URL2: isProduction
     ? 'http://reactypev15-env.eba-mbvivk7k.us-east-1.elasticbeanstalk.com'
-    : 'http://localhost:8080'
+    : 'http://localhost:8080',
 };
 
 module.exports = config;

server/controllers/projectController.ts

@@ -14,7 +14,7 @@ const projectController: ProjectController = {
     // pull ssid from cookies for user id
     Projects.findOneAndUpdate(
       // looks in projects collection for project by user and name
-      { name, userId, username },
+      { name, userId, username},
       // update or insert the project
       { project, createdAt, comments },
       // Options:

server/controllers/sessionController.ts

@@ -6,32 +6,31 @@ import { SessionController, SessionCookie } from '../interfaces';
 dotenv.config();
 
 const sessionController: SessionController = {
-  // isLoggedIn finds the right session, if the session is invalid in the database, the app redirect user straight to the root endpoint witht he login page, if not, continue session
-  isLoggedIn: (req, res, next) => {
+  isLoggedIn: async (req, res, next) => {
+  try {
     let cookieId;
-    if (req.cookies.ssid) {
+    if (req.cookies) {
       cookieId = req.cookies.ssid;
     } else {
       cookieId = req.body.userId;
     }
 
     // find session from request session ID in mongodb
-    Sessions.findOne({ cookieId }, (err, session) => {
-      if (err) {
-        return next({
-          log: `Error in sessionController.isLoggedIn: ${err}`,
-          message: {
-            err: 'Error in sessionController.isLoggedIn, check server logs for details'
-          }
-        });
-      }
-      if (!session) {
-        return res.redirect('/');
+    const session = await Sessions.findOne({ cookieId });
+
+    if (!session) {
+      return res.redirect('/');
+    }
+    return next();
+  } catch (err) {
+    return next({
+      log: `Error in sessionController.isLoggedIn: ${err}`,
+      message: {
+        err: 'Error in sessionController.isLoggedIn, check server logs for details'
       }
-      return next();
     });
-  },
-
+  }
+},
   // startSession - create and save a new session into the database
   startSession: (req, res, next) => {
     // first check if user is logged in already