Trying to fix faulty navigation

src/main/webapp/app/core/auth/account.service.ts

@@ -60,7 +60,7 @@ export class AccountService {
           }
 
           if (account) {
-            this.navigateToStoredUrl();
+            this.navigateToStoredUrl().then(() => this.stateStorageService.clearUrl());
           }
         }),
         shareReplay()
@@ -85,12 +85,13 @@ export class AccountService {
     return this.http.get<Account>(SERVER_API_URL + 'api/account');
   }
 
-  private navigateToStoredUrl(): void {
+  private navigateToStoredUrl(): Promise<boolean> {
     // previousState can be set in the authExpiredInterceptor and in the userRouteAccessService
     // if login is successful, go to stored previousState and clear previousState
     const previousUrl = this.stateStorageService.getUrl();
     if (previousUrl) {
-      this.router.navigateByUrl(previousUrl).then(() => this.stateStorageService.clearUrl());
+      return this.router.navigateByUrl(previousUrl);
     }
+    return Promise.resolve(false);
   }
 }