better-auth-firestore 1.2.0 → 1.2.1

package/dist/firebase-adapter.js

@@ -9,14 +9,29 @@ const MAP_TO_FIRESTORE = {
 };
 const MAP_FROM_FIRESTORE = Object.fromEntries(Object.entries(MAP_TO_FIRESTORE).map(([k, v]) => [v, k]));
 const identity = (x) => x;
+const DB_TO_CANONICAL_FIELD = {
+    user_id: "userId",
+    session_token: "sessionToken",
+    provider_account_id: "providerAccountId",
+    email_verified: "emailVerified",
+};
+function canonicalizeFieldName(field) {
+    return DB_TO_CANONICAL_FIELD[field] ?? field;
+}
 function mapFieldsFactory(preferSnakeCase) {
     if (preferSnakeCase) {
         return {
-            toDb: (field) => MAP_TO_FIRESTORE[field] ?? field,
+            toDb: (field) => {
+                const canonical = canonicalizeFieldName(field);
+                return MAP_TO_FIRESTORE[canonical] ?? canonical;
+            },
             fromDb: (field) => MAP_FROM_FIRESTORE[field] ?? field,
         };
     }
-    return { toDb: identity, fromDb: identity };
+    return {
+        toDb: (field) => canonicalizeFieldName(field),
+        fromDb: (field) => MAP_FROM_FIRESTORE[field] ?? field,
+    };
 }
 /**
  * Firestore caps the `IN` operator at 30 comparison values. When a `where`
@@ -170,6 +185,36 @@ function applyOperator(query, field, operator, value) {
             return query.where(field, "==", value);
     }
 }
+function isDocumentReferenceLike(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        "id" in value &&
+        typeof value.id === "string" &&
+        "path" in value &&
+        typeof value.path === "string");
+}
+function normalizeSessionWriteData(data) {
+    const { user_id, session_token, ...rest } = data;
+    const normalized = { ...rest };
+    const userIdValue = normalized.userId ?? user_id;
+    if (typeof userIdValue === "string") {
+        normalized.userId = userIdValue;
+    }
+    else if (isDocumentReferenceLike(userIdValue)) {
+        normalized.userId = userIdValue.id;
+    }
+    const sessionTokenValue = normalized.sessionToken ?? session_token;
+    if (typeof sessionTokenValue === "string") {
+        normalized.sessionToken = sessionTokenValue;
+    }
+    return normalized;
+}
+function normalizeWriteData(model, data) {
+    const normalizedModel = model.toLowerCase().replace(/s$/, "");
+    if (normalizedModel !== "session")
+        return data;
+    return normalizeSessionWriteData(data);
+}
 export const firestoreAdapter = (config = {}) => {
     const db = resolveDb(config);
     const { namingStrategy = "default", collections: collectionsOverride = {}, debugLogs = false, } = (config && config.collection
@@ -193,8 +238,9 @@ export const firestoreAdapter = (config = {}) => {
                         create: async ({ model, data }) => {
                             const col = getCollectionRef(db, model, collections);
                             let ref = col.doc();
+                            const normalizedData = normalizeWriteData(model, data);
                             const docData = {};
-                            for (const [k, v] of Object.entries(data)) {
+                            for (const [k, v] of Object.entries(normalizedData)) {
                                 if (k === "id" && v) {
                                     ref = col.doc(v);
                                     continue;
@@ -202,7 +248,7 @@ export const firestoreAdapter = (config = {}) => {
                                 docData[mapper.toDb(k)] = v;
                             }
                             transaction.set(ref, docData);
-                            return { ...data, id: ref.id };
+                            return { ...normalizedData, id: ref.id };
                         },
                         update: async ({ model, where, update }) => {
                             const col = getCollectionRef(db, model, collections);
@@ -216,8 +262,9 @@ export const firestoreAdapter = (config = {}) => {
                             }
                             if (!doc)
                                 return null;
+                            const normalizedUpdate = normalizeWriteData(model, update);
                             const updateData = {};
-                            for (const [k, v] of Object.entries(update)) {
+                            for (const [k, v] of Object.entries(normalizedUpdate)) {
                                 updateData[mapper.toDb(k)] = v;
                             }
                             transaction.update(doc.ref, updateData);
@@ -228,7 +275,7 @@ export const firestoreAdapter = (config = {}) => {
                                     result[mapper.fromDb(k)] = v;
                                 }
                             }
-                            return { ...result, ...update };
+                            return { ...result, ...normalizedUpdate };
                         },
                         findOne: async ({ model, where }) => {
                             const col = getCollectionRef(db, model, collections);
@@ -261,8 +308,9 @@ export const firestoreAdapter = (config = {}) => {
                 create: async ({ model, data }) => {
                     const col = getCollectionRef(db, model, collections);
                     let ref = col.doc();
+                    const normalizedData = normalizeWriteData(model, data);
                     const docData = {};
-                    for (const [k, v] of Object.entries(data)) {
+                    for (const [k, v] of Object.entries(normalizedData)) {
                         if (k === "id" && v) {
                             ref = col.doc(v);
                             continue;
@@ -300,14 +348,15 @@ export const firestoreAdapter = (config = {}) => {
                     }
                     if (debugLogs) {
                         console.log(`[Firestore Adapter] CREATE ${model} - returning:`, {
-                            ...data,
+                            ...normalizedData,
                             ...result,
                         });
                     }
-                    return { ...data, ...result };
+                    return { ...normalizedData, ...result };
                 },
                 update: async ({ model, where, update }) => {
                     const col = getCollectionRef(db, model, collections);
+                    const normalizedUpdate = normalizeWriteData(model, update);
                     // Special case: if where clause is just "id eq value", use doc() instead of query
                     if (where &&
                         where.length === 1 &&
@@ -330,7 +379,7 @@ export const firestoreAdapter = (config = {}) => {
                             return null;
                         }
                         const updateData = {};
-                        for (const [k, v] of Object.entries(update)) {
+                        for (const [k, v] of Object.entries(normalizedUpdate)) {
                             updateData[mapper.toDb(k)] = v;
                         }
                         if (debugLogs) {
@@ -373,7 +422,7 @@ export const firestoreAdapter = (config = {}) => {
                         return null;
                     }
                     const updateData = {};
-                    for (const [k, v] of Object.entries(update)) {
+                    for (const [k, v] of Object.entries(normalizedUpdate)) {
                         updateData[mapper.toDb(k)] = v;
                     }
                     if (debugLogs) {
@@ -398,8 +447,9 @@ export const firestoreAdapter = (config = {}) => {
                     const col = getCollectionRef(db, model, collections);
                     let count = 0;
                     const seenDocIds = new Set();
+                    const normalizedUpdate = normalizeWriteData(model, update);
                     const updateData = {};
-                    for (const [k, v] of Object.entries(update)) {
+                    for (const [k, v] of Object.entries(normalizedUpdate)) {
                         updateData[mapper.toDb(k)] = v;
                     }
                     for (const whereClause of getChunkedWhereClauses(where)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth-firestore",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": false,
   "description": "Firestore adapter for Better Auth (Firebase Admin SDK)",
   "author": "Slava Yultyyev <yultyyev@gmail.com>",