Fix compatibility with crypto.DEFAULT_ENCODING global changes

Author: dougwilson

HISTORY.md

@@ -1,3 +1,8 @@
+unreleased
+==========
+
+  * Fix compatibility with `crypto.DEFAULT_ENCODING` global changes
+
 2.0.6 / 2015-02-13
 ==================
 

index.js

@@ -1,11 +1,20 @@
 
+/**
+ * Module dependencies.
+ */
+
 var rndm = require('rndm')
 var scmp = require('scmp')
 var uid = require('uid-safe')
 var crypto = require('crypto')
 var escape = require('base64-url').escape
 
+/**
+ * Module exports.
+ */
+
 module.exports = csrfTokens
+module.exports.tokenize = tokenize
 
 function csrfTokens(options) {
   options = options || {}
@@ -61,12 +70,10 @@ function csrfTokens(options) {
   }
 }
 
-csrfTokens.tokenize = function tokenize(secret, salt) {
+function tokenize(secret, salt) {
   var hash = escape(crypto
     .createHash('sha1')
-    .update(salt)
-    .update('-')
-    .update(secret)
+    .update(salt + '-' + secret, 'ascii')
     .digest('base64'))
   return salt + '-' + hash
 }

test/test.js

@@ -1,5 +1,6 @@
 
 var assert = require('assert')
+var crypto = require('crypto')
 
 var csrf = require('..')()
 
@@ -40,6 +41,25 @@ describe('CSRF Tokens', function () {
         assert(!~token.indexOf('='))
       }
     })
+
+    describe('when crypto.DEFAULT_ENCODING altered', function () {
+      var defaultEncoding
+
+      before(function () {
+        defaultEncoding = crypto.DEFAULT_ENCODING
+        crypto.DEFAULT_ENCODING = 'hex'
+      })
+
+      after(function () {
+        crypto.DEFAULT_ENCODING = defaultEncoding
+      })
+
+      it('should creaate a token', function () {
+        var token = csrf.create(secret)
+        assert.equal('string', typeof token)
+        assert(~token.indexOf('-'))
+      })
+    })
   })
 
   describe('.verify()', function () {