ngx-better-auth 0.2.2 → 0.4.0

package/README.md

@@ -1,10 +1,13 @@
 # ngx-better-auth
 
-![npm](https://img.shields.io/npm/v/ngx-better-auth?style=flat-square)
-![npm bundle size](https://img.shields.io/bundlephobia/minzip/ngx-better-auth?style=flat-square)
-![license](https://img.shields.io/npm/l/ngx-better-auth?style=flat-square)
-![angular](https://img.shields.io/badge/angular-20+-dd0031?logo=angular&logoColor=white&style=flat-square)
-![better-auth](https://img.shields.io/badge/better--auth-1.3.7+-blueviolet?style=flat-square)
+![npm](https://img.shields.io/npm/v/ngx-better-auth)
+![npm bundle size](https://img.shields.io/bundlephobia/minzip/ngx-better-auth)
+![license](https://img.shields.io/npm/l/ngx-better-auth)
+![downloads](https://img.shields.io/npm/dm/ngx-better-auth)
+![GitHub stars](https://img.shields.io/github/stars/thomasorgeval/ngx-better-auth?style=flat)
+
+![angular](https://img.shields.io/badge/angular-20+-dd0031?logo=angular&logoColor=white)
+![better-auth](https://img.shields.io/badge/better--auth-1.3.7+-blueviolet)
 
 An **Angular 20+ integration for [Better Auth](https://github.com/better-auth/better-auth)**.  
 Provides reactive session handling with **signals**, clean **DI provider setup** with **observables**, and modern **guards**.
@@ -15,7 +18,7 @@ Provides reactive session handling with **signals**, clean **DI provider setup**
 
 | ngx-better-auth | Angular | Better Auth |
 |-----------------|---------|-------------|
-| `^0.1.0`        | `>=20`  | `>=1.3.7`   |
+| `latest`        | `>=20`  | `>=1.3.7`   |
 
 ---
 
@@ -48,10 +51,11 @@ export const appConfig: ApplicationConfig = {
 
 You can inject different services depending on your needs:
 
-### Global services:
+### Global services
+- `AuthService`
 - `SessionService`
 
-### Plugin services:
+### Plugin services
 - `AdminService`
 - `OrganizationService`
 
@@ -66,7 +70,20 @@ You can inject different services depending on your needs:
 import { AuthService } from "ngx-better-auth"
 import { inject } from "@angular/core"
 
-private readonly authService = inject(AuthService)
+@Component({
+    // ...
+})
+export class MyComponent {
+    private readonly authService = inject(AuthService)
+
+    get isLoggedIn() {
+        return this.authService.isLoggedIn()
+    }
+
+    get userName() {
+        return this.authService.session()?.user.name
+    }
+}
 ```
 
 ## 🛡️ Guards

package/fesm2022/ngx-better-auth.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { inject, signal, computed, Injectable, InjectionToken, makeEnvironmentProviders } from '@angular/core';
-import { defer } from 'rxjs';
+import { Observable, filter, map, shareReplay, defer } from 'rxjs';
 import { createAuthClient } from 'better-auth/client';
 import { Router } from '@angular/router';
 
@@ -17,8 +17,30 @@ class AuthService {
      * Whether there is an active session
      */
     isLoggedIn = computed(() => !!this.session()?.session, ...(ngDevMode ? [{ debugName: "isLoggedIn" }] : []));
+    /**
+     * Observable stream of the session state. Emits only when the session is resolved (not pending).
+     * This is intended for guards and other async operations.
+     */
+    sessionState$;
     constructor() {
         this.session$();
+        const useSession$ = new Observable((subscriber) => {
+            this.authClient.useSession.subscribe((value) => subscriber.next(value));
+        });
+        this.sessionState$ = useSession$.pipe(filter((session) => !session.isPending), map((session) => {
+            if (session.error) {
+                return null;
+            }
+            return session.data;
+        }), shareReplay(1));
+    }
+    /**
+     * Asynchronously checks if the user is authenticated.
+     * Ideal for route guards.
+     * @returns An Observable that emits true for an active session, and false otherwise.
+     */
+    isLoggedIn$() {
+        return this.sessionState$.pipe(map((session) => !!session?.session));
     }
     session$() {
         this.authClient.useSession.subscribe((session) => {
@@ -37,6 +59,15 @@ class AuthService {
             this.session.set(session.data);
         });
     }
+    signInEmail(data) {
+        return defer(() => this.authClient.signIn.email(data));
+    }
+    signUpEmail(data) {
+        return defer(() => this.authClient.signUp.email(data));
+    }
+    signInProvider(provider) {
+        return defer(() => this.authClient.signIn.social({ provider }));
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: AuthService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: AuthService, providedIn: 'root' });
 }
@@ -150,26 +181,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.3", ngImpor
             args: [{ providedIn: 'root' }]
         }] });
 
-class SignInService {
-    authService = inject(AuthService);
-    client = this.authService.authClient;
-    signInEmail(data) {
-        return defer(() => this.client.signIn.email(data));
-    }
-    signUpEmail(data) {
-        return defer(() => this.client.signUp.email(data));
-    }
-    signInProvider(provider) {
-        return defer(() => this.client.signIn.social({ provider }));
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: SignInService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: SignInService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: SignInService, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }] });
-
 const BETTER_AUTH_CONFIG_TOKEN = new InjectionToken('BETTER_AUTH_CONFIG');
 const DEFAULT_CONFIG = {};
 function provideBetterAuth(options) {
@@ -188,7 +199,7 @@ function redirectUnauthorizedTo(commands = ['/login']) {
     return () => {
         const auth = inject(AuthService);
         const router = inject(Router);
-        return auth.isLoggedIn() ? true : router.createUrlTree(commands);
+        return auth.isLoggedIn$().pipe(map((isLoggedIn) => (isLoggedIn ? true : router.createUrlTree(commands))));
     };
 }
 /**
@@ -198,7 +209,7 @@ function redirectLoggedInTo(commands = ['/']) {
     return () => {
         const auth = inject(AuthService);
         const router = inject(Router);
-        return auth.isLoggedIn() ? router.createUrlTree(commands) : true;
+        return auth.isLoggedIn$().pipe(map((isLoggedIn) => (isLoggedIn ? router.createUrlTree(commands) : true)));
     };
 }
 /**
@@ -209,22 +220,23 @@ function hasRole(requiredRoles, redirectTo = ['/unauthorized']) {
     return () => {
         const auth = inject(AuthService);
         const router = inject(Router);
-        const session = auth.session();
-        if (!session || !session.user) {
-            return router.createUrlTree(redirectTo);
-        }
-        const role = session?.user?.role;
-        if (Array.isArray(role)) {
-            if (role.some((r) => requiredRoles.includes(r))) {
-                return true;
+        return auth.sessionState$.pipe(map((session) => {
+            if (!session || !session.user) {
+                return router.createUrlTree(redirectTo);
             }
-        }
-        else if (typeof role === 'string') {
-            if (requiredRoles.includes(role)) {
-                return true;
+            const role = session?.user?.role;
+            if (Array.isArray(role)) {
+                if (role.some((r) => requiredRoles.includes(r))) {
+                    return true;
+                }
+            }
+            else if (typeof role === 'string') {
+                if (requiredRoles.includes(role)) {
+                    return true;
+                }
             }
-        }
-        return router.createUrlTree(redirectTo);
+            return router.createUrlTree(redirectTo);
+        }));
     };
 }
 
@@ -238,5 +250,5 @@ function canActivate(pipe) {
  * Generated bundle index. Do not edit.
  */
 
-export { AdminService, AuthService, BETTER_AUTH_CONFIG_TOKEN, OrganizationService, SessionService, SignInService, canActivate, hasRole, provideBetterAuth, redirectLoggedInTo, redirectUnauthorizedTo };
+export { AdminService, AuthService, BETTER_AUTH_CONFIG_TOKEN, OrganizationService, SessionService, canActivate, hasRole, provideBetterAuth, redirectLoggedInTo, redirectUnauthorizedTo };
 //# sourceMappingURL=ngx-better-auth.mjs.map

package/fesm2022/ngx-better-auth.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ngx-better-auth.mjs","sources":["../../../src/lib/services/auth.service.ts","../../../src/lib/utils/validate-plugin.ts","../../../src/lib/services/admin.service.ts","../../../src/lib/services/organization.service.ts","../../../src/lib/services/session.service.ts","../../../src/lib/services/sign-in.service.ts","../../../src/lib/providers.ts","../../../src/lib/guards/auth-guard.utils.ts","../../../src/lib/guards/auth-guard.factory.ts","../../../src/ngx-better-auth.ts"],"sourcesContent":["import { computed, inject, Injectable, signal } from '@angular/core'\nimport { BETTER_AUTH_CONFIG_TOKEN } from '../providers'\nimport { BetterFetchError, createAuthClient } from 'better-auth/client'\nimport { AuthSession } from '../models'\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class AuthService {\n  private readonly config = inject(BETTER_AUTH_CONFIG_TOKEN)\n\n  readonly authClient = createAuthClient({\n    ...this.config,\n  })\n\n  /**\n   * Current authenticated session\n   */\n  readonly session = signal<AuthSession | null>(null)\n\n  /**\n   * Whether there is an active session\n   */\n  readonly isLoggedIn = computed(() => !!this.session()?.session)\n\n  constructor() {\n    this.session$()\n  }\n\n  private session$() {\n    this.authClient.useSession.subscribe((session) => {\n      if (session.isPending) {\n        this.session.set(null)\n        return\n      }\n      if (session.error) {\n        const error: BetterFetchError = session.error\n        if (error.status !== 401) {\n          console.error('Error fetching session:', error)\n        }\n        this.session.set(null)\n        return\n      }\n      this.session.set(session.data)\n    })\n  }\n}\n","export function validateAdminPlugin(client: any, property: string) {\n  if (!client) {\n    throw new Error('AuthClient is not initialized.')\n  }\n\n  if (!client[property]) {\n    throw new Error(\n      `Property '${property}' is not available on authClient. Please ensure the plugin providing this property is included in the plugins array.`,\n    )\n  }\n}\n","import { inject, Injectable } from '@angular/core'\nimport { defer } from 'rxjs'\nimport { AuthService } from './auth.service'\nimport { validateAdminPlugin } from '../utils/validate-plugin'\n\n@Injectable({ providedIn: 'root' })\nexport class AdminService {\n  private readonly authService = inject(AuthService)\n\n  admin: any\n\n  constructor() {\n    const client = this.authService.authClient as { admin?: any }\n    validateAdminPlugin(client, 'admin')\n    this.admin = client.admin\n  }\n\n  setRole(data: { userId: string; role: any }) {\n    return defer(() => this.admin.setRole(data))\n  }\n\n  setUserPassword(data: { userId: string; newPassword: string }) {\n    return defer(() => this.admin.setUserPassword(data))\n  }\n\n  banUser(data: { userId: string; banReason?: string; banExpiresIn?: number }) {\n    return defer(() => this.admin.banUser(data))\n  }\n\n  unbanUser(data: { userId: string }) {\n    return defer(() => this.admin.unbanUser(data))\n  }\n\n  listUserSessions(data: { userId: string }) {\n    return defer(() => this.admin.listUserSessions(data))\n  }\n\n  revokeUserSession(data: { sessionToken: string }) {\n    return defer(() => this.admin.revokeUserSession(data))\n  }\n\n  revokeUserSessions(data: { userId: string }) {\n    return defer(() => this.admin.revokeUserSessions(data))\n  }\n\n  impersonateUser(data: { userId: string }) {\n    return defer(() => this.admin.impersonateUser(data))\n  }\n\n  stopImpersonating() {\n    return defer(() => this.admin.stopImpersonating())\n  }\n\n  removeUser(data: { userId: string }) {\n    return defer(() => this.admin.removeUser(data))\n  }\n\n  hasPermission(data: { userId?: string; permission?: any; permissions?: any }) {\n    return defer(() => this.admin.hasPermission(data))\n  }\n\n  checkRolePermission(data: { role: any; permission: any }) {\n    return this.admin.checkRolePermission(data)\n  }\n}\n","import { inject, Injectable } from '@angular/core'\nimport { defer } from 'rxjs'\nimport { AuthService } from './auth.service'\nimport { validateAdminPlugin } from '../utils/validate-plugin'\n\n@Injectable({ providedIn: 'root' })\nexport class OrganizationService {\n  private readonly authService = inject(AuthService)\n\n  organization: any\n\n  constructor() {\n    const client = this.authService.authClient as { organization?: any }\n    validateAdminPlugin(client, 'organization')\n    this.organization = client.organization\n  }\n\n  createOrganization(data: { name: string; slug: string }) {\n    return defer(() => this.organization.create(data))\n  }\n}\n","import { inject, Injectable } from '@angular/core'\nimport { AuthService } from './auth.service'\nimport { defer } from 'rxjs'\n\n@Injectable({ providedIn: 'root' })\nexport class SessionService {\n  private readonly authService = inject(AuthService)\n\n  private readonly client = this.authService.authClient\n\n  listSessions() {\n    return defer(() => this.client.listSessions())\n  }\n\n  revokeSession(sessionToken: string) {\n    return defer(() => this.client.revokeSession({ token: sessionToken }))\n  }\n\n  revokeOtherSessions() {\n    return defer(() => this.client.revokeOtherSessions())\n  }\n\n  revokeAllSessions() {\n    return defer(() => this.client.revokeSessions())\n  }\n}\n","import { inject, Injectable } from '@angular/core'\nimport { defer } from 'rxjs'\nimport { AuthService } from './auth.service'\nimport { Provider } from '../models'\n\n@Injectable({ providedIn: 'root' })\nexport class SignInService {\n  private readonly authService = inject(AuthService)\n\n  private readonly client = this.authService.authClient\n\n  signInEmail(data: { email: string; password: string; rememberMe?: boolean }) {\n    return defer(() => this.client.signIn.email(data))\n  }\n\n  signUpEmail(data: { name: string; email: string; password: string }) {\n    return defer(() => this.client.signUp.email(data))\n  }\n\n  signInProvider(provider: Provider) {\n    return defer(() => this.client.signIn.social({ provider }))\n  }\n}\n","import { EnvironmentProviders, InjectionToken, makeEnvironmentProviders } from '@angular/core'\nimport { type BetterAuthOptions } from 'better-auth'\nimport { AuthService } from './services'\n\nexport const BETTER_AUTH_CONFIG_TOKEN = new InjectionToken<BetterAuthOptions>('BETTER_AUTH_CONFIG')\n\nconst DEFAULT_CONFIG: Partial<BetterAuthOptions> = {}\n\nexport function provideBetterAuth(options: BetterAuthOptions): EnvironmentProviders {\n  const config: BetterAuthOptions = { ...DEFAULT_CONFIG, ...options }\n\n  // if baseURL is not a url, it might be because of a proxy in development\n  if (!config.baseURL?.startsWith('http')) {\n    config.baseURL = window.location.origin\n  }\n\n  return makeEnvironmentProviders([{ provide: BETTER_AUTH_CONFIG_TOKEN, useValue: config }, AuthService])\n}\n","import { inject } from '@angular/core'\nimport { Router, UrlTree } from '@angular/router'\nimport { AuthService } from '../services'\n\n/**\n * Redirects unauthorized users to the specified commands (route).\n */\nexport function redirectUnauthorizedTo(commands: string[] = ['/login']): () => UrlTree | boolean {\n  return () => {\n    const auth = inject(AuthService)\n    const router = inject(Router)\n    return auth.isLoggedIn() ? true : router.createUrlTree(commands)\n  }\n}\n\n/**\n * Redirects logged-in users to the specified commands (route).\n */\nexport function redirectLoggedInTo(commands: string[] = ['/']): () => UrlTree | boolean {\n  return () => {\n    const auth = inject(AuthService)\n    const router = inject(Router)\n    return auth.isLoggedIn() ? router.createUrlTree(commands) : true\n  }\n}\n\n/**\n * Allows access only to users with at least one of the specified roles.\n * Redirects unauthorized users to the specified commands (route).\n */\nexport function hasRole(requiredRoles: string[], redirectTo: string[] = ['/unauthorized']): () => UrlTree | boolean {\n  return () => {\n    const auth = inject(AuthService)\n    const router = inject(Router)\n\n    const session = auth.session()\n    if (!session || !session.user) {\n      return router.createUrlTree(redirectTo)\n    }\n\n    const role = session?.user?.role\n    if (Array.isArray(role)) {\n      if (role.some((r) => requiredRoles.includes(r))) {\n        return true\n      }\n    } else if (typeof role === 'string') {\n      if (requiredRoles.includes(role)) {\n        return true\n      }\n    }\n\n    return router.createUrlTree(redirectTo)\n  }\n}\n","import { CanActivateFn } from '@angular/router'\n\nexport function canActivate(pipe: () => boolean | import('@angular/router').UrlTree): { canActivate: [CanActivateFn] } {\n  return {\n    canActivate: [() => pipe()],\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"ngx-better-auth.mjs","sources":["../../../src/lib/services/auth.service.ts","../../../src/lib/utils/validate-plugin.ts","../../../src/lib/services/admin.service.ts","../../../src/lib/services/organization.service.ts","../../../src/lib/services/session.service.ts","../../../src/lib/providers.ts","../../../src/lib/guards/auth-guard.utils.ts","../../../src/lib/guards/auth-guard.factory.ts","../../../src/ngx-better-auth.ts"],"sourcesContent":["import { computed, inject, Injectable, signal } from '@angular/core'\nimport { BETTER_AUTH_CONFIG_TOKEN } from '../providers'\nimport { BetterFetchError, createAuthClient } from 'better-auth/client'\nimport { AuthSession, Provider } from '../models'\nimport { defer, filter, map, Observable, shareReplay } from 'rxjs'\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class AuthService {\n  private readonly config = inject(BETTER_AUTH_CONFIG_TOKEN)\n\n  readonly authClient = createAuthClient({\n    ...this.config,\n  })\n\n  /**\n   * Current authenticated session\n   */\n  readonly session = signal<AuthSession | null>(null)\n\n  /**\n   * Whether there is an active session\n   */\n  readonly isLoggedIn = computed(() => !!this.session()?.session)\n\n  /**\n   * Observable stream of the session state. Emits only when the session is resolved (not pending).\n   * This is intended for guards and other async operations.\n   */\n  readonly sessionState$!: Observable<AuthSession | null>\n\n  constructor() {\n    this.session$()\n\n    const useSession$ = new Observable<{\n      data: AuthSession | null\n      error: BetterFetchError | null\n      isPending: boolean\n    }>((subscriber) => {\n      this.authClient.useSession.subscribe((value) => subscriber.next(value))\n    })\n\n    this.sessionState$ = useSession$.pipe(\n      filter((session) => !session.isPending),\n      map((session) => {\n        if (session.error) {\n          return null\n        }\n        return session.data\n      }),\n      shareReplay(1),\n    )\n  }\n\n  /**\n   * Asynchronously checks if the user is authenticated.\n   * Ideal for route guards.\n   * @returns An Observable that emits true for an active session, and false otherwise.\n   */\n  isLoggedIn$(): Observable<boolean> {\n    return this.sessionState$.pipe(map((session) => !!session?.session))\n  }\n\n  private session$() {\n    this.authClient.useSession.subscribe((session) => {\n      if (session.isPending) {\n        this.session.set(null)\n        return\n      }\n      if (session.error) {\n        const error: BetterFetchError = session.error\n        if (error.status !== 401) {\n          console.error('Error fetching session:', error)\n        }\n        this.session.set(null)\n        return\n      }\n      this.session.set(session.data)\n    })\n  }\n\n  signInEmail(data: { email: string; password: string; rememberMe?: boolean }) {\n    return defer(() => this.authClient.signIn.email(data))\n  }\n\n  signUpEmail(data: { name: string; email: string; password: string }) {\n    return defer(() => this.authClient.signUp.email(data))\n  }\n\n  signInProvider(provider: Provider) {\n    return defer(() => this.authClient.signIn.social({ provider }))\n  }\n}\n","export function validateAdminPlugin(client: any, property: string) {\n  if (!client) {\n    throw new Error('AuthClient is not initialized.')\n  }\n\n  if (!client[property]) {\n    throw new Error(\n      `Property '${property}' is not available on authClient. Please ensure the plugin providing this property is included in the plugins array.`,\n    )\n  }\n}\n","import { inject, Injectable } from '@angular/core'\nimport { defer } from 'rxjs'\nimport { AuthService } from './auth.service'\nimport { validateAdminPlugin } from '../utils/validate-plugin'\n\n@Injectable({ providedIn: 'root' })\nexport class AdminService {\n  private readonly authService = inject(AuthService)\n\n  admin: any\n\n  constructor() {\n    const client = this.authService.authClient as { admin?: any }\n    validateAdminPlugin(client, 'admin')\n    this.admin = client.admin\n  }\n\n  setRole(data: { userId: string; role: any }) {\n    return defer(() => this.admin.setRole(data))\n  }\n\n  setUserPassword(data: { userId: string; newPassword: string }) {\n    return defer(() => this.admin.setUserPassword(data))\n  }\n\n  banUser(data: { userId: string; banReason?: string; banExpiresIn?: number }) {\n    return defer(() => this.admin.banUser(data))\n  }\n\n  unbanUser(data: { userId: string }) {\n    return defer(() => this.admin.unbanUser(data))\n  }\n\n  listUserSessions(data: { userId: string }) {\n    return defer(() => this.admin.listUserSessions(data))\n  }\n\n  revokeUserSession(data: { sessionToken: string }) {\n    return defer(() => this.admin.revokeUserSession(data))\n  }\n\n  revokeUserSessions(data: { userId: string }) {\n    return defer(() => this.admin.revokeUserSessions(data))\n  }\n\n  impersonateUser(data: { userId: string }) {\n    return defer(() => this.admin.impersonateUser(data))\n  }\n\n  stopImpersonating() {\n    return defer(() => this.admin.stopImpersonating())\n  }\n\n  removeUser(data: { userId: string }) {\n    return defer(() => this.admin.removeUser(data))\n  }\n\n  hasPermission(data: { userId?: string; permission?: any; permissions?: any }) {\n    return defer(() => this.admin.hasPermission(data))\n  }\n\n  checkRolePermission(data: { role: any; permission: any }) {\n    return this.admin.checkRolePermission(data)\n  }\n}\n","import { inject, Injectable } from '@angular/core'\nimport { defer } from 'rxjs'\nimport { AuthService } from './auth.service'\nimport { validateAdminPlugin } from '../utils/validate-plugin'\n\n@Injectable({ providedIn: 'root' })\nexport class OrganizationService {\n  private readonly authService = inject(AuthService)\n\n  organization: any\n\n  constructor() {\n    const client = this.authService.authClient as { organization?: any }\n    validateAdminPlugin(client, 'organization')\n    this.organization = client.organization\n  }\n\n  createOrganization(data: { name: string; slug: string }) {\n    return defer(() => this.organization.create(data))\n  }\n}\n","import { inject, Injectable } from '@angular/core'\nimport { AuthService } from './auth.service'\nimport { defer } from 'rxjs'\n\n@Injectable({ providedIn: 'root' })\nexport class SessionService {\n  private readonly authService = inject(AuthService)\n\n  private readonly client = this.authService.authClient\n\n  listSessions() {\n    return defer(() => this.client.listSessions())\n  }\n\n  revokeSession(sessionToken: string) {\n    return defer(() => this.client.revokeSession({ token: sessionToken }))\n  }\n\n  revokeOtherSessions() {\n    return defer(() => this.client.revokeOtherSessions())\n  }\n\n  revokeAllSessions() {\n    return defer(() => this.client.revokeSessions())\n  }\n}\n","import { EnvironmentProviders, InjectionToken, makeEnvironmentProviders } from '@angular/core'\nimport { type BetterAuthOptions } from 'better-auth'\nimport { AuthService } from './services'\n\nexport const BETTER_AUTH_CONFIG_TOKEN = new InjectionToken<BetterAuthOptions>('BETTER_AUTH_CONFIG')\n\nconst DEFAULT_CONFIG: Partial<BetterAuthOptions> = {}\n\nexport function provideBetterAuth(options: BetterAuthOptions): EnvironmentProviders {\n  const config: BetterAuthOptions = { ...DEFAULT_CONFIG, ...options }\n\n  // if baseURL is not a url, it might be because of a proxy in development\n  if (!config.baseURL?.startsWith('http')) {\n    config.baseURL = window.location.origin\n  }\n\n  return makeEnvironmentProviders([{ provide: BETTER_AUTH_CONFIG_TOKEN, useValue: config }, AuthService])\n}\n","import { inject } from '@angular/core'\nimport { Router, UrlTree } from '@angular/router'\nimport { AuthService } from '../services'\nimport { map, Observable } from 'rxjs'\n\n/**\n * Redirects unauthorized users to the specified commands (route).\n */\nexport function redirectUnauthorizedTo(commands: string[] = ['/login']): () => Observable<UrlTree | boolean> {\n  return () => {\n    const auth = inject(AuthService)\n    const router = inject(Router)\n    return auth.isLoggedIn$().pipe(map((isLoggedIn) => (isLoggedIn ? true : router.createUrlTree(commands))))\n  }\n}\n\n/**\n * Redirects logged-in users to the specified commands (route).\n */\nexport function redirectLoggedInTo(commands: string[] = ['/']): () => Observable<UrlTree | boolean> {\n  return () => {\n    const auth = inject(AuthService)\n    const router = inject(Router)\n    return auth.isLoggedIn$().pipe(map((isLoggedIn) => (isLoggedIn ? router.createUrlTree(commands) : true)))\n  }\n}\n\n/**\n * Allows access only to users with at least one of the specified roles.\n * Redirects unauthorized users to the specified commands (route).\n */\nexport function hasRole(requiredRoles: string[], redirectTo: string[] = ['/unauthorized']): () => Observable<UrlTree | boolean> {\n  return () => {\n    const auth = inject(AuthService)\n    const router = inject(Router)\n\n    return auth.sessionState$.pipe(\n      map((session) => {\n        if (!session || !session.user) {\n          return router.createUrlTree(redirectTo)\n        }\n\n        const role = session?.user?.role\n        if (Array.isArray(role)) {\n          if (role.some((r) => requiredRoles.includes(r))) {\n            return true\n          }\n        } else if (typeof role === 'string') {\n          if (requiredRoles.includes(role)) {\n            return true\n          }\n        }\n\n        return router.createUrlTree(redirectTo)\n      }),\n    )\n  }\n}\n","import { CanActivateFn, UrlTree } from '@angular/router'\nimport { Observable } from 'rxjs'\n\nexport function canActivate(\n  pipe: () => Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree,\n): {\n  canActivate: [CanActivateFn]\n} {\n  return {\n    canActivate: [() => pipe()],\n  }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './public-api';\n"],"names":[],"mappings":"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"}

package/index.d.ts

@@ -3,11 +3,11 @@ import { InjectionToken, EnvironmentProviders } from '@angular/core';
 import * as better_auth from 'better-auth';
 import { BetterAuthOptions } from 'better-auth';
 import * as rxjs from 'rxjs';
+import { Observable } from 'rxjs';
 import * as better_auth_client from 'better-auth/client';
 import { BetterFetchError } from 'better-auth/client';
 import { Session, User } from 'better-auth/types';
 import { SocialProviderList } from 'better-auth/social-providers';
-import * as _angular_router from '@angular/router';
 import { UrlTree, CanActivateFn } from '@angular/router';
 
 declare const BETTER_AUTH_CONFIG_TOKEN: InjectionToken<BetterAuthOptions>;
@@ -2233,90 +2233,24 @@ declare class AuthService {
      * Whether there is an active session
      */
     readonly isLoggedIn: i0.Signal<boolean>;
+    /**
+     * Observable stream of the session state. Emits only when the session is resolved (not pending).
+     * This is intended for guards and other async operations.
+     */
+    readonly sessionState$: Observable<AuthSession | null>;
     constructor();
+    /**
+     * Asynchronously checks if the user is authenticated.
+     * Ideal for route guards.
+     * @returns An Observable that emits true for an active session, and false otherwise.
+     */
+    isLoggedIn$(): Observable<boolean>;
     private session$;
-    static ɵfac: i0.ɵɵFactoryDeclaration<AuthService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<AuthService>;
-}
-
-declare class SessionService {
-    private readonly authService;
-    private readonly client;
-    listSessions(): rxjs.Observable<{
-        data: better_auth.Prettify<{
-            id: string;
-            userId: string;
-            expiresAt: Date;
-            createdAt: Date;
-            updatedAt: Date;
-            token: string;
-            ipAddress?: string | null | undefined | undefined;
-            userAgent?: string | null | undefined | undefined;
-        }>[];
-        error: null;
-    } | {
-        data: null;
-        error: {
-            code?: string | undefined;
-            message?: string | undefined;
-            status: number;
-            statusText: string;
-        };
-    }>;
-    revokeSession(sessionToken: string): rxjs.Observable<{
-        data: {
-            status: boolean;
-        };
-        error: null;
-    } | {
-        data: null;
-        error: {
-            code?: string | undefined;
-            message?: string | undefined;
-            status: number;
-            statusText: string;
-        };
-    }>;
-    revokeOtherSessions(): rxjs.Observable<{
-        data: {
-            status: boolean;
-        };
-        error: null;
-    } | {
-        data: null;
-        error: {
-            code?: string | undefined;
-            message?: string | undefined;
-            status: number;
-            statusText: string;
-        };
-    }>;
-    revokeAllSessions(): rxjs.Observable<{
-        data: {
-            status: boolean;
-        };
-        error: null;
-    } | {
-        data: null;
-        error: {
-            code?: string | undefined;
-            message?: string | undefined;
-            status: number;
-            statusText: string;
-        };
-    }>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<SessionService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<SessionService>;
-}
-
-declare class SignInService {
-    private readonly authService;
-    private readonly client;
     signInEmail(data: {
         email: string;
         password: string;
         rememberMe?: boolean;
-    }): rxjs.Observable<{
+    }): Observable<{
         data: {
             redirect: boolean;
             token: string;
@@ -2345,7 +2279,7 @@ declare class SignInService {
         name: string;
         email: string;
         password: string;
-    }): rxjs.Observable<{
+    }): Observable<{
         data: NonNullable<{
             token: null;
             user: {
@@ -2379,7 +2313,7 @@ declare class SignInService {
             statusText: string;
         };
     }>;
-    signInProvider(provider: Provider): rxjs.Observable<{
+    signInProvider(provider: Provider): Observable<{
         data: NonNullable<{
             redirect: boolean;
             token: string;
@@ -2407,27 +2341,97 @@ declare class SignInService {
             statusText: string;
         };
     }>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<SignInService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<SignInService>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AuthService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<AuthService>;
+}
+
+declare class SessionService {
+    private readonly authService;
+    private readonly client;
+    listSessions(): rxjs.Observable<{
+        data: better_auth.Prettify<{
+            id: string;
+            userId: string;
+            expiresAt: Date;
+            createdAt: Date;
+            updatedAt: Date;
+            token: string;
+            ipAddress?: string | null | undefined | undefined;
+            userAgent?: string | null | undefined | undefined;
+        }>[];
+        error: null;
+    } | {
+        data: null;
+        error: {
+            code?: string | undefined;
+            message?: string | undefined;
+            status: number;
+            statusText: string;
+        };
+    }>;
+    revokeSession(sessionToken: string): rxjs.Observable<{
+        data: {
+            status: boolean;
+        };
+        error: null;
+    } | {
+        data: null;
+        error: {
+            code?: string | undefined;
+            message?: string | undefined;
+            status: number;
+            statusText: string;
+        };
+    }>;
+    revokeOtherSessions(): rxjs.Observable<{
+        data: {
+            status: boolean;
+        };
+        error: null;
+    } | {
+        data: null;
+        error: {
+            code?: string | undefined;
+            message?: string | undefined;
+            status: number;
+            statusText: string;
+        };
+    }>;
+    revokeAllSessions(): rxjs.Observable<{
+        data: {
+            status: boolean;
+        };
+        error: null;
+    } | {
+        data: null;
+        error: {
+            code?: string | undefined;
+            message?: string | undefined;
+            status: number;
+            statusText: string;
+        };
+    }>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SessionService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<SessionService>;
 }
 
 /**
  * Redirects unauthorized users to the specified commands (route).
  */
-declare function redirectUnauthorizedTo(commands?: string[]): () => UrlTree | boolean;
+declare function redirectUnauthorizedTo(commands?: string[]): () => Observable<UrlTree | boolean>;
 /**
  * Redirects logged-in users to the specified commands (route).
  */
-declare function redirectLoggedInTo(commands?: string[]): () => UrlTree | boolean;
+declare function redirectLoggedInTo(commands?: string[]): () => Observable<UrlTree | boolean>;
 /**
  * Allows access only to users with at least one of the specified roles.
  * Redirects unauthorized users to the specified commands (route).
  */
-declare function hasRole(requiredRoles: string[], redirectTo?: string[]): () => UrlTree | boolean;
+declare function hasRole(requiredRoles: string[], redirectTo?: string[]): () => Observable<UrlTree | boolean>;
 
-declare function canActivate(pipe: () => boolean | _angular_router.UrlTree): {
+declare function canActivate(pipe: () => Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree): {
     canActivate: [CanActivateFn];
 };
 
-export { AdminService, AuthService, BETTER_AUTH_CONFIG_TOKEN, OrganizationService, SessionService, SignInService, canActivate, hasRole, provideBetterAuth, redirectLoggedInTo, redirectUnauthorizedTo };
+export { AdminService, AuthService, BETTER_AUTH_CONFIG_TOKEN, OrganizationService, SessionService, canActivate, hasRole, provideBetterAuth, redirectLoggedInTo, redirectUnauthorizedTo };
 export type { AuthSession, Provider };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-better-auth",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "repository": {
     "url": "https://github.com/thomasorgeval/ngx-better-auth"
   },