Merge pull request #2 from redpwn/feature/database-auth

Database Authentication

Author: chen-robert

.env.example

@@ -1 +1,2 @@
 APP_TOKEN_KEY=
+DATABASE_URL=postgresql://user:[email protected]:5432/rctf

README.md

@@ -17,4 +17,11 @@ We have designed rctf with the following attributes in mind:
 
 ## Installation
 
-_TODO_
+### Database
+
+The application is built on a PostgreSQL database. You should add the appropriate connection string in `.env`. Then run the following command to setup the database. 
+
+```
+yarn run migrate up
+```
+

migrations/20200209180112-add-users.js

@@ -0,0 +1,19 @@
+exports.up = function (pgm) {
+  pgm.createExtension('uuid-ossp')
+  pgm.createTable('users', {
+    id: { type: 'uuid', primaryKey: true },
+    name: { type: 'string', unique: true, notNull: true },
+    email: { type: 'string', unique: true, notNull: true },
+    password: { type: 'string', notNull: true },
+    division: { type: 'string', notNull: true }
+  })
+}
+
+exports.down = function (pgm) {
+  pgm.dropTable('users')
+  pgm.dropExtension('uuid-ossp')
+}
+
+exports._meta = {
+  version: 1
+}

package.json

@@ -6,12 +6,15 @@
   "private": true,
   "scripts": {
     "lint": "standard",
-    "start": "node index.js"
+    "start": "node index.js",
+    "migrate": "node-pg-migrate"
   },
   "dependencies": {
     "body-parser": "^1.19.0",
     "dotenv": "^8.2.0",
-    "express": "^4.17.1"
+    "express": "^4.17.1",
+    "node-pg-migrate": "^4.2.2",
+    "pg": "^7.18.1"
   },
   "devDependencies": {
     "standard": "^14.3.1"

server/database/auth.js

@@ -1,12 +1,32 @@
+const db = require('./db')
 
-module.exports = {
+const ret = {
   getUser: ({ id }) => {
-
+    return db.query('SELECT * FROM users WHERE id = $1', [id])
+      .then(res => res.rows[0])
   },
   makeUser: ({ id, name, email, division, password }) => {
-
+    return db.query('INSERT INTO users (id, name, email, division, password) VALUES ($1, $2, $3, $4, $5) RETURNING *',
+      [id, name, email, division, password]
+    )
+      .then(res => res.rows[0])
   },
   updateUser: ({ id, name, email, division, password }) => {
+    return ret.getUser({ id })
+      .then(user => {
+        const upd = { name, email, division, password }
+        Object.keys(upd).forEach(key => {
+          if (upd[key] === undefined) delete upd[key]
+        })
 
+        user = Object.assign(user, upd)
+
+        return db.query('UPDATE users SET name = $1, email = $2, division = $3, password = $4 WHERE id = $5 RETURNING *',
+          [user.name, user.email, user.division, user.password, user.id]
+        )
+      })
+      .then(res => res.rows[0])
   }
 }
+
+module.exports = ret

server/database/db.js

@@ -0,0 +1,8 @@
+const connectionString = process.env.DATABASE_URL
+
+const { Pool } = require('pg')
+const pool = new Pool({
+  connectionString
+})
+
+module.exports = pool