export isAuthenticated guard

Author: chriskapp

projects/fusio-sdk/src/lib/guard/authentication.guard.ts

@@ -1,27 +1,14 @@
-import {Injectable} from '@angular/core';
-import {
-  ActivatedRouteSnapshot,
-  Router,
-  RouterStateSnapshot,
-  UrlTree
-} from '@angular/router';
-import {Observable} from 'rxjs';
+import {inject} from '@angular/core';
+import {Router} from '@angular/router';
 import {ConsumerService} from "../service/consumer.service";
 
-@Injectable({
-  providedIn: 'root'
-})
-export class AuthenticationGuard {
+export const isAuthenticated = () => {
+  const consumer = inject(ConsumerService);
+  const router = inject(Router);
 
-  constructor(private consumer: ConsumerService, private router: Router) {
+  if (consumer.hasValidToken()) {
+    return true;
+  } else {
+    return router.createUrlTree(['login']);
   }
-
-  isAuthenticated(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-    if (this.consumer.hasValidToken()) {
-      return true;
-    } else {
-      return this.router.createUrlTree(['login']);
-    }
-  }
-
-}
+};

projects/fusio-sdk/src/lib/route/account-route.ts

@@ -6,13 +6,11 @@ import {ListComponent as AppListComponent} from '../component/app/list/list.comp
 import {ListComponent as EventListComponent} from '../component/event/list/list.component';
 import {SubscriptionComponent} from "../component/subscription/subscription.component";
 import {CallbackComponent} from "../component/subscription/callback/callback.component";
-import {AuthenticationGuard} from "../guard/authentication.guard";
+import {isAuthenticated} from "../guard/authentication.guard";
 
 export class AccountRoute {
 
   public static getAll(): Routes {
-    const isAuthenticated = inject(AuthenticationGuard).isAuthenticated;
-
     return [
       {path: '', component: AccountComponent, canActivate: [isAuthenticated] },
       {path: 'security', component: SecurityComponent, canActivate: [isAuthenticated] },