Login and logout are promises, should be awaited

Author: dominiquekleeven

frontend/src/index.ts

@@ -37,10 +37,8 @@ setupConsoleLogging();
 async function init() {
     console.info('Context:', IS_EMBEDDED ? 'iframe' : 'standalone');
 
-    const authenticated = await AuthService.init(getRealmParam() ?? 'master');
-    if (!authenticated) {
-        AuthService.login();
-    }
+    await AuthService.init(getRealmParam() ?? 'master');
+
     // Setup OR icons
     setupORIcons();
 

frontend/src/pages/app-layout.ts

@@ -34,9 +34,9 @@ export class AppLayout extends LitElement {
     realm = '';
 
     // Called before the initial Vaadin Router location is entered ('/'), only called once since its a parent route
-    onBeforeEnter(location: RouterLocation) {
+    async onBeforeEnter(location: RouterLocation) {
         if (!AuthService.authenticated) {
-            AuthService.login();
+            await AuthService.login();
             return;
         }
 

frontend/src/services/auth-service.ts

@@ -95,15 +95,15 @@ class AuthServiceClass {
     /**
      * Login to the Keycloak instance
      */
-    login() {
-        this.keycloak?.login();
+    async login() {
+        await this.keycloak?.login();
     }
 
     /**
      * Logout from the Keycloak instance
      */
-    logout() {
-        this.keycloak?.logout();
+    async logout() {
+        await this.keycloak?.logout();
         this.stopUpdateTokenInterval();
     }