From 8cce025b653ac78b02ca717ad4d254db23a98f96 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 31 Jan 2019 14:59:10 -0500
Subject: [PATCH] (js) Improve CAS handling

---
 UI/WebServerResources/js/Common/Common.app.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/UI/WebServerResources/js/Common/Common.app.js b/UI/WebServerResources/js/Common/Common.app.js
index d08414e33..6b42481e0 100644
--- a/UI/WebServerResources/js/Common/Common.app.js
+++ b/UI/WebServerResources/js/Common/Common.app.js
@@ -317,20 +317,17 @@
                 // Already attempted once -- reload page
                 angular.element($window).off('beforeunload');
                 $window.location.href = $window.ApplicationBaseURL;
+                deferred.resolve();
               }
               else {
                 // Once the browser has followed the redirection, send the initial request
                 $timeout(function() {
                   var $http = $injector.get('$http');
-                  $http(rejection.config)
-                    .then(function() {
-                      $window.recovered = true;
-                      $timeout(iframe.remove, 500);
-                      return deferred.resolve();
-                    }, function () {
-                      $window.recovered = true;
-                      return deferred.reject(); // Will reload the page
-                    });
+                  $http(rejection.config).then(function() {
+                    $timeout(iframe.remove, 500);
+                  });
+                  $window.recovered = true;
+                  deferred.reject(); // Will reload the page
                 }, 500); // Wait before replaying the request
               }
             });