Merge pull request #169 from fangebee/fix-107-sso-autologin

Fix autologin with SAML/SSO and external XMPP server

1 files changed, 6 insertions, 6 deletions

diff --git a/ts/Bootstrap.ts b/ts/Bootstrap.ts
index 8b742d9..9f60244 100644
--- a/ts/Bootstrap.ts
+++ b/ts/Bootstrap.ts
@@ -136,15 +136,15 @@ export default class Bootstrap {
    }
 
    private async onUserRequestsToGoOnline() {
-      if (!Storage.get().getItem('serverIsOmniscient') && OJSXC_CONFIG.serverType !== 'internal') {
-         this.jsxc.showLoginBox();
-
-         return;
-      }
-
       try {
          let settings = await Settings.loadConnection(undefined, undefined);
 
+         if (!Storage.get().getItem('serverIsOmniscient') && OJSXC_CONFIG.serverType !== 'internal') {
+            this.jsxc.showLoginBox();
+
+            return;
+         }
+
          if (!settings) {
             throw new Error('No settings provided');
          }