From 3672a799d4bf9011bc665b6d8f55e58031513527 Mon Sep 17 00:00:00 2001
From: Gavin Mogan <github@gavinmogan.com>
Date: Mon, 10 Apr 2017 15:36:03 -0700
Subject: Dev Tooling fixes (eslint/editorconfig) (#1398)

* Add eslint to dev dependancies so it gets installed for the repo

yarn add --dev eslint babel-eslint eslint-plugin-reac

project specific version of eslint, you can globally install eslint-cli
if you want the global runtime, or add .bin to your path

* fix eslint errors about inconsitent returns

* eslint ignore the same as git ignore. allows for eslint .

* Add editorconfig file so everyones editor will be setup to follow the same standards
---
 streaming/index.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'streaming/index.js')

diff --git a/streaming/index.js b/streaming/index.js
index 7edf6203f..a1e7eaca7 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -87,21 +87,24 @@ const setRequestId = (req, res, next) => {
 const accountFromToken = (token, req, next) => {
   pgPool.connect((err, client, done) => {
     if (err) {
-      return next(err)
+      next(err)
+      return
     }
 
     client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 LIMIT 1', [token], (err, result) => {
       done()
 
       if (err) {
-        return next(err)
+        next(err)
+        return
       }
 
       if (result.rows.length === 0) {
         err = new Error('Invalid access token')
         err.statusCode = 401
 
-        return next(err)
+        next(err)
+        return
       }
 
       req.accountId = result.rows[0].account_id
@@ -113,7 +116,8 @@ const accountFromToken = (token, req, next) => {
 
 const authenticationMiddleware = (req, res, next) => {
   if (req.method === 'OPTIONS') {
-    return next()
+    next()
+    return
   }
 
   const authorization = req.get('Authorization')
@@ -122,7 +126,8 @@ const authenticationMiddleware = (req, res, next) => {
     const err = new Error('Missing access token')
     err.statusCode = 401
 
-    return next(err)
+    next(err)
+    return
   }
 
   const token = authorization.replace(/^Bearer /, '')
-- 
cgit