Fix error behavior to not assume they need to reauth

uPortal-Attic · Aug 30, 2016 · 48de451 · 48de451
1 parent fbce8d8
commit 48de451
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/uw-frame-components/portal/timeout/controllers.js b/uw-frame-components/portal/timeout/controllers.js
@@ -3,8 +3,8 @@
 define(['angular'], function(angular) {
   var app = angular.module('portal.timeout.controllers', []);
 
-  app.controller('PortalTimeoutController', ['$location', '$timeout', '$mdDialog', 'MISC_URLS', 'PortalShibbolethService',
-  function($location, $timeout, $mdDialog, MISC_URLS, PortalShibbolethService){
+  app.controller('PortalTimeoutController', ['$log', '$location', '$timeout', '$mdDialog', 'MISC_URLS', 'PortalShibbolethService',
+  function($log, $location, $timeout, $mdDialog, MISC_URLS, PortalShibbolethService){
     function init(){
       if(PortalShibbolethService.shibServiceActivated()) {
         //initialize timeout and dialog
@@ -13,7 +13,7 @@ define(['angular'], function(angular) {
             if(timeoutData && timeoutData.expirationMills) {
               $timeout(triggerDialog, timeoutData.expirationMills);
             } else {
-              triggerDialog();
+              $log.info("Timeout data could not be found");
             }
           }
         );

diff --git a/uw-frame-components/portal/timeout/services.js b/uw-frame-components/portal/timeout/services.js
@@ -25,7 +25,7 @@ define(['angular', 'jquery'], function(angular, $) {
           }
 
           function onGetTimeoutSuccess(session){
-            if(session) {
+            if(session && angular.isObject(session)) {
               var timeout = {};
               timeout.expirationMinutes = session.expiration;
               var now = new Date();