Make LoggedOut page wait to redirect until iframes are loaded

source/Core/Services/DefaultViewService/HttpAssets/app/app.js

@@ -56,18 +56,33 @@ window.identityServer = (function () {
                 }
             };
         });
+
+        app.directive('iframeOnload', function () {
+            var model = identityServer.getModel();
+            return {
+                link: function (scope, elem, attrs) {
+                    elem.on('load', function (event) {
+                        if (!model.autoRedirect || !model.redirectUrl) return;
+                        if ($("iframe.signout").length > 1) {
+                            event.target.remove();
+                        } else {
+                            window.location = model.redirectUrl;
+                        };
+                    });
+                }
+            };
+        });
     })();
 
     (function () {
         var model = identityServer.getModel();
         angular.module("app").constant("Model", model);
         if (model.autoRedirect && model.redirectUrl) {
-            if (model.autoRedirectDelay < 0) {
-                model.autoRedirectDelay = 0;
+            if (model.autoRedirectDelay > 0) {
+                window.setTimeout(function () {
+                    window.location = model.redirectUrl;
+                }, model.autoRedirectDelay * 1000);
             }
-            window.setTimeout(function () {
-                window.location = model.redirectUrl;
-            }, model.autoRedirectDelay * 1000);
         }
     })();
 

source/Core/Services/DefaultViewService/PageAssets/loggedOut.html

@@ -7,5 +7,5 @@ <h1>
         Click <a ng-href="{{model.redirectUrl}}">here</a> to return to the
         <span ng-bind="model.clientName"></span> application.
     </div>
-    <iframe class="signout" ng-repeat="url in model.iFrameUrls" ng-src="{{url}}"></iframe>
+    <iframe class="signout" ng-repeat="url in model.iFrameUrls" ng-src="{{url}}" iframe-onload></iframe>
 </div>