Merge branch 'master' of https://github.com/dbrugne/socketio-jwt into dbrugne-master

Conflicts:
	lib/index.js
This commit is contained in:
José F. Romaniello 2015-05-29 09:00:34 -03:00
commit 84cc16cf49
2 changed files with 25 additions and 14 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
.idea
node_modules/*

View File

@ -27,16 +27,26 @@ function noQsMethod(options) {
if(options.required){
clearTimeout(auth_timeout);
}
jwt.verify(data.token, options.secret, options, function(err, decoded) {
var onError = function(){
return socket.disconnect('unauthorized');
// error handler
var onError = function(err, code) {
if (err) {
code = code || 'unknown';
var error = new UnauthorizedError(code, {
message: (Object.prototype.toString.call(err) === '[object Object]' && err.message) ? err.message : err
});
socket.emit('unauthorized', error, function() {
socket.disconnect('unauthorized');
});
return; // stop logic, socket will be close on next tick
}
};
if (err) {
onError();
return onError(err, 'invalid_token');
}
// success handler
var onSuccess = function(){
socket.decoded_token = decoded;
socket.emit('authenticated');
@ -47,9 +57,9 @@ function noQsMethod(options) {
}
};
if(options.additional_auth){
options.additional_auth(decoded, onSuccess, onError);
}else{
if(options.additional_auth && typeof options.additional_auth === 'function') {
options.options.additional_auth(decoded, onSuccess, onError);
} else {
onSuccess();
}
});