merged server integration

Author: andrewjcho84

README.md

@@ -29,7 +29,7 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo
 
 - **Linux users**: run the application as a super user in order to read and write files.
 
-![Gif of adding](https://i.imgur.com/hdVTFcP.gif)
+![Gif of adding](https://i.imgur.com/nOeuuU6.gif)
 
 ### How to use
 

__tests__/__snapshots__/enzyme.test.tsx.snap

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Enzyme testing suite renders snapshots, too 1`] = `
+<div>
+  <h1>
+    Hello, Enzyme!
+  </h1>
+</div>
+`;

__tests__/enzyme.test.tsx

@@ -0,0 +1,12 @@
+import { shallow } from 'enzyme';
+import React from 'react';
+
+describe('Enzyme testing suite', () => {
+
+  it('renders snapshots, too', () => {
+    const wrapper = shallow(<div>
+      <h1>Hello, Enzyme!</h1>
+    </div>)
+    expect(wrapper).toMatchSnapshot()
+  })
+})

app/electron/main.js

@@ -353,9 +353,12 @@ ipcMain.on('set_cookie', event => {
 ipcMain.on('delete_cookie', event => {
   session.defaultSession.cookies
     .remove(serverUrl, 'ssid')
+<<<<<<< HEAD
     // .then(removed => {
     //   console.log('Cookies deleted', removed);
     // })
+=======
+>>>>>>> serverreIntegration
     .catch(err => console.log('Error deleting cookie:', err));
 });
 

app/setupTests.ts

@@ -0,0 +1,6 @@
+import { configure } from 'enzyme'
+import Adapter from 'enzyme-adapter-react-16'
+
+configure({
+  adapter: new Adapter(),
+})

app/src/setupTests.ts

@@ -27,7 +27,7 @@
   "scripts": {
     "postinstall": "ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps",
     "dev-server": "cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js",
-    "dev": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=development electron .\" -k",
+    "dev": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=development electron .\" \"npm run server\" -k",
     "prod-build": "cross-env NODE_ENV=production npx webpack --mode=production --config ./webpack.production.js",
     "prod": "npm run prod-build && electron .",
     "pack": "electron-builder --dir",
@@ -36,7 +36,8 @@
     "dist-linux": "npm run prod-build && electron-builder --linux",
     "dist-windows": "npm run prod-build && electron-builder --windows",
     "dist-all": "npm run prod-build && electron-builder --mac --linux --windows",
-    "test": "cross-env NODE_ENV=test jest --verbose"
+    "test": "cross-env NODE_ENV=test jest --verbose",
+    "server": "nodemon server/server.js"
   },
   "repository": {
     "type": "git",
@@ -72,7 +73,12 @@
         "diagnostics": false
       }
     },
-    "testTimeout": 50000
+    "setupFilesAfterEnv": [
+      "<rootDir>/app/setupTests.ts"
+    ],
+    "snapshotSerializers": [
+      "enzyme-to-json/serializer"
+    ]
   },
   "bugs": {
     "url": "https://github.com/open-source-labs/ReacType/issues"
@@ -84,8 +90,6 @@
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.0.1",
     "@material-ui/styles": "^4.9.6",
-    "@types/enzyme": "^3.10.5",
-    "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/js-cookie": "^2.2.6",
     "@types/node": "^14.0.20",
     "@types/prettier": "^1.19.0",
@@ -97,8 +101,11 @@
     "app-root-path": "^3.0.0",
     "autoprefixer": "^9.0.1",
     "babel-polyfill": "^6.26.0",
+    "bcryptjs": "^2.4.3",
     "concurrently": "^5.1.0",
     "connected-react-router": "^6.8.0",
+    "cookie-parser": "^1.4.5",
+    "cors": "^2.8.5",
     "electron-debug": "^3.1.0",
     "electron-devtools-installer": "^2.2.4",
     "electron-splashscreen": "^1.0.0",
@@ -107,6 +114,8 @@
     "immutable": "^4.0.0-rc.12",
     "js-cookie": "^2.2.1",
     "localforage": "^1.7.2",
+    "passport": "^0.4.1",
+    "passport-github2": "^0.1.12",
     "prettier": "^1.19.1",
     "prop-types": "^15.6.2",
     "react": "^16.13.0",
@@ -125,6 +134,8 @@
     "@babel/preset-react": "^7.10.4",
     "@babel/preset-typescript": "^7.10.4",
     "@types/chai": "^4.2.11",
+    "@types/enzyme": "^3.10.5",
+    "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/jest": "^25.1.5",
     "babel-eslint": "^8.2.6",
     "babel-jest": "^25.2.4",
@@ -137,6 +148,7 @@
     "dotenv": "^8.2.0",
     "electron": "^9.1.0",
     "electron-builder": "^22.7.0",
+    "enzyme-to-json": "^3.5.0",
     "eslint": "^4.19.1",
     "eslint-config-airbnb-base": "^13.0.0",
     "eslint-plugin-babel": "^5.3.1",
@@ -146,7 +158,7 @@
     "eslint-plugin-react": "^7.20.3",
     "html-loader": "^1.1.0",
     "html-webpack-plugin": "^3.1.0",
-    "jest": "^25.2.6",
+    "jest": "^25.5.4",
     "mini-css-extract-plugin": "^0.9.0",
     "mongodb": "^3.5.9",
     "mongoose": "^5.9.22",
@@ -156,6 +168,7 @@
     "sass-loader": "^7.0.3",
     "spectron": "^11.1.0",
     "style-loader": "^0.20.3",
+    "supertest": "^4.0.2",
     "ts-jest": "^25.3.0",
     "ts-node": "^8.10.2",
     "typescript": "^3.9.6",

package.json

@@ -0,0 +1 @@
+web: npm run start

server/Procfile

@@ -0,0 +1,10 @@
+<p align="center">
+  <img width="300" src="reactypeserverlogo.png">
+  <h1 align="center">ReacType Server</h1>
+</p>
+
+**ReacType Server** is the backend complement to the visual React prototyping tool **ReacType**. It is built in **Node.js** with the **Express** framework linked to **MongoDB** to handle user authentication (personal accounts on our own database as well as through Github Oauth), sessions, and user project management. The server itself is officially deployed through Heroku, but you can host your own local environment to communicate with the database with this repo.
+
+If `npm` is your package manager, you just need to run the script `npm run dev` and it will start the server on `http://localhost:5000` for your development environment.
+
+Endpoint testing is currently integrated with Jest and Supertest as well and can be run by `npm run test` or `npm run test:watch` for watch mode.

server/README.md

@@ -0,0 +1,80 @@
+const request = require('supertest');
+let server = 'https://reactype.herokuapp.com';
+const isDev = process.env.NODE_ENV === 'development';
+if (isDev) {
+  server = 'http://localhost:5000';
+}
+
+// save and get projects endpoint testing
+describe('Project endpoints tests', () => {
+  // initializes the project to be sent to server/DB
+  const state = {
+    name: 'test',
+    isLoggedIn: false,
+    components: [
+      {
+        id: 1,
+        name: 'index',
+        style: {},
+        code: '<div>Drag in a component or HTML element into the canvas!</div>',
+        children: [],
+      },
+    ],
+    projectType: 'Next.js',
+    rootComponents: [1],
+    canvasFocus: { componentId: 1, childId: null },
+    nextComponentId: 2,
+    nextChildId: 1,
+  };
+  const projectToSave = {
+    name: 'test',
+    project: state,
+    userId: '5f0df0636678ba002ba43b88',
+  };
+
+  // test saveProject endpoint
+  describe('/saveProject', () => {
+    describe('/POST', () => {
+      it('responds with a status of 200 and json object equal to project sent', () => {
+        return request(server)
+          .post('/saveProject')
+          .send(projectToSave)
+          .expect('Content-Type', /json/)
+          .expect(200)
+          .then((res) => expect(res.body.project.name).toBe('test'));
+      });
+    });
+  });
+
+  // test getProjects endpoint
+  describe('/getProjects', () => {
+    describe('POST', () => {
+      it('responds with status of 200 and json object equal to an array of user projects', () => {
+        return request(server)
+          .post('/getProjects')
+          .send({ userId: projectToSave.userId })
+          .expect(200)
+          .expect('Content-Type', /json/)
+          .then((res) => {
+            expect(Array.isArray(res.body)).toBeTruthy;
+            expect(res.body[0].name).toBe('test');
+          });
+      });
+    });
+  });
+
+  // test deleteProject endpoint
+  describe('/deleteProject', () => {
+    describe('DELETE', () => {
+      const { name, userId } = projectToSave;
+      it('responds with status of 200 and json object equal to deleted project', () => {
+        return request(server)
+          .delete('/deleteProject')
+          .send({ name, userId })
+          .expect(200)
+          .expect('Content-Type', /json/)
+          .then((res) => expect(res.body.name).toBe('test'));
+      });
+    });
+  });
+});

server/__tests__/projects.test.js

@@ -0,0 +1,64 @@
+const request = require('supertest');
+let server = 'https://reactype.herokuapp.com';
+const isDev = process.env.NODE_ENV === 'development';
+if (isDev) {
+  server = 'http://localhost:5000';
+}
+
+// tests user signup and login routes
+describe('User authentication tests', () => {
+  let num = Math.floor(Math.random() * 1000);
+
+  describe('/signup', () => {
+    describe('POST', () => {
+      it('responds with status 200 and json object on valid new user signup', () => {
+        return request(server)
+          .post('/signup')
+          .send({
+            username: `supertest${num}`,
+            email: `test${num}@test.com`,
+            password: `${num}`,
+          })
+          .expect('Content-Type', /json/)
+          .expect(200)
+          .then((res) => expect(typeof res.body).toBe('object'));
+      });
+      it('responds with status 400 and json string on invalid new user signup', () => {
+        return request(server)
+          .post('/signup')
+          .send({
+            username: 'reactyp3test',
+            email: '[email protected]',
+            password: 'password',
+          })
+          .expect('Content-Type', /json/)
+          .expect(400)
+          .then((res) => expect(typeof res.body).toBe('string'));
+      });
+    });
+  });
+  describe('/login', () => {
+    describe('POST', () => {
+      it('responds with status 200 and json object on verified user login', () => {
+        return request(server)
+          .post('/login')
+          .send({ username: 'reactyp3test', password: 'codesmith1!' })
+          .expect(200)
+          .expect('Content-Type', /json/)
+          .then((res) =>
+            expect(res.body.sessionId).toEqual('5f0df0636678ba002ba43b88')
+          );
+      });
+      it('responds with status 400 and json string on invalid user login', () => {
+        return request(server)
+          .post('/login')
+          .send({ username: 'wrongusername', password: 'wrongpassword' })
+          .expect(400)
+          .expect('Content-Type', /json/)
+          .then((res) => expect(typeof res.body).toBe('string'));
+      });
+    });
+  });
+});
+
+describe('User Login Tests', () => {});

server/__tests__/users.test.js

@@ -0,0 +1,10 @@
+const cookieController = {};
+
+// setSSIDCookie - store the user id from database in cookie
+cookieController.setSSIDCookie = (req, res, next) => {
+  // set cookie with key 'ssid' and value to user's id
+  res.cookie('ssid', res.locals.id);
+  return next();
+};
+
+module.exports = cookieController;