Skip to content

[UPDATE] separate error and unauthorized #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aqidd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[UPDATE] separate error and unauthorized #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 46 additions & 41 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,74 +5,79 @@ var patched = false

ga.init()

module.exports = function(Router, accountresource,apiTokenKey){
module.exports = function (Router, accountresource, apiTokenKey) {

var middleware = function(req, res, next){
var middleware = function (req, res, next) {

var now = new Date().getTime()
req.starttime = now
var restime = 99999999
var end = res.end
res.end = function(){
restime = ( new Date().getTime() - now )
ga.pageview(req.url,req.method, restime)
return end.apply(this, arguments )
res.end = function () {
restime = (new Date().getTime() - now)
ga.pageview(req.url, req.method, restime)
return end.apply(this, arguments)
}

var resources = process.server.resources
if( !process.server.ga ) process.server.ga = ga
if (!process.server.ga) process.server.ga = ga

if( !resources || !res ) return next()
var resource = resources.find(function(r){ return r.name == accountresource })
var error = function(msg, noconsole){
if( !res.send ) return next() // weird edgecase
res.status(400).send({code:400, message:msg})
if( !noconsole ) console.error(msg)
if (!resources || !res) return next()
var resource = resources.find(function (r) { return r.name == accountresource })
var error = function (msg, noconsole) {
if (!res.send) return next() // weird edgecase
res.status(400).send({ code: 400, message: msg })
if (!noconsole) console.error(msg)
}
if( ! resource ) return error("dpd-api-token: resource '"+accountresource+"' not found :(")
if( ! resource.properties[ apiTokenKey ] ) return error("dpd-api-token: please create property '"+apiTokenKey+"' in resource '"+accountresource+"'")
var unauthorized = function (msg, noconsole) {
if (!res.send) return next() // weird edgecase
res.status(401).send({ code: 401, message: msg })
if (!noconsole) console.error(msg)
}
if (!resource) return error("dpd-api-token: resource '" + accountresource + "' not found :(")
if (!resource.properties[apiTokenKey]) return error("dpd-api-token: please create property '" + apiTokenKey + "' in resource '" + accountresource + "'")

if( req.username != 'anonymous' && req.headers['x-api-token'] && req.headers['x-api-version'] ){
if (req.username != 'anonymous' && req.headers['x-api-token'] && req.headers['x-api-version']) {
var query = {}
query[ apiTokenKey ] = req.headers['x-api-token']
resource.store.find(query, function(err, user){
if( err || !user[0] ) return error("unknown apikey", true)
query[apiTokenKey] = req.headers['x-api-token']
resource.store.find(query, function (err, user) {
if (err || !user[0]) return unauthorized("unknown apikey", true)
var user = user[0]
req.user = user
req.username = user.username
ga.event("request."+user.username+".v"+req.headers['x-api-version'], req.method+" "+req.url )
ga.event("request." + user.username + ".v" + req.headers['x-api-version'], req.method + " " + req.url)
next()
})
}else{
} else {
next()
}
ga.event("request", req.method+" "+req.url )
}
ga.event("request", req.method + " " + req.url)
}

var route = Router.prototype.route
Router.prototype.route = function(req, res){
Router.prototype.route = function (req, res) {
var args = arguments
var me = this
middleware( req, res, function(){
return route.apply(me,args)
middleware(req, res, function () {
return route.apply(me, args)
})
}

// process.server.on('listening', function(){
// if( process.server.resources && !patched){
// var route = process.server.router.route
// process.server.router.route = function(req, res){
// var args = arguments
// var me = this
// console.log("route!")
// middleware(resources, server, req, res, function(){
// return route.apply(me,args)
// })
// }
// patched = true
// console.log("patch!")
// }
// })
// process.server.on('listening', function(){
// if( process.server.resources && !patched){
// var route = process.server.router.route
// process.server.router.route = function(req, res){
// var args = arguments
// var me = this
// console.log("route!")
// middleware(resources, server, req, res, function(){
// return route.apply(me,args)
// })
// }
// patched = true
// console.log("patch!")
// }
// })

//monkeypatch( require('module').prototype,'require', function(original, modname ){

Expand Down