Moved the logout callbacks to earlier in the callback chain. See http…

…s://stackoverflow.com/questions/63993671/for-keycloak-angular-cordova-app-logout-only-seems-to-work-if-done-within-a/64908325#64908325
emaung · Nov 19, 2020 · 546b6a7 · 546b6a7
1 parent 5fe6184
commit 546b6a7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/adapters/oidc/js/src/main/resources/keycloak.js b/adapters/oidc/js/src/main/resources/keycloak.js
@@ -1421,6 +1421,8 @@
 
                         ref.addEventListener('loadstart', function(event) {
                             if (event.url.indexOf('http://localhost') == 0) {
+                                kc.clearToken();
+                                promise.setSuccess();
                                 ref.close();
                             }
                         });
@@ -1430,16 +1432,19 @@
                                 ref.close();
                             } else {
                                 error = true;
+                                promise.setError();
                                 ref.close();
                             }
                         });
 
                         ref.addEventListener('exit', function(event) {
                             if (error) {
-                                promise.setError();
+                                // now handled in loaderror case
+                                // promise.setError();
                             } else {
-                                kc.clearToken();
-                                promise.setSuccess();
+                                // now handles on loadStart
+                                // kc.clearToken();
+                                // promise.setSuccess();
                             }
                         });