Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/jwt.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,17 @@ jwt.decode = function jwt_decode(token, key, noVerify, algorithm) {
* @return {String} token
* @api public
*/
jwt.encode = function jwt_encode(payload, key, algorithm, options) {
jwt.encode = function jwt_encode(payload, key, options, algorithm) {
// Check key
if (!key) {
throw new Error('Require key');
}

if(options.expiresIn != undefined) {
payload.iat = Date.now();
payload.exp = Date.now()+options.expiresIn;
}

// Check algorithm, default is HS256
algorithm = algorithm || 'HS256';

Expand Down Expand Up @@ -135,8 +140,8 @@ function verify(input, key, method, type, signature) {

else if(type == "sign") {
return crypto.createVerify(method)
.update(input)
.verify(key, base64urlUnescape(signature), 'base64');
.update(input)
.verify(key, base64urlUnescape(signature), 'base64');
}

else {
Expand Down Expand Up @@ -171,7 +176,7 @@ function base64urlUnescape(str) {
}

function base64urlEncode(str) {
return base64.encode(str);
return base64urlEscape(base64.encode(str));
}

function base64urlEscape(str) {
Expand Down