@meistrari/auth-core 1.7.4 → 1.9.0

package/dist/index.d.mts

@@ -176,6 +176,18 @@ declare const organizationAdditionalFields: {
         required: false;
     };
 };
+declare const memberAdditionalFields: {
+    deletedAt: {
+        type: "date";
+        required: false;
+        defaultValue: null;
+    };
+    lastActiveAt: {
+        type: "date";
+        required: false;
+        defaultValue: null;
+    };
+};
 type JWTTokenPayload = JWTPayload & {
     email: string;
     user: {
@@ -214,6 +226,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             }[];
             invitations: {
                 id: string;
@@ -367,13 +381,16 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
             metadata?: any;
         } & {
             metadata: any;
-            members: ({
+            members: (({
                 id: string;
                 organizationId: string;
                 userId: string;
                 role: string;
                 createdAt: Date;
-            } | undefined)[];
+            } & {} & {
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
+            }) | undefined)[];
         }, {
             code?: string | undefined;
             message?: string | undefined;
@@ -457,6 +474,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             }[];
             invitations: {
                 id: string;
@@ -515,6 +534,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             }[];
             invitations: {
                 id: string;
@@ -645,6 +666,9 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 userId: string;
                 role: string;
                 createdAt: Date;
+            } & {} & {
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             };
         }, {
             code?: string | undefined;
@@ -746,6 +770,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 name: string;
                 image?: string | undefined;
             };
+            deletedAt?: Date | undefined;
+            lastActiveAt?: Date | undefined;
         } & {
             user: better_auth.User;
         }, "user"> & {
@@ -799,6 +825,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             };
         }, {
             code?: string | undefined;
@@ -855,6 +883,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 name: string;
                 image?: string | undefined;
             };
+            deletedAt?: Date | undefined;
+            lastActiveAt?: Date | undefined;
         } & {
             user: better_auth.User;
         }, "user"> & {
@@ -943,6 +973,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             } & {
                 user: {
                     id: string;
@@ -2739,6 +2771,17 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
             data: CompleteAuthorizationFlowResponse;
             error: null;
         }>;
+        logout: (refreshToken: string) => Promise<{
+            data: null;
+            error: {
+                message?: string | undefined;
+                status: number;
+                statusText: string;
+            };
+        } | {
+            data: void;
+            error: null;
+        }>;
     };
 } & {
     $Infer: {
@@ -2756,6 +2799,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             }[];
             invitations: {
                 id: string;
@@ -2815,6 +2860,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 name: string;
                 image?: string | undefined;
             };
+            deletedAt?: Date | undefined;
+            lastActiveAt?: Date | undefined;
         };
         Team: {
             id: string;
@@ -3161,11 +3208,6 @@ type Organization = stub['$Infer']['Organization'];
 type Team = stub['$Infer']['Team'];
 type Invitation = stub['$Infer']['Invitation'];
 type Member = stub['$Infer']['Member'];
-type ExtendedMember = Omit<Member, 'user'> & {
-    user: Member['user'] & {
-        id: string;
-    };
-};
 type OrganizationSettings = {
     disableStorage?: boolean;
     dataRetentionHours?: number;
@@ -3232,6 +3274,9 @@ declare class RefreshTokenExpiredError extends ApplicationError {
 declare class AuthorizationFlowError extends ApplicationError {
     constructor(message: string, options?: ErrorOptions);
 }
+declare class UserNotLoggedInError extends ApplicationError {
+    constructor(message: string, options?: ErrorOptions);
+}
 
 /**
  * Service for managing applications and their candidate organizations.
@@ -3306,6 +3351,15 @@ declare class ApplicationService {
      * @returns New authentication tokens and user/organization details
      */
     switchOrganization(organizationId: string, accessToken: string): Promise<CompleteAuthorizationFlowResponse>;
+    /**
+     * Logs out the user by invalidating their refresh token.
+     *
+     * Revokes the refresh token on the server, preventing further token refreshes
+     * and effectively ending the user's session.
+     *
+     * @param refreshToken - The refresh token to invalidate
+     */
+    logout(refreshToken: string): Promise<void>;
 }
 
 type UpdateOrganizationPayload = Partial<Pick<ExtendedOrganization, 'name' | 'logo' | 'settings'>>;
@@ -3370,6 +3424,8 @@ declare class OrganizationService {
                 name: string;
                 image?: string | undefined;
             };
+            deletedAt?: Date | undefined;
+            lastActiveAt?: Date | undefined;
         }[];
         invitations: {
             id: string;
@@ -3440,6 +3496,8 @@ declare class OrganizationService {
             name: string;
             image?: string | undefined;
         };
+        deletedAt?: Date | undefined;
+        lastActiveAt?: Date | undefined;
     } & {
         user: {
             id: string;
@@ -3466,6 +3524,8 @@ declare class OrganizationService {
             name: string;
             image?: string | undefined;
         };
+        deletedAt?: Date | undefined;
+        lastActiveAt?: Date | undefined;
     } & {
         user: better_auth.User;
     }, "user"> & {
@@ -4010,5 +4070,5 @@ declare function validateToken(token: string, apiUrl: string): Promise<boolean>;
  */
 declare function extractTokenPayload(token: string): JWTTokenPayload;
 
-export { ApplicationError, AuthClient, AuthorizationFlowError, EmailRequired, InvalidCallbackURL, InvalidSocialProvider, RefreshTokenExpiredError, Roles, ac, createAPIClient, extractTokenPayload, isTokenExpired, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };
-export type { APIClient, ApiKeyMetadata, Application, CompleteAuthorizationFlowResponse, CreateApiKeyPayload, CreateTeamPayload, FullOrganization, Invitation, InviteUserToOrganizationOptions, JWTTokenPayload, ListCandidateOrganizationsResponse, ListMembersOptions, ExtendedMember as Member, ExtendedOrganization as Organization, RemoveUserFromOrganizationOptions, Role, Session, SignInWithEmailAndPasswordOptions, SignInWithSamlOptions, SocialSignInOptions, StartAuthorizationFlowResponse, Team, TeamMember, UpdateApiKeyPayload, UpdateMemberRoleOptions, UpdateOrganizationPayload, UpdateTeamPayload, User, WhoAmIResponse };
+export { ApplicationError, AuthClient, AuthorizationFlowError, EmailRequired, InvalidCallbackURL, InvalidSocialProvider, RefreshTokenExpiredError, Roles, UserNotLoggedInError, ac, createAPIClient, extractTokenPayload, isTokenExpired, memberAdditionalFields, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };
+export type { APIClient, ApiKeyMetadata, Application, CompleteAuthorizationFlowResponse, CreateApiKeyPayload, CreateTeamPayload, FullOrganization, Invitation, InviteUserToOrganizationOptions, JWTTokenPayload, ListCandidateOrganizationsResponse, ListMembersOptions, Member, ExtendedOrganization as Organization, RemoveUserFromOrganizationOptions, Role, Session, SignInWithEmailAndPasswordOptions, SignInWithSamlOptions, SocialSignInOptions, StartAuthorizationFlowResponse, Team, TeamMember, UpdateApiKeyPayload, UpdateMemberRoleOptions, UpdateOrganizationPayload, UpdateTeamPayload, User, WhoAmIResponse };

package/dist/index.d.ts

@@ -176,6 +176,18 @@ declare const organizationAdditionalFields: {
         required: false;
     };
 };
+declare const memberAdditionalFields: {
+    deletedAt: {
+        type: "date";
+        required: false;
+        defaultValue: null;
+    };
+    lastActiveAt: {
+        type: "date";
+        required: false;
+        defaultValue: null;
+    };
+};
 type JWTTokenPayload = JWTPayload & {
     email: string;
     user: {
@@ -214,6 +226,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             }[];
             invitations: {
                 id: string;
@@ -367,13 +381,16 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
             metadata?: any;
         } & {
             metadata: any;
-            members: ({
+            members: (({
                 id: string;
                 organizationId: string;
                 userId: string;
                 role: string;
                 createdAt: Date;
-            } | undefined)[];
+            } & {} & {
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
+            }) | undefined)[];
         }, {
             code?: string | undefined;
             message?: string | undefined;
@@ -457,6 +474,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             }[];
             invitations: {
                 id: string;
@@ -515,6 +534,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             }[];
             invitations: {
                 id: string;
@@ -645,6 +666,9 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 userId: string;
                 role: string;
                 createdAt: Date;
+            } & {} & {
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             };
         }, {
             code?: string | undefined;
@@ -746,6 +770,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 name: string;
                 image?: string | undefined;
             };
+            deletedAt?: Date | undefined;
+            lastActiveAt?: Date | undefined;
         } & {
             user: better_auth.User;
         }, "user"> & {
@@ -799,6 +825,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             };
         }, {
             code?: string | undefined;
@@ -855,6 +883,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 name: string;
                 image?: string | undefined;
             };
+            deletedAt?: Date | undefined;
+            lastActiveAt?: Date | undefined;
         } & {
             user: better_auth.User;
         }, "user"> & {
@@ -943,6 +973,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             } & {
                 user: {
                     id: string;
@@ -2739,6 +2771,17 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
             data: CompleteAuthorizationFlowResponse;
             error: null;
         }>;
+        logout: (refreshToken: string) => Promise<{
+            data: null;
+            error: {
+                message?: string | undefined;
+                status: number;
+                statusText: string;
+            };
+        } | {
+            data: void;
+            error: null;
+        }>;
     };
 } & {
     $Infer: {
@@ -2756,6 +2799,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                     name: string;
                     image?: string | undefined;
                 };
+                deletedAt?: Date | undefined;
+                lastActiveAt?: Date | undefined;
             }[];
             invitations: {
                 id: string;
@@ -2815,6 +2860,8 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 name: string;
                 image?: string | undefined;
             };
+            deletedAt?: Date | undefined;
+            lastActiveAt?: Date | undefined;
         };
         Team: {
             id: string;
@@ -3161,11 +3208,6 @@ type Organization = stub['$Infer']['Organization'];
 type Team = stub['$Infer']['Team'];
 type Invitation = stub['$Infer']['Invitation'];
 type Member = stub['$Infer']['Member'];
-type ExtendedMember = Omit<Member, 'user'> & {
-    user: Member['user'] & {
-        id: string;
-    };
-};
 type OrganizationSettings = {
     disableStorage?: boolean;
     dataRetentionHours?: number;
@@ -3232,6 +3274,9 @@ declare class RefreshTokenExpiredError extends ApplicationError {
 declare class AuthorizationFlowError extends ApplicationError {
     constructor(message: string, options?: ErrorOptions);
 }
+declare class UserNotLoggedInError extends ApplicationError {
+    constructor(message: string, options?: ErrorOptions);
+}
 
 /**
  * Service for managing applications and their candidate organizations.
@@ -3306,6 +3351,15 @@ declare class ApplicationService {
      * @returns New authentication tokens and user/organization details
      */
     switchOrganization(organizationId: string, accessToken: string): Promise<CompleteAuthorizationFlowResponse>;
+    /**
+     * Logs out the user by invalidating their refresh token.
+     *
+     * Revokes the refresh token on the server, preventing further token refreshes
+     * and effectively ending the user's session.
+     *
+     * @param refreshToken - The refresh token to invalidate
+     */
+    logout(refreshToken: string): Promise<void>;
 }
 
 type UpdateOrganizationPayload = Partial<Pick<ExtendedOrganization, 'name' | 'logo' | 'settings'>>;
@@ -3370,6 +3424,8 @@ declare class OrganizationService {
                 name: string;
                 image?: string | undefined;
             };
+            deletedAt?: Date | undefined;
+            lastActiveAt?: Date | undefined;
         }[];
         invitations: {
             id: string;
@@ -3440,6 +3496,8 @@ declare class OrganizationService {
             name: string;
             image?: string | undefined;
         };
+        deletedAt?: Date | undefined;
+        lastActiveAt?: Date | undefined;
     } & {
         user: {
             id: string;
@@ -3466,6 +3524,8 @@ declare class OrganizationService {
             name: string;
             image?: string | undefined;
         };
+        deletedAt?: Date | undefined;
+        lastActiveAt?: Date | undefined;
     } & {
         user: better_auth.User;
     }, "user"> & {
@@ -4010,5 +4070,5 @@ declare function validateToken(token: string, apiUrl: string): Promise<boolean>;
  */
 declare function extractTokenPayload(token: string): JWTTokenPayload;
 
-export { ApplicationError, AuthClient, AuthorizationFlowError, EmailRequired, InvalidCallbackURL, InvalidSocialProvider, RefreshTokenExpiredError, Roles, ac, createAPIClient, extractTokenPayload, isTokenExpired, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };
-export type { APIClient, ApiKeyMetadata, Application, CompleteAuthorizationFlowResponse, CreateApiKeyPayload, CreateTeamPayload, FullOrganization, Invitation, InviteUserToOrganizationOptions, JWTTokenPayload, ListCandidateOrganizationsResponse, ListMembersOptions, ExtendedMember as Member, ExtendedOrganization as Organization, RemoveUserFromOrganizationOptions, Role, Session, SignInWithEmailAndPasswordOptions, SignInWithSamlOptions, SocialSignInOptions, StartAuthorizationFlowResponse, Team, TeamMember, UpdateApiKeyPayload, UpdateMemberRoleOptions, UpdateOrganizationPayload, UpdateTeamPayload, User, WhoAmIResponse };
+export { ApplicationError, AuthClient, AuthorizationFlowError, EmailRequired, InvalidCallbackURL, InvalidSocialProvider, RefreshTokenExpiredError, Roles, UserNotLoggedInError, ac, createAPIClient, extractTokenPayload, isTokenExpired, memberAdditionalFields, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };
+export type { APIClient, ApiKeyMetadata, Application, CompleteAuthorizationFlowResponse, CreateApiKeyPayload, CreateTeamPayload, FullOrganization, Invitation, InviteUserToOrganizationOptions, JWTTokenPayload, ListCandidateOrganizationsResponse, ListMembersOptions, Member, ExtendedOrganization as Organization, RemoveUserFromOrganizationOptions, Role, Session, SignInWithEmailAndPasswordOptions, SignInWithSamlOptions, SocialSignInOptions, StartAuthorizationFlowResponse, Team, TeamMember, UpdateApiKeyPayload, UpdateMemberRoleOptions, UpdateOrganizationPayload, UpdateTeamPayload, User, WhoAmIResponse };

package/dist/index.mjs

@@ -1,12 +1,12 @@
 import { decodeJwt, createRemoteJWKSet, jwtVerify } from 'jose';
 import { ssoClient } from '@better-auth/sso/client';
 import { createAuthClient } from 'better-auth/client';
-import { organizationClient, twoFactorClient, jwtClient, apiKeyClient, adminClient, inferAdditionalFields } from 'better-auth/client/plugins';
+import { organizationClient, inferOrgAdditionalFields, twoFactorClient, jwtClient, apiKeyClient, adminClient, inferAdditionalFields } from 'better-auth/client/plugins';
 import { createAccessControl } from 'better-auth/plugins/access';
 import { defaultStatements } from 'better-auth/plugins/organization/access';
 export { BetterFetchError as APIError } from '@better-fetch/fetch';
 
-const version = "1.7.4";
+const version = "1.9.0";
 
 const statements = {
   ...defaultStatements,
@@ -47,6 +47,18 @@ const organizationAdditionalFields = {
     required: false
   }
 };
+const memberAdditionalFields = {
+  deletedAt: {
+    type: "date",
+    required: false,
+    defaultValue: null
+  },
+  lastActiveAt: {
+    type: "date",
+    required: false,
+    defaultValue: null
+  }
+};
 
 function applicationsPluginClient() {
   return {
@@ -122,6 +134,14 @@ function applicationsPluginClient() {
                 organizationId
               }
             });
+          },
+          logout: async (refreshToken) => {
+            const headers = new Headers();
+            headers.set("x-tela-refresh-token", refreshToken);
+            return await $fetch("/applications/logout", {
+              method: "POST",
+              headers
+            });
           }
         }
       };
@@ -152,19 +172,22 @@ function createAPIClient(apiUrl, fetchOptions = {}) {
         roles: rolesAccessControl,
         teams: {
           enabled: true
-        }
-        //  TODO: check if this is fixed in the next version
-        // schema: inferOrgAdditionalFields({
-        //     organization: {
-        //         additionalFields: {
-        //             settings: {
-        //                 type: 'json' as const,
-        //                 input: true,
-        //                 required: false,
-        //             }
-        //         },
-        //     }
-        // })
+        },
+        schema: inferOrgAdditionalFields({
+          // TODO: check if this is fixed in the next version
+          //     organization: {
+          //         additionalFields: {
+          //             settings: {
+          //                 type: 'json' as const,
+          //                 input: true,
+          //                 required: false,
+          //             }
+          //         },
+          //     }
+          member: {
+            additionalFields: memberAdditionalFields
+          }
+        })
       }),
       customEndpointsPluginClient(),
       handshakePluginClient(),
@@ -215,6 +238,12 @@ class AuthorizationFlowError extends ApplicationError {
     this.code = "AUTHORIZATION_FLOW_ERROR";
   }
 }
+class UserNotLoggedInError extends ApplicationError {
+  constructor(message, options) {
+    super(message, options);
+    this.code = "USER_NOT_LOGGED_IN";
+  }
+}
 
 class ApplicationService {
   /**
@@ -319,6 +348,17 @@ class ApplicationService {
     }
     return response.data;
   }
+  /**
+   * Logs out the user by invalidating their refresh token.
+   *
+   * Revokes the refresh token on the server, preventing further token refreshes
+   * and effectively ending the user's session.
+   *
+   * @param refreshToken - The refresh token to invalidate
+   */
+  async logout(refreshToken) {
+    await this.client.applications.logout(refreshToken);
+  }
 }
 
 class OrganizationService {
@@ -837,4 +877,4 @@ function extractTokenPayload(token) {
   return payload;
 }
 
-export { ApplicationError, AuthClient, AuthorizationFlowError, EmailRequired, InvalidCallbackURL, InvalidSocialProvider, RefreshTokenExpiredError, Roles, ac, extractTokenPayload, isTokenExpired, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };
+export { ApplicationError, AuthClient, AuthorizationFlowError, EmailRequired, InvalidCallbackURL, InvalidSocialProvider, RefreshTokenExpiredError, Roles, UserNotLoggedInError, ac, extractTokenPayload, isTokenExpired, memberAdditionalFields, organizationAdditionalFields, rolesAccessControl, userAdditionalFields, validateToken };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meistrari/auth-core",
-  "version": "1.7.4",
+  "version": "1.9.0",
   "type": "module",
   "exports": {
     ".": {