From 165d3762948f19ead561db23443b5fb0d5212f02 Mon Sep 17 00:00:00 2001 From: ruihildt Date: Thu, 1 Aug 2019 17:42:18 +0200 Subject: [PATCH] Update seed and authentication with salt --- README.md | 24 ++++++++++++------------ data/seeds/01-addUsers.js | 22 ++++++++++++++++++++++ data/seeds/01-addUsers.js.bak | 19 ------------------- data/sleep-tracker.db3 | Bin 36864 -> 36864 bytes services/auth/authRouter.js | 3 ++- 5 files changed, 36 insertions(+), 32 deletions(-) create mode 100644 data/seeds/01-addUsers.js delete mode 100644 data/seeds/01-addUsers.js.bak diff --git a/README.md b/README.md index 3f57f01..578dfe1 100644 --- a/README.md +++ b/README.md @@ -41,23 +41,23 @@ Sleep Tracker is intended for anyone interested in improving their sleep and hea | field | data type | metadata | | :------------- | :--------------- | :-------------------------------------------------- | | id | unsigned integer | primary key, auto-increments, generated by database | -| session_user | unsigned integer | foreign key referencing `sessions.user_id` | -| session_date | unsigned integer | foreign key referencing `sessions.wake_time` | +| session_id | unsigned integer | foreign key referencing `sessions.id` | +| user_id | unsigned integer | foreign key referencing `users.id` | | sleep_duration | unsigned integer | | | average_mood | float | | ## API Endpoints -- [x] `POST /api/auth/register` - add a new user -- [x] `POST /api/auth/login` - login with user/password +- `POST /api/auth/register` - add a new user +- `POST /api/auth/login` - login with user/password -- [x] `GET /api/users/:id` - fetch a user -- [x] `PUT /api/users/:id` - update a user -- [x] `DELETE /api/users/:id` - delete a user +- `GET /api/users/:id` - fetch a user +- `PUT /api/users/:id` - update a user +- `DELETE /api/users/:id` - delete a user -- [x] `GET /api/users/:id/sessions` - fetch list of all sessions by user id -- [x] `POST /api/users/sessions` - add a session -- [x] `PUT /api/users/sessions/:id` - update a session by id -- [x] `DELETE /api/users/sessions/:id` - delete a session by id +- `GET /api/users/:id/sessions` - fetch list of all sessions by user id +- `POST /api/users/sessions` - add a session +- `PUT /api/users/sessions/:id` - update a session by id +- `DELETE /api/users/sessions/:id` - delete a session by id -- [ ] `GET /api/dailyaverages/:id` - fetch a list of last 30 daily averages by user id \ No newline at end of file +- `GET /api/users/:id/dailyaverages` - fetch a list of last 30 daily averages by user id \ No newline at end of file diff --git a/data/seeds/01-addUsers.js b/data/seeds/01-addUsers.js new file mode 100644 index 0000000..45e8ffa --- /dev/null +++ b/data/seeds/01-addUsers.js @@ -0,0 +1,22 @@ +require("dotenv").config(); +const bcrypt = require('bcryptjs'); + +exports.seed = function(knex) { + return knex('users').truncate() + .then(function () { + return knex('users').insert([ + { + id: 1, + email: 'gabe@ls.com', + username: 'gabe', + password: bcrypt.hashSync('1234', process.env.SECRET, 10) + }, + { + id: 2, + email: 'gabe2@ls.com', + username: 'gabe2', + password: bcrypt.hashSync('1234', process.env.SECRET, 10) + } + ]); + }); +}; diff --git a/data/seeds/01-addUsers.js.bak b/data/seeds/01-addUsers.js.bak deleted file mode 100644 index 96ad24f..0000000 --- a/data/seeds/01-addUsers.js.bak +++ /dev/null @@ -1,19 +0,0 @@ -exports.seed = function(knex) { - return knex('users').truncate() - .then(function () { - return knex('users').insert([ - // { - // id: 1, - // email: 'gabe@ls.com', - // username: 'gabe', - // password: '1234' - // }, - // { - // id: 2, - // email: 'gabe2@ls.com', - // username: 'gabe2', - // password: '1234' - // } - ]); - }); -}; diff --git a/data/sleep-tracker.db3 b/data/sleep-tracker.db3 index f9333f4836eb52ef982014c69346d19d5ce122fa..a4e04cf8b806d5763b0696eab9017fd44278ac52 100644 GIT binary patch delta 314 zcmZozz|^pSX@WE(+e8^>Mz)O!bLEB49`)m8U|?Y3-^IZHoc}Wa3I1K11r@gQ^DuET zGmA5p7N-^!Gi|=CZz#aQ#2>-Hzm`8@v!H+ve`qih8-uENBWrqMQmTWEkXb?2_mmQfgT0>X&cn8Wri~ zOyhKgJ6KJ@Jl#{|Em& ppqfYga-2Xfg4HmwGmCP9SfIdQ;(x}#|C#?8P|Yp=&Clwk1OSKGU3vfj delta 223 zcmZozz|^pSX@WE(|3n#QM*fWnbLEBe_j2(vFfg$2?`GhC&VQNzB>(QsfgC-2hd ze-h5f#P=Jk*e=P(5TA+f({FB%E%h{XdI~y74JDFOVdlY4vNBWrR ziC5M%A0qtYt|H#1qakHSobN diff --git a/services/auth/authRouter.js b/services/auth/authRouter.js index 56ce819..971eb81 100644 --- a/services/auth/authRouter.js +++ b/services/auth/authRouter.js @@ -1,3 +1,4 @@ +require("dotenv").config(); const router = require('express').Router(); const bcrypt = require('bcryptjs'); @@ -6,7 +7,7 @@ const Users = require('../users/usersModel'); router.post('/register', (req, res) => { let user = req.body; - const hash = bcrypt.hashSync(user.password, 10); + const hash = bcrypt.hashSync(user.password, process.env.SECRET, 10); user.password = hash; Users.addUser(user)