Defer loading of token sessions until they are accessed

Fixes #895

red/api/auth/tokens.js

@@ -32,6 +32,8 @@ var sessionExpiryTime
 
 var sessions = {};
 
+var loadedSessions = null;
+
 function expireSessions() {
     var now = Date.now();
     var modified = false;
@@ -50,27 +52,37 @@ function expireSessions() {
         return when.resolve();
     }
 }
+function loadSessions() {
+    if (loadedSessions === null) {
+        loadedSessions = storage.getSessions().then(function(_sessions) {
+             sessions = _sessions||{};
+             return expireSessions();
+        });
+    }
+    return loadedSessions;
+}
 
 module.exports = {
     init: function(adminAuthSettings, _storage) {
         storage = _storage;
-        
         sessionExpiryTime = adminAuthSettings.sessionExpiryTime || 604800; // 1 week in seconds
-        
-        return storage.getSessions().then(function(_sessions) {
-             sessions = _sessions||{};
-             return expireSessions();
-        });
+        // At this point, storage will not have been initialised, so defer loading
+        // the sessions until there's a request for them.
+        loadedSessions = null;
+        return when.resolve();
     },
     get: function(token) {
+        return loadSessions().then(function() {
             if (sessions[token]) {
                 if (sessions[token].expires < Date.now()) {
                     return expireSessions().then(function() { return null });
                 }
             }
             return when.resolve(sessions[token]);
+        });
     },
     create: function(user,client,scope) {
+        return loadSessions().then(function() {
             var accessToken = generateToken(128);
 
             var accessTokenExpiresAt = Date.now() + (sessionExpiryTime*1000);
@@ -89,10 +101,12 @@ module.exports = {
                     expires_in: sessionExpiryTime
                 }
             });
+        });
     },
     revoke: function(token) {
+        return loadSessions().then(function() {
             delete sessions[token];
             return storage.saveSessions(sessions);
+        });
     }
 }
-

test/red/api/auth/tokens_spec.js

@@ -24,12 +24,7 @@ var Tokens = require("../../../../red/api/auth/tokens");
 describe("Tokens", function() {
     describe("#init",function() {
         it('loads sessions', function(done) {
-            Tokens.init({},{
-                getSessions:function() {
-                    done();
-                    return when.resolve();
-                }
-            });
+            Tokens.init({}).then(done);
         });
     });