Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Dev Tooling fixes (eslint/editorconfig) (#1398)

Browse source 
* 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
This commit is contained in:
Gavin Mogan 2017-04-10 15:36:03 -07:00 • committed by Eugen
parent 3fd5385e7b
commit 3672a799d4
5 changed files with 529 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
streaming/index.js
View file

@ -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 /, '')