@resolveio/client-lib-core 1.1.12 → 1.1.14

package/fesm2020/resolveio-client-lib-core.mjs

@@ -1557,13 +1557,13 @@ class AccountManagerService {
     }
     logOut() {
         return new Promise((resolve, reject) => {
+            this._router.navigateByUrl('/home');
             setTimeout(() => {
                 this.user.next(null);
                 this._token.removeToken('refreshToken');
                 this._token.removeToken('accessToken');
                 this._offline.removeUser();
                 this.closeSocket();
-                this._router.navigateByUrl('/home');
                 resolve(true);
             }, 500);
         });
@@ -7410,35 +7410,44 @@ class HomeComponent extends BaseComponent {
             ]
         };
         this.selectedSolution = 'Asset';
-        this.subscription$ = [];
+        this.loggingOut$ = null;
+        this.subscription$ = null;
     }
     ngOnInit() {
         this._services._app.setNavbarModuleData(this.menuData);
-        if (!this._app.isLoggingOut.getValue()) {
-            if (this._services._account.getUser()) {
-                if (this._services._account.getUser().settings && this._services._account.getUser().settings.opening_route && this._services._account.getUser().settings.opening_route !== '/home') {
-                    this._services._router.navigateByUrl(this._services._account.getUser().settings.opening_route);
-                }
-                else if (this._services._router.url !== '/home') {
-                    this._services._router.navigateByUrl('/home');
-                }
-            }
-            else {
-                this.subscription$.push(this._services._account.user.subscribe(user => {
-                    if (user && user.settings && user.settings.opening_route && user.settings.opening_route !== '/home') {
-                        this._services._router.navigateByUrl(user.settings.opening_route);
+        this.loggingOut$ = this._app.isLoggingOut.subscribe(isLoggingOut => {
+            if (!isLoggingOut) {
+                if (this._services._account.getUser()) {
+                    if (this._services._account.getUser().settings && this._services._account.getUser().settings.opening_route && this._services._account.getUser().settings.opening_route !== '/home') {
+                        this._services._router.navigateByUrl(this._services._account.getUser().settings.opening_route);
                     }
                     else if (this._services._router.url !== '/home') {
                         this._services._router.navigateByUrl('/home');
                     }
-                }, () => { }));
+                }
+                else {
+                    if (this.subscription$) {
+                        this.subscription$.unsubscribe();
+                    }
+                    this.subscription$ = this._services._account.user.subscribe(user => {
+                        if (user && user.settings && user.settings.opening_route && user.settings.opening_route !== '/home') {
+                            this._services._router.navigateByUrl(user.settings.opening_route);
+                        }
+                        else if (this._services._router.url !== '/home') {
+                            this._services._router.navigateByUrl('/home');
+                        }
+                    }, () => { });
+                }
             }
-        }
+        });
     }
     ngOnDestroy() {
-        this.subscription$.forEach(sub => {
-            sub.unsubscribe();
-        });
+        if (this.subscription$) {
+            this.subscription$.unsubscribe();
+        }
+        if (this.loggingOut$) {
+            this.loggingOut$.unsubscribe();
+        }
     }
 }
 HomeComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.1", ngImport: i0, type: HomeComponent, deps: [{ token: i1$3.ActivatedRoute }, { token: AuthService }, { token: ProviderService }, { token: i4.HttpClient }, { token: CoreService }], target: i0.ɵɵFactoryTarget.Component });