Merge pull request #134 from Kaisle/master

Add cookie support
This commit is contained in:
Conrad Sopala 2019-02-19 19:24:24 +01:00 committed by GitHub
commit 413161ce38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -35,7 +35,7 @@ function noQsMethod(options) {
message: (Object.prototype.toString.call(err) === '[object Object]' && err.message) ? err.message : err message: (Object.prototype.toString.call(err) === '[object Object]' && err.message) ? err.message : err
}); });
var callback_timeout; var callback_timeout;
// If callback explicitely set to false, start timeout to disconnect socket // If callback explicitely set to false, start timeout to disconnect socket
if (options.callback === false || typeof options.callback === "number") { if (options.callback === false || typeof options.callback === "number") {
if (typeof options.callback === "number") { if (typeof options.callback === "number") {
if (options.callback < 0) { if (options.callback < 0) {
@ -57,7 +57,9 @@ function noQsMethod(options) {
} }
}; };
if(!data || typeof data.token !== "string") { var token = options.cookie ? socket.request.cookies[options.cookie] : (data ? data.token : undefined);
if(!token || typeof token !== "string") {
return onError({message: 'invalid token datatype'}, 'invalid_token'); return onError({message: 'invalid token datatype'}, 'invalid_token');
} }
@ -96,10 +98,10 @@ function noQsMethod(options) {
return onError(err, 'invalid_secret'); return onError(err, 'invalid_secret');
} }
jwt.verify(data.token, secret, options, onJwtVerificationReady); jwt.verify(token, secret, options, onJwtVerificationReady);
}; };
getSecret(socket.request, options.secret, data.token, onSecretReady); getSecret(socket.request, options.secret, token, onSecretReady);
}); });
}; };
} }