Add Users resource

Other changes:

- Update and delete migrations and seeders
- Update sessions lib
- Fix the cors method in server.js

Author: rickyhurtado

README.md

@@ -117,12 +117,22 @@ To manage separate Docker instance for API, open another terminal console and ru
 
 Use the following credentials to test different API responses. Default password for all accounts is `password`.
 
-- **Super Admin User:** `superadmin@email.com` - has wildcard access
-- **Admin User:** `admin@email.com` - has wildcard access but Admin › Users › Delete is excluded
-- **Common User:** `user@email.com` - can access My Profile, Admin › Dashboard, Users, Users › View, and Settings
-- **User redirected to internal page:** `referrer@email.com` – when `redirect.url` is set without the domain,
-user shall be redirected to internal page if no location path (referrer) found on the Sign In page
-- **User redirected to external page:** `redirect@email.com` – when `redirect.external` and `redirect.url` are set,
-user shall be redirected to external page if no location path (referrer) found on the Sign In page
-- **Blocked User:** `blocked@email.com` – user is signed in but the account is blocked
-- **Unauthorized User:** simply enter wrong `email` and/or `password`
+| Name              | Email                  | Description |
+|-------------------|------------------------|-------------|
+| Super Admin User  | `superadmin@email.com` | Has wildcard access |
+| Admin User        | `admin@email.com`      | Has wildcard access but `Admin › Users › Delete` is excluded |
+| Common User       | `user@email.com`       | Can access `My Profile`, `Admin › Dashboard`, `Users`, `Users › View, and Settings` |
+| Referrer User     | `referrer@email.com`   | When `redirect` is set without the domain, e.i. `/admin/dashboard`, user shall be redirected to internal page if no location path (referrer) found on the Sign In page |
+| Redirect User     | `redirect@email.com`   | When `redirect` is set with complete URL, e.i. `https://github.com/anthub-services`, user shall be redirected to external page if no location path (referrer) found on the Sign In page |
+| Blocked User      | `blocked@email.com`    | User is signed in but the account is blocked |
+| Unauthorized User | `<any invalid email>`  | Simply enter wrong `email` and/or `password` |
+
+## Docker Boilerplates
+
+The following boilerplates can be used to install and run the API and client boilerplates in a Docker container.
+
+[Docker for Node API Mockup Data and Client Boilerplates](https://github.com/anthub-services/docker-for-node-api-mockup-data-and-client-boilerplates)
+<br />
+[Docker for Node API and Client Boilerplates](https://github.com/anthub-services/docker-for-node-api-and-client-boilerplates)
+<br />
+[Docker for Rails API and Client Boilerplates](https://github.com/anthub-services/docker-for-rails-api-and-client-boilerplates)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-express-api-boilerplate",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Node Express API Boilerplate",
   "author": "Ricky Hurtado",
   "license": "UNLICENSED",
@@ -19,6 +19,7 @@
     "dotenv": "^4.0.0",
     "express": "~4.0.0",
     "jsonwebtoken": "^8.1.1",
+    "moment": "^2.21.0",
     "passport": "^0.4.0",
     "passport-http-bearer": "^1.0.1",
     "pg": "^7.4.1",

src/controllers/Users.js

@@ -0,0 +1,60 @@
+import * as Users from '../lib/Users'
+
+export default {
+  list(req, res) {
+    Promise
+      .all([
+        Users.list({
+          res,
+          query: req.query,
+          returnData: true,
+          jsonData: true
+        }),
+        Users.pages({ query: req.query })
+      ])
+      .then(promises => {
+        res.status(200).send({
+          rows: promises[0],
+          pages: promises[1]
+        })
+      })
+      .catch(error => {
+        res.status(400).send(error)
+      })
+  },
+
+  create(req, res) {
+    // TODO: Create promises for paths creation and
+    // sending temporary password to the new user
+    // after the user record has beend created
+
+    Users.create({
+      res,
+      body: req.body
+    })
+  },
+
+  find(req, res) {
+    Users.find({
+      res,
+      where: {
+        userId: req.params.userId
+      }
+    })
+  },
+
+  update(req, res) {
+    Users.update({
+      res,
+      body: req.body,
+      userId: req.params.userId
+    })
+  },
+
+  destroy(req, res) {
+    Users.destroy({
+      res,
+      userId: req.params.userId
+    })
+  }
+}

src/controllers/index.js

@@ -1,7 +1,9 @@
 import Sessions from './Sessions'
 import Tests from './Tests'
+import Users from './Users'
 
 export default {
   Sessions,
-  Tests
+  Tests,
+  Users
 }

src/helpers/Data.js

@@ -0,0 +1,61 @@
+import _ from 'lodash'
+import Sequelize from 'sequelize'
+
+const DEFAULT_LIMIT = 20
+
+export function filters(filtered, options={}) {
+  if (!filtered) return {}
+
+  const filterArray = []
+
+  decodeURIComponent(filtered).split(',').map(filter => {
+    const array = filter.split(':')
+
+    filterArray.push(filterType(array[0], decodeURIComponent(array[1]), options))
+  })
+
+  return { $and: filterArray }
+}
+
+export function orderBy(sorted, defaultOrder=[]) {
+  if (!sorted) return [defaultOrder]
+
+  return sorted.split(',').map(sort => {
+    return sort.split(':')
+  })
+}
+
+export function pageCount({ limit }, count) {
+  return Math.ceil(count / (limit ? limit : DEFAULT_LIMIT))
+}
+
+function filterType(key, value, options) {
+  const optionKeys = Object.keys(options)
+
+  if (_.indexOf(optionKeys, key) > -1) {
+    const filterObject = {}
+    const type = options[key].type
+    const col = options[key].col
+
+    if (type === 'integer')
+      filterObject[key] = parseInt(value)
+
+    if (type === 'minDate')
+      filterObject[col] = { $gte: new Date(value) }
+
+    if (type === 'maxDate')
+      filterObject[col] = { $lte: new Date(value) }
+
+    return filterObject
+  }
+
+  return Sequelize.where(
+    Sequelize.fn(
+      'lower',
+      Sequelize.col(key)
+    ),
+    {
+      $like: value.toLowerCase()
+    }
+  )
+}

src/helpers/Math.js

@@ -0,0 +1,6 @@
+export function rand(min=0, max=60) {
+  min = Math.ceil(min)
+  max = Math.floor(max)
+
+  return Math.floor(Math.random() * (max - min)) + min
+}

src/lib/Paths.js

@@ -0,0 +1,43 @@
+import DB from '../models'
+
+export function create(options) {
+  const { res, body, userId } = options
+  const value = {
+    allowedPaths: body.allowedPaths,
+    excludedPaths: body.excludedPaths,
+  }
+
+  DB.Path
+    .create({ userId, value })
+    .then(Path => {
+      const data = Path ? { userId } : null
+
+      return res.status(Path ? 201 : 400).send(data)
+    })
+    .catch(error => {
+      console.log(error)
+
+      res.status(400).send(error)
+    })
+}
+
+export function update(options) {
+  const { res, body, userId } = options
+  const value = {
+    allowedPaths: body.allowedPaths,
+    excludedPaths: body.excludedPaths,
+  }
+
+  DB.Path
+    .update({ value }, {
+      where: { userId }
+    })
+    .then(Path => {
+      return res.status(Path ? 200 : 400).send()
+    })
+    .catch(error => {
+      console.log(error)
+
+      res.status(400).send(error)
+    })
+}

src/lib/Sessions.js

@@ -61,7 +61,7 @@ export function auth(req, res) {
   }
 
   return Users
-    .find(null, { where: { email }, returnData: true })
+    .find({ where: { email }, returnData: true })
     .then(User => {
       if (!User.object || !(User.object && User.object.authenticate(password)))
         return authResponse.invalid