serve app from server(unsecure) and pull session id from mongo

Author: andrewjcho84

main.js

@@ -119,7 +119,8 @@ const createWindow = () => {
   });
 
   // and load the index.html of the app.
-  mainWindow.loadURL(`file://${__dirname}/build/index.html`);
+  // now loading what the server serves, this url will need to change when/if we decide to put reactype on the web
+  mainWindow.loadURL(`http://localhost:8080`);
   // load page once window is loaded
   mainWindow.once('ready-to-show', () => {
     mainWindow.show();

server/controllers/sessionController.js

@@ -3,7 +3,7 @@ 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) => {
-  // find cookie with current user's ssid value
+  // find session from request session ID in mongodb
   Session.findOne({ cookieId: req.cookies.ssid }, (err, session) => {
     if (err) {
       return next({
@@ -37,21 +37,24 @@ sessionController.startSession = (req, res, next) => {
       // if session doesn't exist, create a session
       // if valid user logged in/signed up, res.locals.id should be user's id generated from mongodb, which we will set as this session's cookieId
     } else if (!session) {
-      Session.create({ cookieId: res.locals.id }, err => {
+      Session.create({ cookieId: res.locals.id }, (err, session) => {
         if (err) {
           return next({
             log: `Error in sessionController.startSession create session: ${err}`,
             message: {
               err: `Error in sessionController.startSession create session, check server logs for details`
             }
           });
+        } else {
+          console.log('Successful startSession');
+          res.locals.ssid = session.id;
+          return next();
         }
-        console.log('Successful startSession');
-        return next();
       });
       // if session exists, move onto next middleware
     } else {
       console.log('Session exists, moving on');
+      res.locals.ssid = session.id;
       return next();
     }
   });

server/server.js

@@ -1,4 +1,6 @@
 const express = require('express');
+const https = require('https');
+const fs = require('fs');
 const mongoose = require('mongoose');
 const path = require('path');
 const cookieParser = require('cookie-parser');
@@ -27,10 +29,10 @@ app.use(express.json());
 app.use(cookieParser());
 
 // statically serve everything in build folder
-app.use('/build', express.static(path.resolve(__dirname, '../build')));
+app.use('/', express.static(path.resolve(__dirname, '../build')));
 
 app.get('/', (req, res) => {
-  res.status(200).sendFile(path.resolve(__dirname, '../src/public/index.html'));
+  res.status(200).sendFile(path.resolve(__dirname, '../build/index.html'));
 });
 
 app.post(
@@ -39,7 +41,7 @@ app.post(
   cookieController.setSSIDCookie,
   sessionController.startSession,
   (req, res) => {
-    return res.status(200).json({ userId: res.locals.id });
+    return res.status(200).json({ sessionId: res.locals.ssid });
   }
 );
 
@@ -49,7 +51,7 @@ app.post(
   cookieController.setSSIDCookie,
   sessionController.startSession,
   (req, res) => {
-    return res.status(200).json({ userId: res.locals.id });
+    return res.status(200).json({ sessionId: res.locals.ssid });
   }
 );
 
@@ -72,7 +74,21 @@ app.use((err, req, res, next) => {
   return res.status(errorObj.status).json(errorObj.message);
 });
 
-// starts server on PORT
+//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, but we haven't got it working yet
+
+// https
+//   .createServer(
+//     {
+//       key: fs.readFileSync(path.resolve(__dirname, 'server.key')),
+//       cert: fs.readFileSync(path.resolve(__dirname, 'server.cert'))
+//     },
+//     app
+//   )
+//   .listen(PORT, () => {
+//     console.log(`Server listening on port: ${PORT}`);
+//   });

src/components/login/SignIn.tsx

@@ -115,7 +115,7 @@ const SignIn: React.FC<LoginProps> = props => {
         } else {
           props.history.push('/app');
           alert('Login successful!');
-          console.log('Data is', data);
+          //console.log('Data is', data);
         }
       })
       .catch(err => console.log(err));

src/containers/RightContainer.tsx

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { compose } from 'redux';
 import { withStyles, Theme } from '@material-ui/core/styles';
 import HtmlAttr from '../components/bottom/HtmlAttr';
 import { PropsInt, ApplicationStateInt } from '../interfaces/Interfaces';
@@ -54,7 +53,7 @@ class RightContainer extends Component<BottomTabsPropsInt> {
           textAlign: 'center'
         }}
       >
-        <h3>This is the right column everyone!</h3>
+        {/* <h3>This is the right column everyone!</h3> */}
         <RouteLink to={`/`} style={{ textDecoration: 'none' }}>
           <Button variant="contained" color="secondary">
             Sign Out

src/public/index.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge" />
     <!-- Original meta tag with content security policy -->
-    <!-- <meta
+    <meta
       http-equiv="Content-Security-Policy"
       content="default-src 'self' https: filesystem: data: ws: 'unsafe-eval' 'unsafe-inline'"
-    /> -->
+    />
     <title>ReacType</title>
     <link
       rel="stylesheet"