Merge pull request #5 from redpwn/feature/db-user-perms

Added perms column to users

Author: chen-robert

migrations/20200209180112-add-users.js renamed to migrations/1581292018019_add-users.js

@@ -13,7 +13,3 @@ exports.down = function (pgm) {
   pgm.dropTable('users')
   pgm.dropExtension('uuid-ossp')
 }
-
-exports._meta = {
-  version: 1
-}

migrations/1581292025458_user-perms.js

@@ -0,0 +1,9 @@
+exports.up = pgm => {
+  pgm.addColumns('users', {
+    perms: { type: 'int', notNull: true }
+  })
+}
+
+exports.down = pgm => {
+  pgm.dropColumns('users', 'perms')
+}

server/database/auth.js

@@ -5,24 +5,24 @@ const ret = {
     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]
+  makeUser: ({ id, name, email, division, password, perms }) => {
+    return db.query('INSERT INTO users (id, name, email, division, password, perms) VALUES ($1, $2, $3, $4, $5, $6) RETURNING *',
+      [id, name, email, division, password, perms]
     )
       .then(res => res.rows[0])
   },
-  updateUser: ({ id, name, email, division, password }) => {
+  updateUser: ({ id, name, email, division, password, perms }) => {
     return ret.getUser({ id })
       .then(user => {
-        const upd = { name, email, division, password }
+        const upd = { name, email, division, password, perms }
         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]
+        return db.query('UPDATE users SET name = $1, email = $2, division = $3, password = $4, perms = $5 WHERE id = $6 RETURNING *',
+          [user.name, user.email, user.division, user.password, user.perms, user.id]
         )
       })
       .then(res => res.rows[0])