@delmaredigital/payload-better-auth 0.3.14 → 0.3.15

package/README.md

@@ -545,12 +545,14 @@ Payload auth strategy for Better Auth session validation.
 ```ts
 betterAuthStrategy({
   usersCollection: 'users',
+  idType: 'number', // default — coerces session field IDs for serial IDs
 })
 ```
 
 | Option | Type | Description |
 |--------|------|-------------|
 | `usersCollection` | `string` | The collection slug for users (default: `'users'`) |
+| `idType` | `'number' \| 'text'` | Coerces string IDs in session fields (`activeOrganizationId`, etc.) to numbers. Defaults to `'number'` matching the adapter default. Set to `'text'` for UUID IDs. |
 
 ### `getServerSession<TUser>(payload, headers)`
 

package/dist/plugin/index.d.ts

@@ -178,6 +178,17 @@ export type BetterAuthStrategyOptions = {
      * @default 'members'
      */
     membersCollection?: string;
+    /**
+     * ID type strategy matching your adapter's `adapterConfig.idType`.
+     *
+     * When `'number'` (default), coerces string IDs in session fields
+     * (e.g., `activeOrganizationId`) to numbers before merging onto `req.user`.
+     * Better Auth always returns string IDs from `api.getSession()`, but Payload
+     * relationship fields expect numbers when using serial IDs.
+     *
+     * @default 'number'
+     */
+    idType?: 'number' | 'text';
 };
 /**
  * Payload auth strategy that uses Better Auth for authentication.

package/dist/plugin/index.js

@@ -459,7 +459,7 @@ let apiKeyScopesConfig = undefined;
  * }
  * ```
  */ export function betterAuthStrategy(options = {}) {
-    const { usersCollection = 'users', membersCollection = 'members' } = options;
+    const { usersCollection = 'users', membersCollection = 'members', idType = 'number' } = options;
     return {
         name: 'better-auth',
         authenticate: async ({ payload, headers })=>{
@@ -498,6 +498,19 @@ let apiKeyScopesConfig = undefined;
                 // Extract session fields to merge onto user (e.g., activeOrganizationId from org plugin)
                 // Exclude fields that might conflict with user fields
                 const { id: _sessionId, userId: _userId, expiresAt: _expiresAt, token: _token, ...sessionFields } = sessionData.session || {};
+                // Coerce string IDs in session fields to numbers when using serial IDs.
+                // BA's api.getSession() always returns strings, but Payload relationship
+                // fields expect numbers for serial IDs.
+                if (idType === 'number') {
+                    for (const [key, value] of Object.entries(sessionFields)){
+                        if (typeof value !== 'string') continue;
+                        if (key === 'id' || /(?:Id|_id)$/.test(key)) {
+                            if (/^\d+$/.test(value)) {
+                                sessionFields[key] = parseInt(value, 10);
+                            }
+                        }
+                    }
+                }
                 // If there's an active organization, fetch the user's role in that org
                 let organizationRole;
                 if (sessionFields.activeOrganizationId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@delmaredigital/payload-better-auth",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "description": "Better Auth adapter and plugins for Payload CMS",
   "type": "module",
   "license": "MIT",