Updating UT's and removing some mkdocs tests for travis

Author: stoopidJSON

.travis.yml

@@ -5,8 +5,6 @@ install:
 - npm install
 - npm install -g codecov
 - npm install -g nyc
-- mkdir site
-- touch site/index.html
 services:
 - postgresql
 - docker

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive.svg?branch=master)](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive) [![codecov](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive/branch/master/graph/badge.svg)](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive) [![GitHub release](https://img.shields.io/github/release/Naereen/StrapDown.js.svg)](https://github.com/CodeForBaltimore/Bmore-Responsive/releases) [![Open Source Love svg1](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/)
+[![Build Status](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive.svg?branch=master)](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive) [![codecov](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive/branch/master/graph/badge.svg)](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive) [![Open Source Love svg1](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/)
 
 # Bmore Responsive
 A simple, flexible API to support emergency response coordination.  Sample use cases include:

src/index.js

@@ -8,7 +8,6 @@ import nunjucks from 'nunjucks'
 import requestId from 'express-request-id'
 import rateLimit from 'express-rate-limit'
 import routes from './routes'
-import serveIndex from 'serve-index'
 import swaggerDocument from '../swagger.json'
 import swaggerUi from 'swagger-ui-express'
 import utils from './utils'
@@ -20,7 +19,7 @@ const swaggerOptions = {
 }
 const apiLimiter = rateLimit({
 	windowMs: 15 * 60 * 1000, // 15 minutes
-	max: 1000
+	max: 100
 })
 
 nunjucks.configure('mail_templates', { autoescape: true })
@@ -38,7 +37,8 @@ if (process.env.NODE_ENV === 'production') app.use(apiLimiter)
 // Custom middleware
 app.use(async (req, res, next) => {
 	req.context = {
-    models
+    models,
+    // e: await utils.loadCasbin()
 	}
 
 	next()

src/models/index.js

@@ -33,7 +33,7 @@ const sequelize = new Sequelize(
 	{
 		logging: false,
 		dialect: 'postgres',
-		dialectOptions: dialectOptions
+		dialectOptions
 	}
 )
 const basename = path.basename(__filename)

src/routes/user-role.js

@@ -7,95 +7,94 @@ router.use(utils.authMiddleware)
 // Gets all roles.
 router.get('/', async (req, res) => {
   const response = new utils.Response()
-	try {
-		const e = await utils.loadCasbin()
-		const rolesRaw = await e.getNamedPolicy('p')
-		const roles = {}
-
-
-		for (const role of rolesRaw) {
-			if (roles[role[0]] !== undefined) {
-				roles[role[0]].push({
-					path: role[1],
-					method: role[2]
-				})
-			} else {
-				roles[role[0]] = [{
-					path: role[1],
-					method: role[2]
-				}]
-			}
-		}
-
-		
-		response.setMessage(roles)
-	} catch (e) {
-		console.error(e)
-		response.setCode(500)
-	}
-
-	return res.status(response.getCode()).send(response.getMessage())
+  try {
+    const e = await utils.loadCasbin()
+    const rolesRaw = await e.getNamedPolicy('p')
+    const roles = {}
+
+
+    for (const role of rolesRaw) {
+      if (roles[role[0]] !== undefined) {
+        roles[role[0]].push({
+          path: role[1],
+          method: role[2]
+        })
+      } else {
+        roles[role[0]] = [{
+          path: role[1],
+          method: role[2]
+        }]
+      }
+    }
+
+
+    response.setMessage(roles)
+  } catch (e) {
+    console.error(e)
+    response.setCode(500)
+  }
+
+  return res.status(response.getCode()).send(response.getMessage())
 })
 
 // Creates a new role.
 router.post('/', async (req, res) => {
   const response = new utils.Response()
-	try {
-		const { role, path, method } = req.body
-
-		if (role && path && method) {
-			let added = false
-			
-			const e = await utils.loadCasbin()
-			const p = [role, path, method]
-			added = await e.addPolicy(...p)
-
-			if (added) {
-				
-				response.setMessage('policy created')
-			} else {
-				response.setCode(400)
-			}
-		} else {
-			response.setCode(400)
-		}
-
-	} catch (e) {
-		console.error(e)
-		response.setCode(500)
-	}
-
-	return res.status(response.getCode()).send(response.getMessage())
+  try {
+    const { role, path, method } = req.body
+
+    if (role && path && method) {
+      let added = false
+
+      const e = await utils.loadCasbin()
+      const p = [role, path, method]
+      added = await e.addPolicy(...p)
+
+      if (added) {
+
+        response.setMessage('policy created')
+      } else {
+        response.setCode(400)
+      }
+    } else {
+      response.setCode(400)
+    }
+
+  } catch (e) {
+    console.error(e)
+    response.setCode(500)
+  }
+
+  return res.status(response.getCode()).send(response.getMessage())
 })
 
 // Deletes a role.
 router.post('/delete', async (req, res) => {
   const response = new utils.Response()
-	try {
+  try {
     const { role, path, method } = req.body
 
-		if (role && path && method) {
-			let removed = false
-			
-			const e = await utils.loadCasbin()
-			const p = [role, path, method]
-			removed = await e.removePolicy(...p)
-
-			if (removed) {
-				
-				response.setMessage('policy deleted')
-			} else {
-				response.setCode(400)
-			}
-		} else {
-			response.setCode(400)
-		}
-	} catch (e) {
-		console.error(e)
-		response.setCode(500)
-	}
-
-	return res.status(response.getCode()).send(response.getMessage())
+    if (role && path && method) {
+      let removed = false
+
+      const e = await utils.loadCasbin()
+      const p = [role, path, method]
+      removed = await e.removePolicy(...p)
+
+      if (removed) {
+        response.setMessage('policy deleted')
+      } else {
+        response.setCode(400)
+      }
+    } else {
+      response.setCode(400)
+    }
+  } catch (e) {
+    console.error(e)
+    response.setCode(500)
+  }
+
+  return res.status(response.getCode()).send(response.getMessage())
 })
 
 export default router

src/routes/user.js

@@ -8,7 +8,7 @@ const router = new Router()
 const max = (process.env.NODE_ENV !== 'production') ? 50000 : 5
 const loginLimiter = rateLimit({
 	windowMs: 60 * 60 * 1000,
-	max: max,
+	max,
 	message: "Too many login attempts for this IP. Please try again later."
 })
 
@@ -149,7 +149,12 @@ router.post('/', utils.authMiddleware, async (req, res) => {
 			if (roles !== undefined) {
 				const e = await utils.loadCasbin()
 				for (const role of roles) {
-					await e.addRoleForUser(email.toLowerCase(), role)
+          await e.addRoleForUser(email.toLowerCase(), role)
+          // await req.context.models.UserRole.create({
+          //   ptype: 'g',
+          //   v0: email.toLowerCase(),
+          //   v1: role
+          // })
 				}
 			}
 
@@ -233,8 +238,16 @@ router.delete('/:email', utils.authMiddleware, async (req, res) => {
 			})
 
 			const e = await utils.loadCasbin()
-			await e.deleteRolesForUser(req.params.email.toLowerCase())
-
+      await e.deleteRolesForUser(req.params.email.toLowerCase())
+      // const roles = await req.context.models.UserRole.findAll({
+      //   where: {
+      //     v0: req.params.email.toLowerCase()
+      //   }
+      // })
+
+      // for (const role of roles) {
+      //   await role.destroy()
+      // }
 
 			await user.destroy()
 

src/tests/entity.routes.spec.js

@@ -177,7 +177,7 @@ describe('Entity positive tests', () => {
         done()
       })
   })
-  it('should not get a single contact with valid UUID', done => {
+  it('should not get a single entity with valid UUID', done => {
     request(app)
       .get(`/entity/${uuid()}`)
       .set('Accept', 'application/json')

src/utils/login.js

@@ -79,6 +79,11 @@ class Login {
 
     const e = await utils.loadCasbin()
     await e.addRoleForUser(this.user.email.toLowerCase(), this.role)
+    // await models.UserRole.create({
+    //   ptype: 'g',
+    //   v0: this.email.toLowerCase(),
+    //   v1: this.role
+    // })
   }
 
   /**
@@ -93,6 +98,15 @@ class Login {
 
     const e = await utils.loadCasbin()
     await e.deleteRolesForUser(this.user.email.toLowerCase())
+    // const roles = await models.UserRole.findAll({
+    //   where: {
+    //     v0: this.email.toLowerCase()
+    //   }
+    // })
+
+    // for (const role of roles) {
+    //   await role.destroy()
+    // }
 
     await user.destroy()
   }