v1.1.3 use latest meshblu-core-manager-token

Author: peterdemartini

package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshblu-core-task-check-token-cache",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Meshblu Core Check Token Cache",
   "main": "index.js",
   "scripts": {
@@ -23,18 +23,18 @@
     "meshblu"
   ],
   "dependencies": {
-    "meshblu-core-manager-token": "^5.1.0"
+    "meshblu-core-manager-token": "^7.6.0"
   },
   "devDependencies": {
     "chai": "^3.4.0",
-    "fakeredis": "^1.0.3",
-    "mocha": "^2.3.3",
-    "mocha-multi": "^0.9.1",
+    "fakeredis": "^2.0.0",
+    "mocha": "^3.2.0",
+    "mocha-multi": "^0.10.0",
     "mocha-osx-reporter": "^0.1.2",
-    "nyc": "^8.3.0",
-    "sinon": "^1.17.2",
+    "nyc": "^10.2.0",
+    "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
-    "uuid": "^2.0.1"
+    "uuid": "^3.0.1"
   },
   "nyc": {
     "cache": true,

src/check-token-cache.coffee

@@ -1,11 +1,10 @@
-crypto       = require 'crypto'
 http         = require 'http'
 TokenManager = require 'meshblu-core-manager-token'
 
 class CheckTokenCache
   constructor: (options={}) ->
-    {cache,pepper,uuidAliasResolver} = options
-    @tokenManager = new TokenManager {cache, pepper, uuidAliasResolver}
+    {@cache,pepper,@uuidAliasResolver} = options
+    @tokenManager = new TokenManager {pepper,@uuidAliasResolver}
 
   _doCallback: (request, code, callback) =>
     response =
@@ -18,9 +17,14 @@ class CheckTokenCache
   do: (request, callback) =>
     {uuid,token} = request.metadata.auth ? {}
     return @_doCallback request, 404, callback unless uuid? and token?
-
-    @tokenManager.checkTokenCache {uuid, token}, (error, result) =>
+    @checkTokenCache { uuid, token }, (error, result) =>
       return callback error if error?
       @_doCallback request, (if result then 204 else 404), callback
 
+  checkTokenCache: ({ uuid, token }, callback) =>
+    @uuidAliasResolver.resolve uuid, (error, uuid) =>
+      return callback error if error?
+      hashedToken = @tokenManager.hashToken { uuid, token }
+      @cache.exists "#{uuid}:#{hashedToken}", callback
+
 module.exports = CheckTokenCache

test/check-token-cache-spec.coffee

@@ -1,10 +1,10 @@
+{describe,beforeEach,it,expect} = global
 CheckTokenCache = require '../src/check-token-cache'
-crypto = require 'crypto'
 redis  = require 'fakeredis'
 uuid   = require 'uuid'
 
 describe 'CheckTokenCache', ->
-  beforeEach ->
+  beforeEach 'init task', ->
     @redisKey = uuid.v1()
     @uuidAliasResolver = resolve: (uuid, callback) => callback null, uuid
     @sut = new CheckTokenCache
@@ -14,19 +14,20 @@ describe 'CheckTokenCache', ->
     @cache = redis.createClient @redisKey
 
   describe '->do', ->
-    beforeEach (done) ->
+    beforeEach 'set token', (done) ->
       @cache.set 'barber-slips:SPm/FSHcK75+KK0L2IPO7fas6zdlbPlYT3BLOWt9BiA=', '', done
 
     describe 'when the uuid/token combination is in the cache', ->
-      beforeEach (done) ->
+      beforeEach 'do request', (done) ->
         request =
           metadata:
             responseId: 'asdf'
             auth:
               uuid:  'barber-slips'
               token: 'Just a little off the top'
 
-        @sut.do request, (error, @response) => done error
+        @sut.do request, (error, @response) =>
+          done error
 
       it 'should respond with a 204', ->
         expect(@response).to.deep.equal

test/mocha.opts

@@ -2,4 +2,3 @@
 --compilers coffee:coffee-script
 --require coffee-script/register
 --require test/test_helper.coffee
---require coffee-coverage/register-istanbul