AI Implementation feature(842): First-Start Create Admin Modal 1.01 (#4)

2026-07-21 15:32:51 +00:00
parent 960516a7bc
commit 6feaf08bdb
17 changed files with 834 additions and 217 deletions
@@ -2,17 +2,24 @@ import { inject } from '@angular/core';
 import { CanActivateFn, Router } from '@angular/router';
 import { AuthService } from '../services/auth.service';
 import { BootstrapService } from '../services/bootstrap.service';
+import { decideAuthRedirect } from './auth.guard.decision';

-export const authGuard: CanActivateFn = () => {
+export { decideAuthRedirect } from './auth.guard.decision';
+export type { AuthGuardInput } from './auth.guard.decision';
+
+export const authGuard: CanActivateFn = async () => {
  const auth = inject(AuthService);
  const bootstrap = inject(BootstrapService);
  const router = inject(Router);

-  if (!bootstrap.initialized()) {
-    return router.createUrlTree(['/bootstrap']);
-  }
-  if (!auth.isAuthenticated()) {
-    return router.createUrlTree(['/login']);
-  }
-  return true;
+  await bootstrap.ready();
+  await auth.waitUntilHydrated();
+
+  return decideAuthRedirect(
+    {
+      initialized: bootstrap.initialized(),
+      isAuthenticated: auth.isAuthenticated(),
+    },
+    router,
+  );
 };