Skip to content

Commit 9bcea53

Browse files
authored
Merge pull request #70 from andrewjcho84/projectManagement
Readme update, cookie security
2 parents ee6f738 + d5b07cb commit 9bcea53

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo
4848

4949
#### Contributors
5050

51-
[Aaron Bumanglang](https://www.linkedin.com/in/akbuma) [@akbuma](https://github.com/akbuma)
51+
[Aaron Bumanglag](https://www.linkedin.com/in/akbuma) [@akbuma](https://github.com/akbuma)
5252

5353
[Adam Singer](https://linkedin.com/in/adsing) [@spincycle01](https://github.com/spincycle01)
5454

app/electron/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ async function createWindow() {
6464
webPreferences: {
6565
zoomFactor: 0.7,
6666
// enable devtools when in development mode
67-
devTools: true,
67+
devTools: isDev,
6868
// crucial security feature - blocks rendering process from having access to node moduels
6969
nodeIntegration: false,
7070
// web workers will not have access to node

server/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@
55

66
**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.
77

8+
**For future development teams**: If you wish to update the server and re-deploy through heroku, you will need to get the credentials from one of the last team members:
9+
10+
- [Tyler Sullberg](https://www.linkedin.com/in/tyler-sullberg) [@tsully](https://github.com/tsully)
11+
- [Andrew Cho](https://www.linkedin.com/in/andrewjcho84/) [@andrewjcho84](https://github.com/andrewjcho84)
12+
- [Aaron Bumanglag](https://www.linkedin.com/in/akbuma) [@akbuma](https://github.com/akbuma)
13+
- [Fredo Chen](https://www.linkedin.com/in/fredochen/) [@fredosauce](https://github.com/fredosauce)
14+
15+
Redeployment should also be done with only the server subtree and not the entire repo. See this <a href="https://medium.com/@shalandy/deploy-git-subdirectory-to-heroku-ea05e95fce1f">article</a> about deploying just a subdirectory.
16+
817
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.
918

1019
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/controllers/cookieController.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ const cookieController = {};
33
// setSSIDCookie - store the user id from database in cookie
44
cookieController.setSSIDCookie = (req, res, next) => {
55
// set cookie with key 'ssid' and value to user's id
6-
res.cookie('ssid', res.locals.id);
6+
res.cookie('ssid', res.locals.id, {
7+
httpOnly: true,
8+
sameSite: 'None',
9+
secure: true
10+
});
711
return next();
812
};
913

0 commit comments

Comments
 (0)