Merge pull request #112 from Apes2getherStrong/WTG-4-expired-token-ha…

…ndling

Wtg 4 expired token handling

src/app/app-routing.module.ts

@@ -10,6 +10,7 @@ import {RouteListComponent} from "./route/route-list/route-list.component";
 import {RegisterComponent} from "./user/register/register.component";
 import {MapLocationEditComponent} from "./map-location/map-location-edit/map-location-edit.component";
 import {AuthGuardService} from "./auth/auth-guard.service";
+import {CanEditService} from "./auth/can-edit.service";
 
 
 
@@ -98,7 +99,7 @@ const routes: Routes = [
   },
   {
     path: 'yourRoutes/:id/edit',
-    canActivate: [AuthGuardService],
+    canActivate: [AuthGuardService,CanEditService],
     component: RouteEditComponent
   },
   {

src/app/auth/can-edit.service.ts

@@ -0,0 +1,37 @@
+import {Injectable} from '@angular/core';
+import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from "@angular/router";
+import {AuthService} from "./auth.service";
+import {Observable} from "rxjs";
+import {UserService} from "../user/user.service";
+import {RouteService} from "../route/route.service";
+import {Route} from "../route/route.model";
+
+@Injectable({
+  providedIn: 'root'
+})
+export class CanEditService implements CanActivate {
+
+  constructor(private authService: AuthService, private router: Router, private routeService: RouteService) {
+  }
+
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ): Observable<boolean> | Promise<boolean> | boolean {
+    const tokenUserId = this.authService.getUserId();
+
+    let routeId: string | null = null;
+    if (route.paramMap.has('id')) {
+      routeId = route.paramMap.get('id');
+      this.routeService.getRouteById(routeId).subscribe(
+        (route) => {
+          if (tokenUserId === route.user.id) {
+          } else {
+            this.router.navigate(['/']);
+          }
+        },
+      )
+    }
+    return true
+  }
+}

src/app/interceptors/jwt.interceptor.ts

@@ -1,11 +1,13 @@
 import { HttpInterceptorFn } from '@angular/common/http';
 import {inject} from "@angular/core";
 import {AuthService} from "../auth/auth.service";
+import {Router} from "@angular/router";
+import {catchError, throwError} from "rxjs";
 
 export const jwtInterceptor: HttpInterceptorFn = (req, next) => {
   const authService = inject(AuthService);
-  const token = authService.getToken();
 
+  const token = authService.getToken();
 
   if (token) {
     req = req.clone({