Various bugfixes and style adjustments

boot/keys.js

@@ -2,30 +2,30 @@
  * Module dependencies
  */
 
-var cwd  = process.cwd()
-var fs   = require('fs')
-var path = require('path')
-var jwks = require(path.join(__dirname, '..', 'lib', 'jwks'))
+var cwd  = process.cwd();
+var fs   = require('fs');
+var path = require('path');
+var jwks = require(path.join(__dirname, '..', 'lib', 'jwks'));
 
 /**
  * Keys
  */
 
-var keys = {}
-var privateKey, publicKey
-var defaultPublicKeyFile  = path.join(cwd, 'config', 'keys', 'public.pem')
-var defaultPrivateKeyFile = path.join(cwd, 'config', 'keys', 'private.pem')
+var keys = {};
+var privateKey, publicKey;
+var defaultPublicKeyFile  = path.join(cwd, 'config', 'keys', 'public.pem');
+var defaultPrivateKeyFile = path.join(cwd, 'config', 'keys', 'private.pem');
 
 /**
  * Look for environment variables.
  */
 
 if (process.env.ANVIL_CONNECT_PRIVATE_KEY) {
-  privateKey = new Buffer(process.env.ANVIL_CONNECT_PRIVATE_KEY, 'base64').toString('ascii')
+  privateKey = new Buffer(process.env.ANVIL_CONNECT_PRIVATE_KEY, 'base64').toString('ascii');
 }
 
 if (process.env.ANVIL_CONNECT_PUBLIC_KEY) {
-  publicKey  = new Buffer(process.env.ANVIL_CONNECT_PUBLIC_KEY, 'base64').toString('ascii')
+  publicKey  = new Buffer(process.env.ANVIL_CONNECT_PUBLIC_KEY, 'base64').toString('ascii');
 }
 
 /**
@@ -34,24 +34,24 @@ if (process.env.ANVIL_CONNECT_PUBLIC_KEY) {
  */
 
 try {
-  privateKey = fs.readFileSync(defaultPrivateKeyFile).toString('ascii')
-  publicKey  = fs.readFileSync(defaultPublicKeyFile).toString('ascii')
+  privateKey = fs.readFileSync(defaultPrivateKeyFile).toString('ascii');
+  publicKey  = fs.readFileSync(defaultPublicKeyFile).toString('ascii');
 } catch (err) {}
 
 /**
  * Ensure the key pair has been loaded
  */
 
 if (!privateKey || !publicKey) {
-  console.log('Cannot load keypair')
-  process.exit(1)
+  console.log('Cannot load keypair');
+  process.exit(1);
 }
 
 /**
  * Export
  */
 
-keys.privateKey = privateKey
-keys.publicKey  = publicKey
-keys.jwks       = jwks(publicKey)
-module.exports  = keys
+keys.privateKey = privateKey;
+keys.publicKey  = publicKey;
+keys.jwks       = jwks(publicKey);
+module.exports  = keys;

boot/redis.js

@@ -2,7 +2,7 @@ var URL   = require('url')
   , redis = require('redis');
 
 module.exports = function (config) {
-  var client, url, port, host, db, pass;
+  var client, url, port, host, db, auth, options;
 
   if (config = config || {}) {
     try {
@@ -15,7 +15,7 @@ module.exports = function (config) {
 
       options = {
         no_ready_check: true
-      }
+      };
 
       client = redis.createClient(port, host, options);
 

boot/server.js

@@ -56,8 +56,8 @@ module.exports = function (server) {
    */
 
   server.use(cookieParser(settings.cookie_secret));
-  server.use(bodyParser.urlencoded({ extended: false }))
-  server.use(bodyParser.json())
+  server.use(bodyParser.urlencoded({ extended: false }));
+  server.use(bodyParser.json());
 
 
   /**

lib/time-utils.js

@@ -7,7 +7,7 @@
  */
 exports.nowSeconds = function (deltaSecs) {
   var secs = Date.now();
-  var secs = Math.round(secs / 1000);
+  secs = Math.round(secs / 1000);
   var secsStr;
 
   if (deltaSecs) {

models/Client.js

@@ -678,8 +678,6 @@ Client.prototype.authorizedScope = function (callback) {
  */
 
 Client.listAuthorizedByUser = function (userId, options, callback) {
-  var index  = 'users:' + userId + ':clients';
-
   if (!callback) {
     callback = options;
     options = {};
@@ -731,7 +729,7 @@ Client.prototype.configuration = function (settings, token) {
   configuration.registration_client_uri = registrationClientUri;
 
   if (token) {
-    configuration.registration_access_token = token
+    configuration.registration_access_token = token;
   }
 
   return configuration;
@@ -909,7 +907,7 @@ var authenticators = {
     }
 
     Client.get(clientId, function (err, client) {
-      if (err) { return next(err); }
+      if (err) { return callback(err); }
 
       // Unknown client
       if (!client) {

models/ClientToken.js

@@ -4,6 +4,7 @@
 
 var JWT            = require('anvil-connect-jwt')
   , nowSeconds     = require('../lib/time-utils').nowSeconds
+  ;
 
 
 /**
@@ -53,7 +54,7 @@ ClientToken.issue = function (claims, privateKey, callback) {
     var jwt = token.encode(privateKey);
     return callback(null, jwt);
   } catch (err) {
-    callback(err)
+    callback(err);
     //callback(new Error('Unable to issue client access token'));
   }
 };

models/UserApplications.js

@@ -48,7 +48,7 @@ function userApplications (user, callback) {
       Client.__client.zrevrange(index, 0, -1, function (err, ids) {
         if (err) { return done(err); }
         done(null, ids);
-      })
+      });
     },
 
   }, function (err, results) {

oidc/signout.js

@@ -48,7 +48,7 @@ function signout (req, res, next) {
             'Pragma': 'no-cache'
           });
 
-          res.send(204);
+          res.sendStatus(204);
         }
 
         // logout and redirect
@@ -83,7 +83,7 @@ function signout (req, res, next) {
       'Pragma': 'no-cache'
     });
 
-    res.send(204);
+    res.sendStatus(204);
   }
 }
 

oidc/verifyClientRegistration.js

@@ -79,17 +79,17 @@ function verifyClientRegistration (req, res, next) {
 
 
 function hasScope (claims, scope) {
-  var cscope = claims && claims.scope
+  var cscope = claims && claims.scope;
 
   // false if there's no scope
   if (!cscope) { return false; }
 
   // split the values if they're strings
-  if (typeof cscope === 'string') { cscope = cscope.split(' ') }
+  if (typeof cscope === 'string') { cscope = cscope.split(' '); }
 
   // check if the token has any of the prescribed scope values
   return cscope.some(function (s) {
-    return (scope.indexOf(s) !== -1) ? true : false;
+    return (scope && scope.indexOf(s) !== -1) ? true : false;
   });
 }
 

oidc/verifyClientToken.js

@@ -46,8 +46,8 @@ function verifyClientToken (req, res, next) {
     // decoded successfully
     else {
       // validate token
-      req.token = token
-      next()
+      req.token = token;
+      next();
     }
   }
 };

protocols/OAuth.js

@@ -164,7 +164,6 @@ function signatureBaseStringURI (uri) {
     , protocol = url.protocol
     , hostname = url.hostname
     , pathname = url.pathname
-    , search   = url.search
     , port     = ''
     , result   = ''
     ;

protocols/OpenID.js

@@ -37,15 +37,15 @@ function verifier (req, identifier, userInfo, done) {
   // Raw OpenID Provider response should be stored
   // for consistency with other protocols.
   var auth = {
-    id: request.query['openid.identity'],
+    id: req.query['openid.identity'],
     req_query:  req.query
   };
 
-  userInfo.id         = request.query['openid.identity'];
-  userInfo.name       = request.query['openid.ext2.value.fullname'];
-  userInfo.givenName  = request.query['openid.ext2.value.firstname'];
-  userInfo.familyName = request.query['openid.ext2.value.lastname'];
-  userInfo.email      = request.query['openid.ext2.value.email'];
+  userInfo.id         = req.query['openid.identity'];
+  userInfo.name       = req.query['openid.ext2.value.fullname'];
+  userInfo.givenName  = req.query['openid.ext2.value.firstname'];
+  userInfo.familyName = req.query['openid.ext2.value.lastname'];
+  userInfo.email      = req.query['openid.ext2.value.email'];
 
   User.connect(req, auth, userInfo, function (err, user) {
     if (err) { return done(err); }

providers/mailchimp.js

@@ -35,5 +35,5 @@ module.exports = function (config) {
 };
 
 function localhost(issuer) {
-  return issuer.replace('localhost', '127.0.0.1')
+  return issuer.replace('localhost', '127.0.0.1');
 }

routes/authorizations.js

@@ -38,7 +38,7 @@ module.exports = function (server) {
 
     AccessToken.revoke(uid, cid, function (err, confirm) {
       if (err) { return next(err); }
-      res.status(204).send()
+      res.sendStatus(204);
     });
   });
 

routes/register.js

@@ -7,6 +7,7 @@ var oidc            = require('../oidc')
   , Client          = require('../models/Client')
   , ClientToken     = require('../models/ClientToken')
   , ValidationError = require('../errors/ValidationError')
+  , NotFoundError   = require('../errors/NotFoundError')
   ;
 
 

routes/signin.js

@@ -91,15 +91,5 @@ module.exports = function (server) {
 
   server.post('/signin', handler);
 
-  // Only register the password signin post handler
-  // if the password protocol is enabled.
-  // if (settings.providers.password === true) {
-  //  server.post('/signin', handler);
-  // } else {
-  //  server.post('/signin', function (req, res, next) {
-  //  next(new PasswordsDisabledError());
-  // });
-  // }
-
 };
 

routes/userinfo.js

@@ -5,6 +5,7 @@
 var oidc     = require('../oidc')
   , settings = require('../boot/settings')
   , User     = require('../models/User')
+  , NotFoundError = require('../errors/NotFoundError')
   ;
 
 

server.js

@@ -81,6 +81,6 @@ module.exports = server;
  */
 
 if (!module.parent) {
-  server.start()
+  server.start();
 }
 

test/oidc/signout.coffee

@@ -122,7 +122,7 @@ describe 'Signout', ->
             logout: sinon.spy()
           res =
             set: sinon.spy()
-            send: sinon.spy()
+            sendStatus: sinon.spy()
             redirect: sinon.spy()
           next = sinon.spy()
           signout(req, res, next)
@@ -137,7 +137,7 @@ describe 'Signout', ->
           req.session.opbs.should.not.equal opbs
 
         it 'should respond 204', ->
-          res.send.should.have.been.calledWith 204
+          res.sendStatus.should.have.been.calledWith 204
 
 
       describe 'and valid uri', ->
@@ -235,7 +235,7 @@ describe 'Signout', ->
         logout: sinon.spy()
       res =
         set: sinon.spy()
-        send: sinon.spy()
+        sendStatus: sinon.spy()
       next = sinon.spy()
       signout(req, res, next)
 
@@ -246,7 +246,7 @@ describe 'Signout', ->
       req.session.opbs.should.not.equal opbs
 
     it 'should respond 204', ->
-      res.send.should.have.been.calledWith 204
+      res.sendStatus.should.have.been.calledWith 204
 
     it 'should respond with Cache-Control header', ->
       res.set.should.have.been.calledWith sinon.match({