Merge pull request #1622 from thostetler/fix-bootstrap-persistence

adsabs · Oct 25, 2018 · 90baa54 · 90baa54
2 parents e7fdd91 + 869336a
commit 90baa54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/js/apps/discovery/main.js b/src/js/apps/discovery/main.js
@@ -37,7 +37,10 @@ define(['config', 'module'], function (config, module) {
     var debug = window.location.href.indexOf('debug=true') > -1;
 
     // app object will load everything
-    var app = new (Application.extend(DiscoveryBootstrap))({ debug: debug, timeout: 30000 });
+    var app = new (Application.extend(DiscoveryBootstrap))({
+      debug: debug,
+      timeout: 300000 // 5 minutes
+    });
 
     // load the objects/widgets/modules (using discovery.config.js)
     var defer = app.loadModules(module.config());

diff --git a/src/js/mixins/api_access.js b/src/js/mixins/api_access.js
@@ -38,9 +38,7 @@ function (
         var userName = data.anonymous ? undefined : data.username;
         userObject.setUser(userName);
         var storage = beehive.getService('PersistentStorage');
-        if (_.isPlainObject(storage) && _.isFunction(storage.set)) {
-          storage.set('appConfig', data);
-        }
+        storage && storage.set && storage.set('appConfig', data);
       } else {
         console.warn('bootstrap didn\'t provide access_token!');
       }