Fixed auth.required

Misc:
- Resolved conflicts
- Added test case, to fail if server grants prohibited admin access
- Simplified test logic
- Prevented usage of "var" (used const / let instead)
- Formatting
- Cleanup
- Typos

test/fixture/index.js

@@ -1,16 +1,15 @@
-var express = require('express');
-var http = require('http');
+const express = require('express');
+const http = require('http');
 
-var socketIo = require('socket.io');
-var socketio_jwt = require('../../lib');
+const socketIo = require('socket.io');
+const socketio_jwt = require('../../lib');
 
-var jwt = require('jsonwebtoken');
+const jwt = require('jsonwebtoken');
+const xtend = require('xtend');
+const bodyParser = require('body-parser');
+const enableDestroy = require('server-destroy');
 
-var xtend = require('xtend');
-var bodyParser = require('body-parser');
-
-var server, sio;
-var enableDestroy = require('server-destroy');
+let sio;
 
 exports.start = function (options, callback) {
 
@@ -25,12 +24,13 @@ exports.start = function (options, callback) {
     handshake: true
   }, options);
 
-  var app = express();
+  const app = express();
+  const server = http.createServer(app);
+  sio = socketIo.listen(server);
 
   app.use(bodyParser.json());
-
   app.post('/login', function (req, res) {
-    var profile = {
+    const profile = {
       first_name: 'John',
       last_name: 'Doe',
       email: 'john@doe.com',
@@ -38,14 +38,10 @@ exports.start = function (options, callback) {
     };
 
     // We are sending the profile inside the token
-    var token = jwt.sign(profile, options.secret, { expiresIn: 60*60*5 });
-
+    const token = jwt.sign(profile, options.secret, { expiresIn: 60*60*5 });
     res.json({token: token});
   });
 
-  server = http.createServer(app);
-
-  sio = socketIo.listen(server);
 
   if (options.handshake) {
     sio.use(socketio_jwt.authorize(options));
@@ -77,4 +73,4 @@ exports.stop = function (callback) {
     server.destroy();
   } catch (er) {}
   callback();
-};
+};

test/fixture/namespace.js

@@ -1,16 +1,14 @@
-var express = require('express');
-var http = require('http');
+const express = require('express');
+const http = require('http');
 
-var socketIo = require('socket.io');
-var socketio_jwt = require('../../lib');
+const socketIo = require('socket.io');
+const socketio_jwt = require('../../lib');
 
-var jwt = require('jsonwebtoken');
+const jwt = require('jsonwebtoken');
+const enableDestroy = require('server-destroy');
+const bodyParser = require('body-parser');
 
-var xtend = require('xtend');
-var bodyParser = require('body-parser');
-
-var server, sio;
-var enableDestroy = require('server-destroy');
+let sio;
 
 /**
  * This is an example server that shows how to do namespace authentication.
@@ -19,18 +17,19 @@ var enableDestroy = require('server-destroy');
  */
 exports.start = function (callback) {
 
-  options = {
+  const options = {
     secret: 'aaafoo super sercret',
     timeout: 1000,
     handshake: false
   };
 
-  var app = express();
+  const app = express();
+  const server = http.createServer(app);
+  sio = socketIo.listen(server);
 
   app.use(bodyParser.json());
-
   app.post('/login', function (req, res) {
-    var profile = {
+    const profile = {
       first_name: 'John',
       last_name: 'Doe',
       email: 'john@doe.com',
@@ -38,20 +37,17 @@ exports.start = function (callback) {
     };
 
     // We are sending the profile inside the token
-    var token = jwt.sign(profile, options.secret, { expiresIn: 60*60*5 });
-
-    res.json({token: token});
+    const token = jwt.sign(profile, options.secret, { expiresIn: 60*60*5 });
+    res.json({ token: token });
   });
 
-  server = http.createServer(app);
 
-  sio = socketIo.listen(server);
 
   sio.on('connection', function (socket) {
     socket.emit('hi');
   });
 
-  var admin_nsp = sio.of('/admin');
+  const admin_nsp = sio.of('/admin');
 
   admin_nsp.on('connection', socketio_jwt.authorize(options))
            .on('authenticated', function (socket) {
@@ -69,4 +65,4 @@ exports.stop = function (callback) {
     server.destroy();
   } catch (er) {}
   callback();
-};
+};

test/fixture/secret_function.js

@@ -1,19 +1,18 @@
-var express = require('express');
-var http = require('http');
+const express = require('express');
+const http = require('http');
 
-var socketIo = require('socket.io');
-var socketio_jwt = require('../../lib');
+const socketIo = require('socket.io');
+const socketio_jwt = require('../../lib');
 
-var jwt = require('jsonwebtoken');
+const jwt = require('jsonwebtoken');
+const xtend = require('xtend');
+const bodyParser = require('body-parser');
+const enableDestroy = require('server-destroy');
 
-var xtend = require('xtend');
-var bodyParser = require('body-parser');
-
-var server, sio;
-var enableDestroy = require('server-destroy');
+let sio;
 
 exports.start = function (options, callback) {
-  var SECRETS = {
+  const SECRETS = {
     123: 'aaafoo super sercret',
     555: 'other'
   };
@@ -31,12 +30,13 @@ exports.start = function (options, callback) {
     handshake: true
   }, options);
 
-  var app = express();
+  const app = express();
+  const server = http.createServer(app);
+  sio = socketIo.listen(server);
 
   app.use(bodyParser.json());
-
   app.post('/login', function (req, res) {
-    var profile = {
+    const profile = {
       first_name: 'John',
       last_name: 'Doe',
       email: 'john@doe.com',
@@ -44,15 +44,10 @@ exports.start = function (options, callback) {
     };
 
     // We are sending the profile inside the token
-    var token = jwt.sign(profile, SECRETS[123], { expiresIn: 60*60*5 });
-
+    const token = jwt.sign(profile, SECRETS[123], { expiresIn: 60*60*5 });
     res.json({token: token});
   });
 
-  server = http.createServer(app);
-
-  sio = socketIo.listen(server);
-
   if (options.handshake) {
     sio.use(socketio_jwt.authorize(options));
 
@@ -86,4 +81,3 @@ exports.stop = function (callback) {
 
   callback();
 };
-