Merge branch 'develop'

Author: william26

Diff for: lib/common/makeSetup.js

@@ -8,7 +8,6 @@ var cors_middleware = function (req, res, next) {
     res.setHeader('Access-Control-Allow-Headers', 'Authorization, Content-Type');
     next();
 };
-
 module.exports = function makeSetup(grantTypes, reqPropertyName, requiredHooks, grantToken) {
     var errorSenders = require("./makeErrorSenders")(grantTypes);
     var handleAuthenticatedResource = require("./makeHandleAuthenticatedResource")(reqPropertyName, errorSenders);
@@ -51,7 +50,7 @@ module.exports = function makeSetup(grantTypes, reqPropertyName, requiredHooks,
             if (req.method === "POST" && req.path() === options.tokenEndpoint) {
                 // This is handled by the route installed above, so do nothing.
                 next();
-            } else if (req.authorization.scheme) {
+            } else if (req.authorization && req.authorization.scheme) {
                 handleAuthenticatedResource(req, res, next, options);
             } else {
                 req[reqPropertyName] = null;