fix: redirect to connect

690pmb · Nov 2, 2023 · 1aadbc6 · 1aadbc6
1 parent 6d2de0b
commit 1aadbc6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,5 +1,3 @@
-import {filter} from 'rxjs/operators';
-import {Router, NavigationStart} from '@angular/router';
 import {Component, OnInit} from '@angular/core';
 import {TranslateService} from '@ngx-translate/core';
 
@@ -17,7 +15,6 @@ import {MenuService} from './service/menu.service';
 })
 export class AppComponent implements OnInit {
   constructor(
-    private router: Router,
     private tabsService: TabsService,
     private auth: AuthService,
     private myDatasService: MyDatasService<Data>,
@@ -27,12 +24,10 @@ export class AppComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.router.events
-      .pipe(filter(event => event instanceof NavigationStart))
-      .subscribe((event: NavigationStart) => {
-        this.tabsService.onNavigation(event);
-      });
-    this.menuService.event$.subscribe(() => window.scrollTo(0, 0));
+    this.menuService.event$.subscribe(event => {
+      this.tabsService.onNavigation(event);
+      window.scrollTo(0, 0);
+    });
     this.auth.getCurrentUser().subscribe(user => {
       if (user) {
         this.myDatasService

diff --git a/src/app/application-modules/login/connect/connect.component.html b/src/app/application-modules/login/connect/connect.component.html
@@ -58,6 +58,7 @@ <h2>{{ 'login.connect.title' | translate }}:</h2>
           {{ 'login.connect.log_in' | translate }}
         </button>
         <button
+          type="button"
           class="btn btn-outline-primary"
           (click)="cancel()"
           *ngIf="cancel$ | async"

diff --git a/src/app/service/auth.service.ts b/src/app/service/auth.service.ts
@@ -62,7 +62,7 @@ export class AuthService {
         if (!user || !user.id) {
           user = AuthService.decodeToken();
           if (!user || !user.id) {
-            this.logout();
+            return undefined;
           }
         }
         return user;

diff --git a/src/app/service/tabs.service.ts b/src/app/service/tabs.service.ts
@@ -1,6 +1,6 @@
 import {BehaviorSubject} from 'rxjs';
 import {Injectable} from '@angular/core';
-import {Router, NavigationStart} from '@angular/router';
+import {Router, NavigationEnd} from '@angular/router';
 
 import {Link} from '../model/model';
 
@@ -28,7 +28,7 @@ export class TabsService {
     localStorage.setItem('active', JSON.stringify(this.activeLink));
   }
 
-  onNavigation(event: NavigationStart): void {
+  onNavigation(event: NavigationEnd): void {
     if (!event.url.includes('/login/connect')) {
       this.liens[this.liens.map(l => l.url).indexOf(this.activeLink.url)].url =
         event.url;