@delmaredigital/payload-better-auth 0.4.3 → 0.5.0

package/dist/adapter/index.d.ts

@@ -6,7 +6,7 @@
  *
  * @packageDocumentation
  */
-import type { Adapter, BetterAuthOptions } from 'better-auth';
+import type { DBAdapter, BetterAuthOptions } from 'better-auth';
 import type { BasePayload } from 'payload';
 /**
  * Database types supported by Payload CMS.
@@ -48,18 +48,6 @@ export type PayloadAdapterConfig = {
          * - 'text' for UUID
          */
         idType?: 'number' | 'text';
-        /**
-         * Additional fields to convert to numeric IDs beyond the *Id heuristic.
-         * Use when you have ID fields that don't follow the naming convention.
-         * @example ['customOrgRef', 'legacyIdentifier']
-         */
-        idFieldsAllowlist?: string[];
-        /**
-         * Fields to exclude from numeric ID conversion.
-         * Use when a field ends in 'Id' but isn't actually an ID reference.
-         * @example ['visitorId', 'correlationId']
-         */
-        idFieldsBlocklist?: string[];
     };
 };
 /**
@@ -96,5 +84,5 @@ export type PayloadAdapterConfig = {
  * })
  * ```
  */
-export declare function payloadAdapter({ payloadClient, adapterConfig, }: PayloadAdapterConfig): (options: BetterAuthOptions) => Adapter;
-export type { Adapter, BetterAuthOptions };
+export declare function payloadAdapter({ payloadClient, adapterConfig, }: PayloadAdapterConfig): (options: BetterAuthOptions) => DBAdapter;
+export type { DBAdapter, BetterAuthOptions };

package/dist/adapter/index.js

@@ -63,9 +63,7 @@
  * })
  * ```
  */ export function payloadAdapter({ payloadClient, adapterConfig = {} }) {
-    const { enableDebugLogs = false, idFieldsAllowlist = [], idFieldsBlocklist = [] } = adapterConfig;
-    const idFieldsAllowlistSet = new Set(idFieldsAllowlist);
-    const idFieldsBlocklistSet = new Set(idFieldsBlocklist);
+    const { enableDebugLogs = false } = adapterConfig;
     // Resolve payload client (supports lazy initialization)
     async function resolvePayloadClient() {
         return typeof payloadClient === 'function' ? await payloadClient() : payloadClient;
@@ -180,7 +178,9 @@
             disableIdGeneration: true,
             // MongoDB uses ObjectId strings, not numeric IDs
             supportsNumericIds: effectiveDbType !== 'mongodb',
-            supportsDates: true,
+            // Payload returns dates as ISO strings via its Local API, not Date objects.
+            // Setting false tells the factory to convert string dates ↔ Date objects.
+            supportsDates: false,
             supportsBooleans: true,
             supportsJSON: true,
             supportsArrays: false,
@@ -211,22 +211,21 @@
             }
             return resolvePromise;
         };
-        // Helper to convert ID based on type
-        const convertId = (id)=>{
-            if (idType === 'number' && typeof id === 'string') {
-                const num = parseInt(id, 10);
-                return isNaN(num) ? id : num;
-            }
-            if (idType === 'text' && typeof id === 'number') {
-                return String(id);
-            }
-            return id;
-        };
         // Create the adapter using createAdapterFactory
         // The factory handles all schema-aware transformations for us
         const adapterFactory = createAdapterFactory({
             config: factoryConfig,
-            adapter: ({ schema, getModelName, getFieldName, debugLog })=>{
+            adapter: ({ schema, getModelName, debugLog })=>{
+                // Set fieldName on reference fields so the factory maps userId→user, etc.
+                // Payload uses relationship fields without the Id suffix.
+                for (const table of Object.values(schema)){
+                    for (const [fieldKey, fieldDef] of Object.entries(table.fields)){
+                        if (fieldDef.references) {
+                            const stripped = fieldKey.replace(/(_id|Id)$/, '');
+                            if (stripped !== fieldKey) fieldDef.fieldName = stripped;
+                        }
+                    }
+                }
                 // Log initialization
                 if (enableDebugLogs) {
                     debugLog('Adapter initialized', {
@@ -235,126 +234,15 @@
                     });
                 }
                 /**
-         * Get the schema for a model, handling plural/singular lookups.
-         * Better Auth queries with plural names when usePlural is true,
-         * but schema keys are singular.
-         */ function getModelSchema(model) {
-                    // First try direct lookup
-                    if (schema[model]) return schema[model];
-                    // Try singular form (strip trailing 's') for plural model names
-                    const singular = model.endsWith('s') ? model.slice(0, -1) : model;
-                    if (schema[singular]) return schema[singular];
-                    // Try without 'ies' → 'y' conversion (e.g., 'verifications' → 'verification')
-                    // This handles edge cases but 'verifications' → 'verification' works with simple 's' strip
-                    return undefined;
-                }
-                /**
-         * Transform a Better Auth field name to a Payload field name.
-         *
-         * For reference fields (those with `references` in schema), Payload collections
-         * use the field name without the `Id`/`_id` suffix (e.g., `userId` → `user`).
-         * This matches how betterAuthCollections() generates relationship fields.
-         */ function getPayloadFieldName(model, field) {
-                    // First apply any custom field name mappings from BetterAuthOptions
-                    const mappedField = getFieldName({
-                        model,
-                        field
-                    });
-                    // Check if this field is a reference field in the schema
-                    const modelSchema = getModelSchema(model);
-                    if (modelSchema?.fields?.[field]?.references) {
-                        // Strip _id or Id suffix for reference fields
-                        // This matches betterAuthCollections() which does: fieldName.replace(/(_id|Id)$/, '')
-                        return mappedField.replace(/(_id|Id)$/, '');
-                    }
-                    return mappedField;
-                }
-                /**
-         * Transform input data from Better Auth format to Payload format.
-         * Converts reference field names (e.g., `userId` → `user`) and
-         * converts reference field values to the correct ID type.
-         */ function transformDataForPayload(model, data) {
-                    const modelSchema = getModelSchema(model);
-                    if (!modelSchema?.fields) return data;
-                    const transformed = {};
-                    for (const [key, value] of Object.entries(data)){
-                        const payloadKey = getPayloadFieldName(model, key);
-                        let transformedValue = value;
-                        // If this is a reference field, convert the ID to the correct type
-                        const fieldDef = modelSchema.fields[key];
-                        if (fieldDef?.references && value !== null && value !== undefined) {
-                            // Convert reference ID to the correct type (number for SERIAL, string for UUID)
-                            if (idType === 'number' && typeof value === 'string') {
-                                const numValue = parseInt(value, 10);
-                                if (!isNaN(numValue)) {
-                                    transformedValue = numValue;
-                                }
-                            } else if (idType === 'text' && typeof value === 'number') {
-                                transformedValue = String(value);
-                            }
-                        }
-                        transformed[payloadKey] = transformedValue;
-                    }
-                    if (enableDebugLogs) {
-                        console.log('[payload-adapter] transformDataForPayload:', {
-                            model,
-                            inputKeys: Object.keys(data),
-                            outputKeys: Object.keys(transformed),
-                            transformedData: transformed
-                        });
-                    }
-                    return transformed;
-                }
-                /**
-         * Transform output data from Payload format to Better Auth format.
-         * Converts reference field names back (e.g., `user` → `userId`).
-         */ function transformDataFromPayload(model, data) {
-                    const modelSchema = getModelSchema(model);
-                    if (!modelSchema?.fields || !data) return data;
-                    const transformed = {
-                        ...data
-                    };
-                    // For each field in the schema that has references,
-                    // check if Payload returned the stripped name and map it back
-                    for (const [fieldKey, fieldDef] of Object.entries(modelSchema.fields)){
-                        if (fieldDef.references) {
-                            const payloadFieldName = fieldKey.replace(/(_id|Id)$/, '');
-                            if (payloadFieldName in data && !(fieldKey in transformed)) {
-                                transformed[fieldKey] = data[payloadFieldName];
-                            // Keep both for compatibility - Better Auth expects userId
-                            }
-                        }
-                    }
-                    // Convert semantic ID fields to numbers when using serial IDs
-                    // Heuristic: fields ending in 'Id' or '_id' containing numeric strings
-                    // Modified by allowlist (add) and blocklist (exclude)
-                    if (idType === 'number') {
-                        for (const [key, value] of Object.entries(transformed)){
-                            // Skip if not a string or already processed as a reference
-                            if (typeof value !== 'string') continue;
-                            // Check if field should be converted
-                            const matchesHeuristic = /(?:Id|_id)$/.test(key);
-                            const inAllowlist = idFieldsAllowlistSet.has(key);
-                            const inBlocklist = idFieldsBlocklistSet.has(key);
-                            if ((matchesHeuristic || inAllowlist) && !inBlocklist) {
-                                // Only convert if it's a pure numeric string
-                                if (/^\d+$/.test(value)) {
-                                    transformed[key] = parseInt(value, 10);
-                                }
-                            }
-                        }
-                    }
-                    return transformed;
-                }
-                /**
          * Convert Better Auth where clause to Payload where clause.
-         * Handles field name transformations for reference fields.
-         */ function convertWhereToPayload(model, where) {
+         * The factory already handles field name transforms, so we just
+         * convert to Payload's unique where format.
+         */ function convertWhereToPayload(where) {
                     if (!where || where.length === 0) return {};
                     if (where.length === 1) {
                         const w = where[0];
                         return {
-                            [getPayloadFieldName(model, w.field)]: convertOperator(w.operator, w.value, resolvedDbType ?? 'postgres')
+                            [w.field]: convertOperator(w.operator, w.value, resolvedDbType ?? 'postgres')
                         };
                     }
                     const andConditions = where.filter((w)=>w.connector !== 'OR');
@@ -362,12 +250,12 @@
                     const result = {};
                     if (andConditions.length > 0) {
                         result.and = andConditions.map((w)=>({
-                                [getPayloadFieldName(model, w.field)]: convertOperator(w.operator, w.value, resolvedDbType ?? 'postgres')
+                                [w.field]: convertOperator(w.operator, w.value, resolvedDbType ?? 'postgres')
                             }));
                     }
                     if (orConditions.length > 0) {
                         result.or = orConditions.map((w)=>({
-                                [getPayloadFieldName(model, w.field)]: convertOperator(w.operator, w.value, resolvedDbType ?? 'postgres')
+                                [w.field]: convertOperator(w.operator, w.value, resolvedDbType ?? 'postgres')
                             }));
                     }
                     return result;
@@ -386,35 +274,31 @@
                     create: async ({ model, data })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
-                        const payloadData = transformDataForPayload(model, data);
                         if (enableDebugLogs) {
                             debugLog('create', {
                                 collection,
                                 model,
-                                data,
-                                payloadData
+                                data
                             });
                         }
                         try {
                             const result = await payload.create({
                                 collection,
-                                data: payloadData,
+                                data: data,
                                 depth: 0,
                                 // Bypass access control - Better Auth handles its own auth
                                 overrideAccess: true
                             });
-                            // Transform back and merge with input data for Better Auth
+                            // Merge with input data for Better Auth
                             // Database result takes precedence (handles hooks that modify data like firstUserAdmin)
-                            const transformed = transformDataFromPayload(model, result);
                             const merged = {
                                 ...data,
-                                ...transformed
+                                ...result
                             };
                             if (enableDebugLogs) {
                                 debugLog('create result', {
                                     collection,
                                     resultId: result.id,
-                                    transformedKeys: Object.keys(transformed),
                                     mergedKeys: Object.keys(merged)
                                 });
                             }
@@ -446,26 +330,24 @@
                                 try {
                                     const result = await payload.findByID({
                                         collection,
-                                        id: convertId(id),
+                                        id,
                                         depth: join ? 1 : 0,
                                         overrideAccess: true
                                     });
-                                    const transformed = transformDataFromPayload(model, result);
                                     if (enableDebugLogs) {
                                         debugLog('findOne result (byID)', {
                                             collection,
-                                            id: convertId(id),
-                                            found: true,
-                                            transformedKeys: Object.keys(transformed)
+                                            id,
+                                            found: true
                                         });
                                     }
-                                    return transformed;
+                                    return result;
                                 } catch (error) {
                                     if (error instanceof Error && 'status' in error && error.status === 404) {
                                         if (enableDebugLogs) {
                                             debugLog('findOne result (byID)', {
                                                 collection,
-                                                id: convertId(id),
+                                                id,
                                                 found: false
                                             });
                                         }
@@ -474,7 +356,7 @@
                                     throw error;
                                 }
                             }
-                            const payloadWhere = convertWhereToPayload(model, where);
+                            const payloadWhere = convertWhereToPayload(where);
                             if (enableDebugLogs) {
                                 debugLog('findOne query', {
                                     collection,
@@ -498,14 +380,7 @@
                                 });
                             }
                             if (!result.docs[0]) return null;
-                            const transformed = transformDataFromPayload(model, result.docs[0]);
-                            if (enableDebugLogs) {
-                                debugLog('findOne transformed', {
-                                    collection,
-                                    transformedKeys: Object.keys(transformed)
-                                });
-                            }
-                            return transformed;
+                            return result.docs[0];
                         } catch (error) {
                             console.error('[payload-adapter] findOne failed:', {
                                 model,
@@ -528,29 +403,27 @@
                                 sortBy
                             });
                         }
-                        const payloadWhere = where ? convertWhereToPayload(model, where) : {};
+                        const payloadWhere = where ? convertWhereToPayload(where) : {};
                         const result = await payload.find({
                             collection,
                             where: payloadWhere,
                             limit: limit ?? 100,
                             page: offset ? Math.floor(offset / (limit ?? 100)) + 1 : 1,
-                            sort: sortBy ? `${sortBy.direction === 'desc' ? '-' : ''}${getPayloadFieldName(model, sortBy.field)}` : undefined,
+                            sort: sortBy ? `${sortBy.direction === 'desc' ? '-' : ''}${sortBy.field}` : undefined,
                             depth: join ? 1 : 0,
                             overrideAccess: true
                         });
-                        return result.docs.map((doc)=>transformDataFromPayload(model, doc));
+                        return result.docs;
                     },
                     update: async ({ model, where, update: data })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
-                        const payloadData = transformDataForPayload(model, data);
                         if (enableDebugLogs) {
                             debugLog('update', {
                                 collection,
                                 model,
                                 where,
-                                data,
-                                payloadData
+                                data
                             });
                         }
                         // Optimize for single ID queries
@@ -558,50 +431,46 @@
                         if (id !== null) {
                             const result = await payload.update({
                                 collection,
-                                id: convertId(id),
-                                data: payloadData,
+                                id,
+                                data: data,
                                 depth: 0,
                                 overrideAccess: true
                             });
-                            const transformed = transformDataFromPayload(model, result);
                             return {
                                 ...data,
-                                ...transformed
+                                ...result
                             };
                         }
-                        const payloadWhere = convertWhereToPayload(model, where);
+                        const payloadWhere = convertWhereToPayload(where);
                         const result = await payload.update({
                             collection,
                             where: payloadWhere,
-                            data: payloadData,
+                            data: data,
                             depth: 0,
                             overrideAccess: true
                         });
                         if (!result.docs[0]) return null;
-                        const transformed = transformDataFromPayload(model, result.docs[0]);
                         return {
                             ...data,
-                            ...transformed
+                            ...result.docs[0]
                         };
                     },
                     updateMany: async ({ model, where, update: data })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
-                        const payloadData = transformDataForPayload(model, data);
                         if (enableDebugLogs) {
                             debugLog('updateMany', {
                                 collection,
                                 model,
                                 where,
-                                data,
-                                payloadData
+                                data
                             });
                         }
-                        const payloadWhere = convertWhereToPayload(model, where);
+                        const payloadWhere = convertWhereToPayload(where);
                         const result = await payload.update({
                             collection,
                             where: payloadWhere,
-                            data: payloadData,
+                            data: data,
                             depth: 0,
                             overrideAccess: true
                         });
@@ -622,12 +491,12 @@
                         if (id !== null) {
                             await payload.delete({
                                 collection,
-                                id: convertId(id),
+                                id,
                                 overrideAccess: true
                             });
                             return;
                         }
-                        const payloadWhere = convertWhereToPayload(model, where);
+                        const payloadWhere = convertWhereToPayload(where);
                         await payload.delete({
                             collection,
                             where: payloadWhere,
@@ -644,7 +513,7 @@
                                 where
                             });
                         }
-                        const payloadWhere = convertWhereToPayload(model, where);
+                        const payloadWhere = convertWhereToPayload(where);
                         const result = await payload.delete({
                             collection,
                             where: payloadWhere,
@@ -662,7 +531,7 @@
                                 where
                             });
                         }
-                        const payloadWhere = where ? convertWhereToPayload(model, where) : {};
+                        const payloadWhere = where ? convertWhereToPayload(where) : {};
                         const result = await payload.count({
                             collection,
                             where: payloadWhere,

package/dist/components/management/ApiKeysManagementClient.js

@@ -198,7 +198,8 @@ import { createPayloadAuthClient } from '../../exports/client.js';
             if (result.error) {
                 setError(result.error.message ?? 'Failed to load API keys');
             } else {
-                setApiKeys(result.data ?? []);
+                const data = result.data;
+                setApiKeys(Array.isArray(data) ? data : data.apiKeys ?? []);
             }
         } catch  {
             setError('Failed to load API keys');