starred/stf
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 09:53:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary options from api unit. Improve error messages... etc etc

Browse Source
This commit is contained in:
Vishal Banthia
2015-12-04 16:42:11 +09:00
parent 221bc78e49
commit 536e469e6f
5 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/units/api/helpers/securityHandlers.js
View File

@@ -3,7 +3,7 @@ var urlutil = require('../../../util/urlutil')
var logger = require('../../../util/logger')
var dbapi = require('../../../db/api')
var log = logger.createLogger('api:auth')
var log = logger.createLogger('api:helpers:securityHandlers')
module.exports = {
accessTokenAuth: accessTokenAuth
@@ -27,24 +27,30 @@ function accessTokenAuth(req, res, next) {
next()
}
})
} else {
res.json(500, {
success: false
})
}
})
.catch(function(err) {
log.error('Failed to load token: ', err.stack)
res.json(500, {
res.json(401, {
success: false,
description: "Bad Access Token"
description: 'Bad credentials'
})
})
} else {
log.error("Bad Access Token Header")
res.json(500, {
log.error('Bad Access Token Header')
res.json(401, {
success: false,
description: "Bad Access Token Header"
description: 'Bad credentials'
})
}
}
// Request is coming from browser app
// TODO: Remove this once frontend become stateless
// and start sending request without session
else if (req.session && req.session.jwt) {
dbapi.loadUser(req.session.jwt.email)
.then(function(user) {
@@ -54,17 +60,16 @@ function accessTokenAuth(req, res, next) {
}
else {
res.json(500, {
success: false,
description: "Bad Request"
success: false
})
}
})
.catch(next)
}
else {
res.json(500, {
res.json(401, {
success: false,
description: "Request does not have Authorization header"
description: 'Requires authentication'
})
}
}