From 1ae84b5eb0fdbf7ed4deb27d461e6df22fe718be Mon Sep 17 00:00:00 2001 From: gautam-bhagat Date: Sat, 14 Oct 2023 12:56:33 +0530 Subject: [PATCH 1/2] database connection, router page& proper structure --- backend/controllers/auth.js | 17 ++++++++++++++ backend/controllers/example.js | 2 ++ backend/db/db.js | 6 +++++ backend/db/knexfile.js | 21 +++++++++++++++++ .../migrations/20231014071544_create_user.js | 14 +++++++++++ backend/middleware/bypass.js | 7 ++++++ backend/package-lock.json | 16 +++++++++++-- backend/package.json | 1 + backend/server.js | 23 +++++++++++-------- 9 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 backend/controllers/auth.js create mode 100644 backend/db/db.js create mode 100644 backend/db/knexfile.js create mode 100644 backend/db/migrations/20231014071544_create_user.js create mode 100644 backend/middleware/bypass.js diff --git a/backend/controllers/auth.js b/backend/controllers/auth.js new file mode 100644 index 0000000..fd12b49 --- /dev/null +++ b/backend/controllers/auth.js @@ -0,0 +1,17 @@ +const express = require('express'); +const router = express.Router(); + +const bypass = require('../middleware/bypass'); +const knex = require('knex') + +router.get('/',bypass,(req,res )=> { + res.send("Working User API") +}); + + +router.get('/get',bypass, async (req,res)=>{ + const ans = await knex.select().table(user); + res.json({ans}) +}); + +module.exports = router \ No newline at end of file diff --git a/backend/controllers/example.js b/backend/controllers/example.js index 162d307..5ca38c3 100644 --- a/backend/controllers/example.js +++ b/backend/controllers/example.js @@ -6,6 +6,8 @@ const post = (req,res) => { res.status(200).json(`Recieved via test/post:${req.body}`) } + + module.exports = { get, post } diff --git a/backend/db/db.js b/backend/db/db.js new file mode 100644 index 0000000..b8364d2 --- /dev/null +++ b/backend/db/db.js @@ -0,0 +1,6 @@ +const knex = require('knex') +const knexfile = require('./knexfile') + +const db = knex(knexfile); + +module.exports = db; \ No newline at end of file diff --git a/backend/db/knexfile.js b/backend/db/knexfile.js new file mode 100644 index 0000000..b8464c4 --- /dev/null +++ b/backend/db/knexfile.js @@ -0,0 +1,21 @@ +// Update with your config settings. + + +module.exports = { + + + client: 'postgresql', + connection: { + database: 'thepeopleboard', + user: 'postgres', + password: '0000' + }, + pool: { + min: 2, + max: 10 + }, + migrations: { + tableName: 'knex_migrations' + } + +}; diff --git a/backend/db/migrations/20231014071544_create_user.js b/backend/db/migrations/20231014071544_create_user.js new file mode 100644 index 0000000..fded454 --- /dev/null +++ b/backend/db/migrations/20231014071544_create_user.js @@ -0,0 +1,14 @@ +exports.up = function (knex) { + return knex.schema.createTable("users", (table) => { + table.increments("id"); + table.string("username"); + table.string("email"); + table.string("password"); + table.timestamps(true, true); + }); +}; + +exports.down = function (knex) { + + return knex.schema.dropTable("users"); +}; diff --git a/backend/middleware/bypass.js b/backend/middleware/bypass.js new file mode 100644 index 0000000..7ed1b86 --- /dev/null +++ b/backend/middleware/bypass.js @@ -0,0 +1,7 @@ +//BYPASS MIDDLEWARE +const bypass = (req,res,next) => +{ + next(); +} + +module.exports = bypass \ No newline at end of file diff --git a/backend/package-lock.json b/backend/package-lock.json index 094c58c..12a6ffe 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,16 +1,17 @@ { - "name": "backend", + "name": "the-people-board-backend", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "backend", + "name": "the-people-board-backend", "version": "1.0.0", "license": "ISC", "dependencies": { "bcrypt": "^5.1.1", "cors": "^2.8.5", + "dotenv": "^16.3.1", "express": "^4.18.2", "knex": "^2.5.1", "pg": "^8.11.3" @@ -405,6 +406,17 @@ "node": ">=8" } }, + "node_modules/dotenv": { + "version": "16.3.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", + "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", diff --git a/backend/package.json b/backend/package.json index 4fc1471..c336d95 100644 --- a/backend/package.json +++ b/backend/package.json @@ -16,6 +16,7 @@ "dependencies": { "bcrypt": "^5.1.1", "cors": "^2.8.5", + "dotenv": "^16.3.1", "express": "^4.18.2", "knex": "^2.5.1", "pg": "^8.11.3" diff --git a/backend/server.js b/backend/server.js index f8077dd..965e9af 100644 --- a/backend/server.js +++ b/backend/server.js @@ -2,16 +2,18 @@ const express = require('express'); const cors = require('cors'); const bcrypt = require('bcrypt'); -const db = require('knex')({ - client: 'pg', - connection: { - host : '127.0.0.1', //Localhost - port : 5432, - user : '', - password : '', - database : 'thepeopleboard' - } -}); +// const db = require('knex')({ +// client: 'pg', +// connection: { +// host : '127.0.0.1', //Localhost +// port : 5432, +// user : 'postgres', +// password : '0000', +// database : 'thepeopleboard' +// } +// }); + +// db.migrate.latest(); // Connecting our controllers const example = require('./controllers/example'); @@ -28,6 +30,7 @@ app.get('/example/get', (req, res) => { example.get(req,res) }); app.post('/example/post', (req, res) => { example.post(req,res) }); +app.use('/auth',require('./controllers/auth')) // Running our backend API on port 5000 app.listen(5000, () => { From 482903a40db50e21696be58987284a29ff8ee376 Mon Sep 17 00:00:00 2001 From: gautam-bhagat Date: Sat, 14 Oct 2023 13:58:24 +0530 Subject: [PATCH 2/2] signup-endpoint complete --- .env | 1 + backend/controllers/auth.js | 61 +++++++++++- .../migrations/20231014071544_create_user.js | 3 +- backend/middleware/validateemail.js | 14 +++ backend/package-lock.json | 98 +++++++++++++++++++ backend/package.json | 2 + 6 files changed, 175 insertions(+), 4 deletions(-) create mode 100644 .env create mode 100644 backend/middleware/validateemail.js diff --git a/.env b/.env new file mode 100644 index 0000000..9643f6b --- /dev/null +++ b/.env @@ -0,0 +1 @@ +SECRET_KEY = "HACKTOBERFEST" \ No newline at end of file diff --git a/backend/controllers/auth.js b/backend/controllers/auth.js index fd12b49..67d6f1a 100644 --- a/backend/controllers/auth.js +++ b/backend/controllers/auth.js @@ -1,8 +1,14 @@ const express = require('express'); const router = express.Router(); + +const bcrypt = require("bcrypt"); +const saltRounds = 10; +const jwt = require("jsonwebtoken"); +require('dotenv').config(); + const bypass = require('../middleware/bypass'); -const knex = require('knex') +const knex = require('../db/db') router.get('/',bypass,(req,res )=> { res.send("Working User API") @@ -10,8 +16,57 @@ router.get('/',bypass,(req,res )=> { router.get('/get',bypass, async (req,res)=>{ - const ans = await knex.select().table(user); - res.json({ans}) + const response = await knex.select().table('users'); + res.json({response}) }); +const generateToken = (data) =>{ + const KEY = "HACKTOBERFEST" + const token = jwt.sign(data, KEY); + return token; +} + +const encryptPass = async (pass)=>{ + const salt = await bcrypt.genSalt(saltRounds); + const secPass = await bcrypt.hash(pass, salt); + return secPass; +} +const validateMail = require('../middleware/validateemail') + +router.post('/signup',validateMail,async(req,res)=>{ + const {name, email,password} = req.body; + + const data = { + 'email' : email + } + + + const token = await generateToken(data); + const pass = await encryptPass(password); + let success = 0 + try { + + const d = await knex('users') + .where({'email' : email}).limit(1); + console.log(d[0]) + + if(d[0]){ + return res.status(203).json({success : 0, message : "Email already in use"}) + } + await knex('users').insert({ + 'name' : name, + 'email': email, + 'password' : pass, + 'token' : token + }).then(()=>{ + success = 1 + return res.status(200).json({success, message : "User Created"}) + }); + } catch (error) { + success = 0; + console.log(error); + return res.json({success, message : "Error"}) + } +}) + module.exports = router \ No newline at end of file diff --git a/backend/db/migrations/20231014071544_create_user.js b/backend/db/migrations/20231014071544_create_user.js index fded454..4478e3f 100644 --- a/backend/db/migrations/20231014071544_create_user.js +++ b/backend/db/migrations/20231014071544_create_user.js @@ -1,9 +1,10 @@ exports.up = function (knex) { return knex.schema.createTable("users", (table) => { table.increments("id"); - table.string("username"); + table.string("name"); table.string("email"); table.string("password"); + table.string("token"); table.timestamps(true, true); }); }; diff --git a/backend/middleware/validateemail.js b/backend/middleware/validateemail.js new file mode 100644 index 0000000..4dc23c8 --- /dev/null +++ b/backend/middleware/validateemail.js @@ -0,0 +1,14 @@ +var validator = require("email-validator"); + +const validateMail = (req,res,next) =>{ + const {email} = req.body; + const v = validator.validate(email); + + if (v){ + next(); + }else{ + let success = 0 + res.json({success,message : "Invalid Mail!"}) + } +} +module.exports = validateMail \ No newline at end of file diff --git a/backend/package-lock.json b/backend/package-lock.json index 12a6ffe..63d86ad 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -12,7 +12,9 @@ "bcrypt": "^5.1.1", "cors": "^2.8.5", "dotenv": "^16.3.1", + "email-validator": "^2.0.4", "express": "^4.18.2", + "jsonwebtoken": "^9.0.2", "knex": "^2.5.1", "pg": "^8.11.3" }, @@ -229,6 +231,11 @@ "node": ">=8" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" + }, "node_modules/buffer-writer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", @@ -417,11 +424,27 @@ "url": "https://github.com/motdotla/dotenv?sponsor=1" } }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, + "node_modules/email-validator": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/email-validator/-/email-validator-2.0.4.tgz", + "integrity": "sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==", + "engines": { + "node": ">4.0" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -902,6 +925,46 @@ "node": ">=0.12.0" } }, + "node_modules/jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/knex": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/knex/-/knex-2.5.1.tgz", @@ -978,6 +1041,41 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", diff --git a/backend/package.json b/backend/package.json index c336d95..71ea72b 100644 --- a/backend/package.json +++ b/backend/package.json @@ -17,7 +17,9 @@ "bcrypt": "^5.1.1", "cors": "^2.8.5", "dotenv": "^16.3.1", + "email-validator": "^2.0.4", "express": "^4.18.2", + "jsonwebtoken": "^9.0.2", "knex": "^2.5.1", "pg": "^8.11.3" }