diff --git a/red/api/auth/tokens/index.js b/red/api/auth/tokens/index.js index cda2f9817..b5c5bc61f 100644 --- a/red/api/auth/tokens/index.js +++ b/red/api/auth/tokens/index.js @@ -50,15 +50,7 @@ module.exports = { sessionModule.init(settings); }, get: function(token) { - return sessionModule.get(token).then(function(session) { - if (session && session.accessExpires < Date.now()) { - return sessionModule.delete(token).then(function() { - return null; - }); - } else { - return session; - } - }) + return sessionModule.get(token); }, create: function(user,client,scope) { var accessToken = generateToken(128); diff --git a/test/red/api/auth/tokens/index_spec.js b/test/red/api/auth/tokens/index_spec.js index c52dace6c..8c797f2a6 100644 --- a/test/red/api/auth/tokens/index_spec.js +++ b/test/red/api/auth/tokens/index_spec.js @@ -67,7 +67,7 @@ describe("Tokens", function() { Tokens.init({sessionStorageModule:{ init:function(settings){}, get: function(token) { - return when.resolve({user:"fred",accessExpires: Date.now()+10000}); + return when.resolve({user:"fred"}); } }}); @@ -80,27 +80,6 @@ describe("Tokens", function() { } }); }); - it('deletes an expired token and returns null', function(done) { - var sessionStorageModule = { - init:function(settings){}, - get: function(token) { - return when.resolve({user:"fred",accessExpires: Date.now()-10000}); - }, - delete: sinon.stub().returns(when.resolve()) - }; - - Tokens.init({sessionStorageModule:sessionStorageModule}); - - Tokens.get("1234").then(function(token) { - try { - should.not.exist(token); - sessionStorageModule.delete.calledWith("1234").should.be.true; - done(); - } catch(err) { - done(err); - } - }); - }); it('returns null for an invalid token', function(done) { Tokens.init({sessionStorageModule:{