From 46af483bdd165963484d6d986fdd72bdd411dbd7 Mon Sep 17 00:00:00 2001
From: Karl Mikkelsen <karl@lockedonhq.com>
Date: Tue, 17 Jun 2014 16:27:41 +1000
Subject: [PATCH] Invalid Access Token return 401

Clean up logic to be easier to read.
Signed-off-by: Karl Mikkelsen <karl@karlmikko.com>
---
 lib/middleware/token.js    | 10 ++--------
 lib/models/access-token.js |  4 +++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/middleware/token.js b/lib/middleware/token.js
index 6087fd31..3bfff701 100644
--- a/lib/middleware/token.js
+++ b/lib/middleware/token.js
@@ -51,14 +51,8 @@ function token(options) {
   return function (req, res, next) {
     if (req.accessToken !== undefined) return next();
     TokenModel.findForRequest(req, options, function(err, token) {
-      if(err) return next(err);
-      if(token) {
-        req.accessToken = token;
-        next();
-      } else {
-        req.accessToken = null;
-        return next();
-      }
+      req.accessToken = token || null;
+      next(err);
     });
   }
 }
diff --git a/lib/models/access-token.js b/lib/models/access-token.js
index f5f66d20..15aaeb3b 100644
--- a/lib/models/access-token.js
+++ b/lib/models/access-token.js
@@ -133,7 +133,9 @@ AccessToken.findForRequest = function(req, options, cb) {
           } else if(isValid) {
             cb(null, token);
           } else {
-            cb(new Error('Invalid Access Token'));
+            var e = new Error('Invalid Access Token');
+            e.status = e.statusCode = 401;
+            cb(e);
           }
         });
       } else {