Merge pull request DuendeArchive#304 from pawepaw/dev

fixes DuendeArchive#303. start monitoring session after session iframe is fully loaded

Author: brockallen

dist/oidc-client.js

@@ -18,21 +18,28 @@ export default class CheckSessionIFrame {
         this._frame = window.document.createElement("iframe");
         this._frame.style.display = "none";
         this._frame.src = url;
-        window.document.body.appendChild(this._frame);
 
-        this._boundMessageEvent = this._message.bind(this);
-        window.addEventListener("message", this._boundMessageEvent, false);
     }
+    load() {
+        return new Promise((resolve) => {
+            this._frame.onload = () => {
+                resolve();
+            }
 
+            window.document.body.appendChild(this._frame);
+            this._boundMessageEvent = this._message.bind(this);
+            window.addEventListener("message", this._boundMessageEvent, false);
+        });
+    }
     _message(e) {
         if (e.origin === this._frame_origin &&
             e.source === this._frame.contentWindow
         ) {
-            if (e.data === "error"){
+            if (e.data === "error") {
                 Log.error("error message from check session op iframe");
                 this.stop();
             }
-            else if (e.data === "changed"){
+            else if (e.data === "changed") {
                 Log.debug("changed message from check session op iframe");
                 this.stop();
                 this._callback();
@@ -42,13 +49,12 @@ export default class CheckSessionIFrame {
             }
         }
     }
-
     start(session_state) {
         if (this._session_state !== session_state) {
             Log.debug("CheckSessionIFrame.start");
 
             this.stop();
-            
+
             this._session_state = session_state;
 
             this._timer = window.setInterval(() => {

dist/oidc-client.min.js

@@ -58,7 +58,9 @@ export default class SessionMonitor {
                         let interval = this._checkSessionInterval;
 
                         this._checkSessionIFrame = new this._CheckSessionIFrameCtor(this._callback.bind(this), client_id, url, interval);
-                        this._checkSessionIFrame.start(session_state);
+                        this._checkSessionIFrame.load().then(() => {
+                            this._checkSessionIFrame.start(session_state);
+                        });
                     }
                     else {
                         Log.warn("No check session iframe found in the metadata");
@@ -98,7 +100,7 @@ export default class SessionMonitor {
 
                     if (session.sid === this._sid) {
                         Log.debug("Same sub still logged in at OP, restarting check session iframe; session_state:", session.session_state);
-                    } 
+                    }
                     else {
                         Log.debug("Same sub still logged in at OP, session state has changed, restarting check session iframe; session_state:", session.session_state);
                         this._userManager.events._raiseUserSessionChanged();