ngx-better-auth 0.5.2 → 0.7.0

package/README.md

@@ -8,7 +8,7 @@
 ![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)**.  
+An **Angular 20+ wrapper 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**.
 
 ---
@@ -49,7 +49,9 @@ export const appConfig: ApplicationConfig = {
 
 ## 🧩 Different services
 
-You can inject different services depending on your needs:
+You can inject different services depending on your needs.  
+**AuthService** provides the core Better Auth client methods (login, logout, register, e.g.).  
+The full list of methods is available at the end of this README.
 
 ### Global services
 - `AuthService`
@@ -58,6 +60,7 @@ You can inject different services depending on your needs:
 
 ### Plugin services
 Authentication:
+- `UsernameService`
 - `TwoFactorService`
 - `PasskeyService`
 - `GenericOauthService`
@@ -108,7 +111,7 @@ This library ships with guards to quickly set up route protection.
 ### Usage in routes
 ```ts
 import { Routes } from '@angular/router'
-import { canActivate, redirectLoggedInTo, redirectUnauthorizedTo, hasRole } from 'ngx-better-auth/guards'
+import { canActivate, redirectLoggedInTo, redirectUnauthorizedTo, hasRole } from 'ngx-better-auth'
 
 export const routes: Routes = [
   {
@@ -127,4 +130,9 @@ export const routes: Routes = [
     ...canActivate(redirectLoggedInTo(['/']))
   }
 ]
-```
+```
+
+## 📋 Full list of AuthService methods
+
+### AuthService
+

package/fesm2022/ngx-better-auth.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { inject, Injectable, signal, computed, InjectionToken, makeEnvironmentProviders } from '@angular/core';
-import { Observable, filter, map, shareReplay, defer, switchMap, tap } from 'rxjs';
+import { Observable, filter, map, shareReplay, defer, switchMap } from 'rxjs';
 import { createAuthClient } from 'better-auth/client';
 import { Router } from '@angular/router';
 
@@ -9,6 +9,12 @@ class MainService {
     authClient = createAuthClient({
         ...this.config,
     });
+    mapData(data) {
+        if (data.error) {
+            throw data.error;
+        }
+        return data.data;
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: MainService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: MainService, providedIn: 'root' });
 }
@@ -19,11 +25,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.3", ngImpor
                 }]
         }] });
 
-function isEmail(email) {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailRegex.test(email);
-}
-
 class AuthService {
     mainService = inject(MainService);
     client = this.mainService.authClient;
@@ -77,24 +78,9 @@ class AuthService {
             this.session.set(session.data);
         });
     }
-    /**
-     * pass either email or username to sign in. Needs username plugin enabled to use username.
-     * @param data : { email?: string; username?: string; password: string; rememberMe?: boolean }
-     */
-    signIn(data) {
-        if (isEmail(data.login)) {
-            return this.signInEmail({ email: data.login, password: data.password, rememberMe: data.rememberMe });
-        }
-        else {
-            return this.signInUsername({ username: data.login, password: data.password, rememberMe: data.rememberMe });
-        }
-    }
     signInEmail(data) {
         return defer(() => this.client.signIn.email(data)).pipe(switchMap(() => this.sessionState$.pipe(filter((s) => s !== null))));
     }
-    signInUsername(data) {
-        return defer(() => this.client.signIn.username(data)).pipe(switchMap(() => this.sessionState$.pipe(filter((s) => s !== null))));
-    }
     /**
      * Sign up a new user using email and password.
      *
@@ -111,28 +97,25 @@ class AuthService {
         return defer(() => this.client.signOut()).pipe(switchMap(() => this.sessionState$.pipe(filter((s) => s === null))));
     }
     sendVerificationEmail(data) {
-        return defer(() => this.client.sendVerificationEmail(data));
+        return defer(() => this.client.sendVerificationEmail(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     requestPasswordReset(data) {
-        return defer(() => this.client.requestPasswordReset(data));
+        return defer(() => this.client.requestPasswordReset(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     resetPassword(data) {
-        return defer(() => this.client.resetPassword(data));
+        return defer(() => this.client.resetPassword(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     changePassword(data) {
-        return defer(() => this.client.changePassword(data));
+        return defer(() => this.client.changePassword(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     changeEmail(data) {
-        return defer(() => this.client.changeEmail(data));
+        return defer(() => this.client.changeEmail(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     updateUser(data) {
-        return defer(() => this.client.updateUser(data));
-    }
-    isUsernameAvailable(data) {
-        return defer(() => this.client.isUsernameAvailable(data));
+        return defer(() => this.client.updateUser(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     deleteUser(data) {
-        return defer(() => this.client.deleteUser(data)).pipe(tap(() => this.sessionState$.pipe(filter((s) => s === null))));
+        return defer(() => this.client.deleteUser(data)).pipe(switchMap(() => this.sessionState$.pipe(filter((s) => s === null))));
     }
     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' });
@@ -148,16 +131,16 @@ class SessionService {
     mainService = inject(MainService);
     client = this.mainService.authClient;
     listSessions() {
-        return defer(() => this.client.listSessions());
+        return defer(() => this.client.listSessions()).pipe(map((data) => this.mainService.mapData(data)));
     }
-    revokeSession(sessionToken) {
-        return defer(() => this.client.revokeSession({ token: sessionToken }));
+    revokeSession(data) {
+        return defer(() => this.client.revokeSession(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     revokeOtherSessions() {
-        return defer(() => this.client.revokeOtherSessions());
+        return defer(() => this.client.revokeOtherSessions()).pipe(map((data) => this.mainService.mapData(data)));
     }
     revokeAllSessions() {
-        return defer(() => this.client.revokeSessions());
+        return defer(() => this.client.revokeSessions()).pipe(map((data) => this.mainService.mapData(data)));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: SessionService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: SessionService, providedIn: 'root' });
@@ -171,13 +154,13 @@ class AccountService {
     mainService = inject(MainService);
     client = this.mainService.authClient;
     listAccounts() {
-        return defer(() => this.client.listAccounts());
+        return defer(() => this.client.listAccounts()).pipe(map((data) => this.mainService.mapData(data)));
     }
     linkSocial(data) {
-        return defer(() => this.client.linkSocial(data));
+        return defer(() => this.client.linkSocial(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     unlinkAccount(data) {
-        return defer(() => this.client.unlinkAccount(data));
+        return defer(() => this.client.unlinkAccount(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: AccountService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: AccountService, providedIn: 'root' });
@@ -205,28 +188,28 @@ class TwoFactorService {
         this.twoFactor = client.twoFactor;
     }
     enable(data) {
-        return defer(() => this.twoFactor.enable(data));
+        return defer(() => this.twoFactor.enable(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     disable(data) {
-        return defer(() => this.twoFactor.disable(data));
+        return defer(() => this.twoFactor.disable(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     getTotpUri(data) {
-        return defer(() => this.twoFactor.getTotpUri(data));
+        return defer(() => this.twoFactor.getTotpUri(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     verifyTotp(data) {
-        return defer(() => this.twoFactor.verifyTotp(data));
+        return defer(() => this.twoFactor.verifyTotp(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
-    sendOtp(data) {
-        return defer(() => this.twoFactor.sendOtp(data));
+    sendOtp() {
+        return defer(() => this.twoFactor.sendOtp()).pipe(map((data) => this.mainService.mapData(data)));
     }
     verifyOtp(data) {
-        return defer(() => this.twoFactor.verifyOtp(data));
+        return defer(() => this.twoFactor.verifyOtp(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     generateBackupCodes(data) {
-        return defer(() => this.twoFactor.generateBackupCodes(data));
+        return defer(() => this.twoFactor.generateBackupCodes(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     verifyBackupCode(data) {
-        return defer(() => this.twoFactor.verifyBackupCode(data));
+        return defer(() => this.twoFactor.verifyBackupCode(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: TwoFactorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: TwoFactorService, providedIn: 'root' });
@@ -245,16 +228,19 @@ class PasskeyService {
         this.passkey = client.passkey;
     }
     addPasskey(data) {
-        return defer(() => this.passkey.addPasskey(data));
+        return defer(() => this.passkey.addPasskey(data)).pipe(map((data) => this.mainService.mapData(data)));
+    }
+    signIn(data) {
+        return defer(() => this.mainService.authClient.signIn.passkey(data));
     }
     listUserPasskeys() {
-        return defer(() => this.passkey.listUserPasskeys());
+        return defer(() => this.passkey.listUserPasskeys()).pipe(map((data) => this.mainService.mapData(data)));
     }
     deletePasskey(data) {
-        return defer(() => this.passkey.deletePasskey(data));
+        return defer(() => this.passkey.deletePasskey(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     updatePasskey(data) {
-        return defer(() => this.passkey.updatePasskey(data));
+        return defer(() => this.passkey.updatePasskey(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: PasskeyService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: PasskeyService, providedIn: 'root' });
@@ -369,40 +355,49 @@ class AdminService {
         this.admin = client.admin;
     }
     setRole(data) {
-        return defer(() => this.admin.setRole(data));
+        return defer(() => this.admin.setRole(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
-    setUserPassword(data) {
-        return defer(() => this.admin.setUserPassword(data));
+    createUser(data) {
+        return defer(() => this.admin.createUser(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
-    banUser(data) {
-        return defer(() => this.admin.banUser(data));
+    updateUser(data) {
+        return defer(() => this.admin.updateUser(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
-    unbanUser(data) {
-        return defer(() => this.admin.unbanUser(data));
+    listUsers(data) {
+        return defer(() => this.admin.listUsers(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     listUserSessions(data) {
-        return defer(() => this.admin.listUserSessions(data));
+        return defer(() => this.admin.listUserSessions(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
-    revokeUserSession(data) {
-        return defer(() => this.admin.revokeUserSession(data));
+    unbanUser(data) {
+        return defer(() => this.admin.unbanUser(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
-    revokeUserSessions(data) {
-        return defer(() => this.admin.revokeUserSessions(data));
+    banUser(data) {
+        return defer(() => this.admin.banUser(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     impersonateUser(data) {
-        return defer(() => this.admin.impersonateUser(data));
+        return defer(() => this.admin.impersonateUser(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     stopImpersonating() {
         return defer(() => this.admin.stopImpersonating());
     }
+    revokeUserSession(data) {
+        return defer(() => this.admin.revokeUserSession(data)).pipe(map((data) => this.mainService.mapData(data)));
+    }
+    revokeUserSessions(data) {
+        return defer(() => this.admin.revokeUserSessions(data)).pipe(map((data) => this.mainService.mapData(data)));
+    }
     removeUser(data) {
-        return defer(() => this.admin.removeUser(data));
+        return defer(() => this.admin.removeUser(data)).pipe(map((data) => this.mainService.mapData(data)));
+    }
+    setUserPassword(data) {
+        return defer(() => this.admin.setUserPassword(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     hasPermission(data) {
         return defer(() => this.admin.hasPermission(data));
     }
     checkRolePermission(data) {
-        return this.admin.checkRolePermission(data);
+        return defer(() => this.admin.checkRolePermission(data));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: AdminService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: AdminService, providedIn: 'root' });
@@ -420,62 +415,62 @@ class OrganizationService {
         validatePlugin(client, 'organization');
         this.organization = client.organization;
     }
-    createOrganization(data) {
-        return defer(() => this.organization.create(data));
+    create(data) {
+        return defer(() => this.organization.create(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     checkSlug(data) {
         return defer(() => this.organization.checkSlug(data));
     }
     list() {
-        return defer(() => this.organization.list());
+        return defer(() => this.organization.list()).pipe(map((data) => this.mainService.mapData(data)));
     }
     setActive(data) {
-        return defer(() => this.organization.setActive(data));
+        return defer(() => this.organization.setActive(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     getFullOrganization(data) {
-        return defer(() => this.organization.getFullOrganization(data));
+        return defer(() => this.organization.getFullOrganization(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     update(data) {
-        return defer(() => this.organization.update(data));
+        return defer(() => this.organization.update(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     delete(data) {
-        return defer(() => this.organization.delete(data));
+        return defer(() => this.organization.delete(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     inviteMember(data) {
-        return defer(() => this.organization.inviteMember(data));
+        return defer(() => this.organization.inviteMember(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     acceptInvitation(data) {
-        return defer(() => this.organization.acceptInvitation(data));
+        return defer(() => this.organization.acceptInvitation(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     cancelInvitation(data) {
-        return defer(() => this.organization.cancelInvitation(data));
+        return defer(() => this.organization.cancelInvitation(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     rejectInvitation(data) {
-        return defer(() => this.organization.rejectInvitation(data));
+        return defer(() => this.organization.rejectInvitation(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     getInvitation(data) {
-        return defer(() => this.organization.getInvitation(data));
+        return defer(() => this.organization.getInvitation(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     listInvitations(data) {
-        return defer(() => this.organization.listInvitations(data));
+        return defer(() => this.organization.listInvitations(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     listUserInvitations() {
-        return defer(() => this.organization.listUserInvitations());
+        return defer(() => this.organization.listUserInvitations()).pipe(map((data) => this.mainService.mapData(data)));
     }
     listMembers(data = {}) {
         return defer(() => this.organization.listMembers(data));
     }
     removeMember(data) {
-        return defer(() => this.organization.removeMember(data));
+        return defer(() => this.organization.removeMember(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     updateMemberRoles(data) {
         return defer(() => this.organization.updateMemberRoles(data));
     }
     getActiveMember() {
-        return defer(() => this.organization.getActiveMember());
+        return defer(() => this.organization.getActiveMember()).pipe(map((data) => this.mainService.mapData(data)));
     }
     leave(data) {
-        return defer(() => this.organization.leave(data));
+        return defer(() => this.organization.leave(data)).pipe(map((data) => this.mainService.mapData(data)));
     }
     createTeam(data) {
         return defer(() => this.organization.createTeam(data));
@@ -555,7 +550,7 @@ function hasRole(requiredRoles, redirectTo = ['/unauthorized']) {
             if (!session || !session.user) {
                 return router.createUrlTree(redirectTo);
             }
-            const role = session?.user?.role;
+            const role = session?.user?.['role'];
             if (Array.isArray(role)) {
                 if (role.some((r) => requiredRoles.includes(r))) {
                     return true;