Merge 7579b13 into 1a9c8ee

jaredhanson · Feb 22, 2014 · d9ed57f · d9ed57f
2 parents 1a9c8ee + 7579b13
commit d9ed57f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/middleware/authorization.js b/lib/middleware/authorization.js
@@ -130,12 +130,12 @@ module.exports = function(server, options, validate, immediate) {
         if (client) { req.oauth2.client = client; }
         if (redirectURI) { req.oauth2.redirectURI = redirectURI; }
 
-        if (err) { return next(err); }
-        if (!client) { return next(new AuthorizationError('Unauthorized client', 'unauthorized_client')); }
-
         req.oauth2.req = areq;
         req.oauth2.user = req[userProperty];
 
+        if (err) { return next(err); }
+        if (!client) { return next(new AuthorizationError('Unauthorized client', 'unauthorized_client')); }
+
         function immediated(err, allow, ares) {
           if (err) { return next(err); }
           if (allow) {