@meistrari/auth-core 1.12.0 → 1.13.1

package/dist/index.d.mts

@@ -6,6 +6,7 @@ import * as better_auth_client from 'better-auth/client';
 import { BetterFetchOption } from 'better-auth/client';
 import * as jose from 'jose';
 import * as _better_auth_sso from '@better-auth/sso';
+import { ApiKey as ApiKey$1 } from '@better-auth/api-key';
 
 declare const ac: {
     newRole<K extends "member" | "access" | "organization" | "invitation" | "team" | "ac">(statements: better_auth_plugins.Subset<K, {
@@ -202,6 +203,32 @@ type JWTTokenPayload = JWTPayload & {
     sessionKey: string;
 };
 
+type ApiKeyMetadata = {
+    user: {
+        id: string;
+        email: string;
+    };
+    workspace: {
+        id: string;
+        title: string;
+    };
+} & Record<string, unknown>;
+type ApiKey = Omit<ApiKey$1, 'metadata' | 'name'> & {
+    name: string;
+    metadata: ApiKeyMetadata;
+};
+type ApiKeyWithoutSecret = Omit<ApiKey, 'key'>;
+type CreateApiKeyPayload = {
+    name: string;
+    expiresIn?: number;
+    prefix?: string;
+    metadata?: ApiKeyMetadata;
+};
+type UpdateApiKeyPayload = {
+    id: string;
+    name: string;
+};
+
 /**
  * Removes index signatures from a type
  * @template T - The type to remove index signatures from
@@ -303,35 +330,26 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 fetchOptions?: FetchOptions | undefined;
             }> | undefined, data_1?: FetchOptions | undefined) => Promise<better_auth_client.BetterFetchResponse<{
                 id: string;
-                name: string | null;
+                name: string;
                 start: string | null;
                 prefix: string | null;
                 referenceId: string;
-                configId: string | null;
+                configId: string;
                 refillInterval: number | null;
                 refillAmount: number | null;
                 lastRefillAt: Date | null;
-                enabled: boolean | null;
-                rateLimitEnabled: boolean | null;
+                enabled: boolean;
+                rateLimitEnabled: boolean;
                 rateLimitTimeWindow: number | null;
                 rateLimitMax: number | null;
-                requestCount: number | null;
+                requestCount: number;
                 remaining: number | null;
                 lastRequest: Date | null;
                 expiresAt: Date | null;
                 createdAt: Date;
                 updatedAt: Date;
                 permissions: string | null;
-                metadata: ({
-                    user: {
-                        id: string;
-                        email: string;
-                    };
-                    workspace: {
-                        id: string;
-                        title: string;
-                    };
-                } & Record<string, unknown>) | null;
+                metadata: any;
             }[], {
                 code?: string | undefined;
                 message?: string | undefined;
@@ -4892,27 +4910,6 @@ declare class SessionService {
     }>;
 }
 
-type CreateApiKeyPayload = {
-    name?: string;
-    expiresIn?: number;
-    prefix?: string;
-    metadata?: ApiKeyMetadata;
-};
-type UpdateApiKeyPayload = {
-    id: string;
-    name?: string;
-};
-type ApiKeyMetadata = {
-    user: {
-        id: string;
-        email: string;
-    };
-    workspace: {
-        id: string;
-        title: string;
-    };
-} & Record<string, unknown>;
-
 /**
  * Service for managing API keys
  *
@@ -4927,142 +4924,16 @@ declare class ApiKeyService {
      * @param client - The API client for making API key requests
      */
     constructor(client: APIClient);
-    createApiKey(payload: CreateApiKeyPayload): Promise<{
-        key: string;
-        metadata: any;
-        permissions: any;
-        id: string;
-        configId: string;
-        name: string | null;
-        start: string | null;
-        prefix: string | null;
-        referenceId: string;
-        refillInterval: number | null;
-        refillAmount: number | null;
-        lastRefillAt: Date | null;
-        enabled: boolean;
-        rateLimitEnabled: boolean;
-        rateLimitTimeWindow: number | null;
-        rateLimitMax: number | null;
-        requestCount: number;
-        remaining: number | null;
-        lastRequest: Date | null;
-        expiresAt: Date | null;
-        createdAt: Date;
-        updatedAt: Date;
-    }>;
-    getApiKey(id: string): Promise<{
-        metadata: Record<string, any> | null;
-        permissions: {
-            [key: string]: string[];
-        } | null;
-        id: string;
-        configId: string;
-        name: string | null;
-        start: string | null;
-        prefix: string | null;
-        referenceId: string;
-        refillInterval: number | null;
-        refillAmount: number | null;
-        lastRefillAt: Date | null;
-        enabled: boolean;
-        rateLimitEnabled: boolean;
-        rateLimitTimeWindow: number | null;
-        rateLimitMax: number | null;
-        requestCount: number;
-        remaining: number | null;
-        lastRequest: Date | null;
-        expiresAt: Date | null;
-        createdAt: Date;
-        updatedAt: Date;
-    }>;
+    createApiKey(payload: CreateApiKeyPayload): Promise<ApiKey>;
+    getApiKey(id: string): Promise<ApiKeyWithoutSecret>;
     listApiKeys(): Promise<{
-        apiKeys: {
-            metadata: Record<string, any> | null;
-            permissions: {
-                [key: string]: string[];
-            } | null;
-            id: string;
-            configId: string;
-            name: string | null;
-            start: string | null;
-            prefix: string | null;
-            referenceId: string;
-            refillInterval: number | null;
-            refillAmount: number | null;
-            lastRefillAt: Date | null;
-            enabled: boolean;
-            rateLimitEnabled: boolean;
-            rateLimitTimeWindow: number | null;
-            rateLimitMax: number | null;
-            requestCount: number;
-            remaining: number | null;
-            lastRequest: Date | null;
-            expiresAt: Date | null;
-            createdAt: Date;
-            updatedAt: Date;
-        }[];
+        apiKeys: ApiKeyWithoutSecret[];
         total: number;
         limit: number | undefined;
         offset: number | undefined;
     }>;
-    listOrganizationApiKeys(): Promise<{
-        id: string;
-        name: string | null;
-        start: string | null;
-        prefix: string | null;
-        referenceId: string;
-        configId: string | null;
-        refillInterval: number | null;
-        refillAmount: number | null;
-        lastRefillAt: Date | null;
-        enabled: boolean | null;
-        rateLimitEnabled: boolean | null;
-        rateLimitTimeWindow: number | null;
-        rateLimitMax: number | null;
-        requestCount: number | null;
-        remaining: number | null;
-        lastRequest: Date | null;
-        expiresAt: Date | null;
-        createdAt: Date;
-        updatedAt: Date;
-        permissions: string | null;
-        metadata: ({
-            user: {
-                id: string;
-                email: string;
-            };
-            workspace: {
-                id: string;
-                title: string;
-            };
-        } & Record<string, unknown>) | null;
-    }[]>;
-    updateApiKey(payload: UpdateApiKeyPayload): Promise<{
-        metadata: Record<string, any> | null;
-        permissions: {
-            [key: string]: string[];
-        } | null;
-        id: string;
-        configId: string;
-        name: string | null;
-        start: string | null;
-        prefix: string | null;
-        referenceId: string;
-        refillInterval: number | null;
-        refillAmount: number | null;
-        lastRefillAt: Date | null;
-        enabled: boolean;
-        rateLimitEnabled: boolean;
-        rateLimitTimeWindow: number | null;
-        rateLimitMax: number | null;
-        requestCount: number;
-        remaining: number | null;
-        lastRequest: Date | null;
-        expiresAt: Date | null;
-        createdAt: Date;
-        updatedAt: Date;
-    }>;
+    listOrganizationApiKeys(): Promise<ApiKeyWithoutSecret[]>;
+    updateApiKey(payload: UpdateApiKeyPayload): Promise<ApiKeyWithoutSecret>;
     deleteApiKey(id: string): Promise<{
         success: boolean;
     }>;
@@ -5199,4 +5070,4 @@ declare function validateToken(token: string, apiUrl: string): Promise<boolean>;
 declare function extractTokenPayload(token: string): JWTTokenPayload;
 
 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 };
+export type { APIClient, ApiKey, ApiKeyMetadata, ApiKeyWithoutSecret, 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

@@ -6,6 +6,7 @@ import * as better_auth_client from 'better-auth/client';
 import { BetterFetchOption } from 'better-auth/client';
 import * as jose from 'jose';
 import * as _better_auth_sso from '@better-auth/sso';
+import { ApiKey as ApiKey$1 } from '@better-auth/api-key';
 
 declare const ac: {
     newRole<K extends "member" | "access" | "organization" | "invitation" | "team" | "ac">(statements: better_auth_plugins.Subset<K, {
@@ -202,6 +203,32 @@ type JWTTokenPayload = JWTPayload & {
     sessionKey: string;
 };
 
+type ApiKeyMetadata = {
+    user: {
+        id: string;
+        email: string;
+    };
+    workspace: {
+        id: string;
+        title: string;
+    };
+} & Record<string, unknown>;
+type ApiKey = Omit<ApiKey$1, 'metadata' | 'name'> & {
+    name: string;
+    metadata: ApiKeyMetadata;
+};
+type ApiKeyWithoutSecret = Omit<ApiKey, 'key'>;
+type CreateApiKeyPayload = {
+    name: string;
+    expiresIn?: number;
+    prefix?: string;
+    metadata?: ApiKeyMetadata;
+};
+type UpdateApiKeyPayload = {
+    id: string;
+    name: string;
+};
+
 /**
  * Removes index signatures from a type
  * @template T - The type to remove index signatures from
@@ -303,35 +330,26 @@ declare function createAPIClient(apiUrl: string, fetchOptions?: BetterFetchOptio
                 fetchOptions?: FetchOptions | undefined;
             }> | undefined, data_1?: FetchOptions | undefined) => Promise<better_auth_client.BetterFetchResponse<{
                 id: string;
-                name: string | null;
+                name: string;
                 start: string | null;
                 prefix: string | null;
                 referenceId: string;
-                configId: string | null;
+                configId: string;
                 refillInterval: number | null;
                 refillAmount: number | null;
                 lastRefillAt: Date | null;
-                enabled: boolean | null;
-                rateLimitEnabled: boolean | null;
+                enabled: boolean;
+                rateLimitEnabled: boolean;
                 rateLimitTimeWindow: number | null;
                 rateLimitMax: number | null;
-                requestCount: number | null;
+                requestCount: number;
                 remaining: number | null;
                 lastRequest: Date | null;
                 expiresAt: Date | null;
                 createdAt: Date;
                 updatedAt: Date;
                 permissions: string | null;
-                metadata: ({
-                    user: {
-                        id: string;
-                        email: string;
-                    };
-                    workspace: {
-                        id: string;
-                        title: string;
-                    };
-                } & Record<string, unknown>) | null;
+                metadata: any;
             }[], {
                 code?: string | undefined;
                 message?: string | undefined;
@@ -4892,27 +4910,6 @@ declare class SessionService {
     }>;
 }
 
-type CreateApiKeyPayload = {
-    name?: string;
-    expiresIn?: number;
-    prefix?: string;
-    metadata?: ApiKeyMetadata;
-};
-type UpdateApiKeyPayload = {
-    id: string;
-    name?: string;
-};
-type ApiKeyMetadata = {
-    user: {
-        id: string;
-        email: string;
-    };
-    workspace: {
-        id: string;
-        title: string;
-    };
-} & Record<string, unknown>;
-
 /**
  * Service for managing API keys
  *
@@ -4927,142 +4924,16 @@ declare class ApiKeyService {
      * @param client - The API client for making API key requests
      */
     constructor(client: APIClient);
-    createApiKey(payload: CreateApiKeyPayload): Promise<{
-        key: string;
-        metadata: any;
-        permissions: any;
-        id: string;
-        configId: string;
-        name: string | null;
-        start: string | null;
-        prefix: string | null;
-        referenceId: string;
-        refillInterval: number | null;
-        refillAmount: number | null;
-        lastRefillAt: Date | null;
-        enabled: boolean;
-        rateLimitEnabled: boolean;
-        rateLimitTimeWindow: number | null;
-        rateLimitMax: number | null;
-        requestCount: number;
-        remaining: number | null;
-        lastRequest: Date | null;
-        expiresAt: Date | null;
-        createdAt: Date;
-        updatedAt: Date;
-    }>;
-    getApiKey(id: string): Promise<{
-        metadata: Record<string, any> | null;
-        permissions: {
-            [key: string]: string[];
-        } | null;
-        id: string;
-        configId: string;
-        name: string | null;
-        start: string | null;
-        prefix: string | null;
-        referenceId: string;
-        refillInterval: number | null;
-        refillAmount: number | null;
-        lastRefillAt: Date | null;
-        enabled: boolean;
-        rateLimitEnabled: boolean;
-        rateLimitTimeWindow: number | null;
-        rateLimitMax: number | null;
-        requestCount: number;
-        remaining: number | null;
-        lastRequest: Date | null;
-        expiresAt: Date | null;
-        createdAt: Date;
-        updatedAt: Date;
-    }>;
+    createApiKey(payload: CreateApiKeyPayload): Promise<ApiKey>;
+    getApiKey(id: string): Promise<ApiKeyWithoutSecret>;
     listApiKeys(): Promise<{
-        apiKeys: {
-            metadata: Record<string, any> | null;
-            permissions: {
-                [key: string]: string[];
-            } | null;
-            id: string;
-            configId: string;
-            name: string | null;
-            start: string | null;
-            prefix: string | null;
-            referenceId: string;
-            refillInterval: number | null;
-            refillAmount: number | null;
-            lastRefillAt: Date | null;
-            enabled: boolean;
-            rateLimitEnabled: boolean;
-            rateLimitTimeWindow: number | null;
-            rateLimitMax: number | null;
-            requestCount: number;
-            remaining: number | null;
-            lastRequest: Date | null;
-            expiresAt: Date | null;
-            createdAt: Date;
-            updatedAt: Date;
-        }[];
+        apiKeys: ApiKeyWithoutSecret[];
         total: number;
         limit: number | undefined;
         offset: number | undefined;
     }>;
-    listOrganizationApiKeys(): Promise<{
-        id: string;
-        name: string | null;
-        start: string | null;
-        prefix: string | null;
-        referenceId: string;
-        configId: string | null;
-        refillInterval: number | null;
-        refillAmount: number | null;
-        lastRefillAt: Date | null;
-        enabled: boolean | null;
-        rateLimitEnabled: boolean | null;
-        rateLimitTimeWindow: number | null;
-        rateLimitMax: number | null;
-        requestCount: number | null;
-        remaining: number | null;
-        lastRequest: Date | null;
-        expiresAt: Date | null;
-        createdAt: Date;
-        updatedAt: Date;
-        permissions: string | null;
-        metadata: ({
-            user: {
-                id: string;
-                email: string;
-            };
-            workspace: {
-                id: string;
-                title: string;
-            };
-        } & Record<string, unknown>) | null;
-    }[]>;
-    updateApiKey(payload: UpdateApiKeyPayload): Promise<{
-        metadata: Record<string, any> | null;
-        permissions: {
-            [key: string]: string[];
-        } | null;
-        id: string;
-        configId: string;
-        name: string | null;
-        start: string | null;
-        prefix: string | null;
-        referenceId: string;
-        refillInterval: number | null;
-        refillAmount: number | null;
-        lastRefillAt: Date | null;
-        enabled: boolean;
-        rateLimitEnabled: boolean;
-        rateLimitTimeWindow: number | null;
-        rateLimitMax: number | null;
-        requestCount: number;
-        remaining: number | null;
-        lastRequest: Date | null;
-        expiresAt: Date | null;
-        createdAt: Date;
-        updatedAt: Date;
-    }>;
+    listOrganizationApiKeys(): Promise<ApiKeyWithoutSecret[]>;
+    updateApiKey(payload: UpdateApiKeyPayload): Promise<ApiKeyWithoutSecret>;
     deleteApiKey(id: string): Promise<{
         success: boolean;
     }>;
@@ -5199,4 +5070,4 @@ declare function validateToken(token: string, apiUrl: string): Promise<boolean>;
 declare function extractTokenPayload(token: string): JWTTokenPayload;
 
 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 };
+export type { APIClient, ApiKey, ApiKeyMetadata, ApiKeyWithoutSecret, 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,13 +1,13 @@
 import { decodeJwt, createRemoteJWKSet, jwtVerify } from 'jose';
+import { apiKeyClient } from '@better-auth/api-key/client';
 import { ssoClient } from '@better-auth/sso/client';
 import { createAuthClient } from 'better-auth/client';
 import { organizationClient, inferOrgAdditionalFields, twoFactorClient, jwtClient, adminClient, inferAdditionalFields } from 'better-auth/client/plugins';
 import { createAccessControl } from 'better-auth/plugins/access';
 import { defaultStatements } from 'better-auth/plugins/organization/access';
-import { apiKeyClient } from '@better-auth/api-key/client';
 export { APIError } from 'better-auth';
 
-const version = "1.12.0";
+const version = "1.13.1";
 
 const statements = {
   ...defaultStatements,

package/package.json

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