@terreno/api 0.2.0 → 0.3.1

package/dist/auth.d.ts

@@ -19,7 +19,7 @@ export interface UserModel extends Model<User> {
     deserializeUser(): any;
     findByUsername(username: string, findOpts: any): any;
 }
-export declare function authenticateMiddleware(anonymous?: boolean): any;
+export declare function authenticateMiddleware(anonymous?: boolean): (req: any, res: any, next: any) => any;
 export declare function signupUser(userModel: UserModel, email: string, password: string, body?: any): Promise<any>;
 /**
  * Generates both an access token (JWT) and a refresh token for a given user.

package/dist/auth.js

@@ -82,11 +82,17 @@ function authenticateMiddleware(anonymous) {
     if (anonymous) {
         strategies.push("anonymous");
     }
-    return passport_1.default.authenticate(strategies, {
+    var passportAuth = passport_1.default.authenticate(strategies, {
         failureMessage: false, // this is just avoiding storing the message in the session
         failWithError: true,
         session: false,
     });
+    return function (req, res, next) {
+        if (req.user) {
+            return next();
+        }
+        return passportAuth(req, res, next);
+    };
 }
 function signupUser(userModel, email, password, body) {
     return __awaiter(this, void 0, void 0, function () {

package/dist/betterAuthSetup.js

@@ -5,6 +5,17 @@
  * This module provides functions to initialize Better Auth with MongoDB,
  * create session middleware, and sync users with the application User model.
  */
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -169,7 +180,7 @@ exports.createBetterAuthSessionMiddleware = createBetterAuthSessionMiddleware;
  * Creates or updates the user as needed.
  */
 var syncBetterAuthUser = function (userModel, betterAuthUser, oauthProvider) { return __awaiter(void 0, void 0, void 0, function () {
-    var existingUser, userByEmail, newUser, error_2;
+    var existingUser, userByEmail, useAsId, newUser, error_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -201,13 +212,8 @@ var syncBetterAuthUser = function (userModel, betterAuthUser, oauthProvider) { r
                 _a.sent();
                 return [2 /*return*/, userByEmail];
             case 6:
-                newUser = new userModel({
-                    admin: false,
-                    betterAuthId: betterAuthUser.id,
-                    email: betterAuthUser.email,
-                    name: betterAuthUser.name || betterAuthUser.email.split("@")[0],
-                    oauthProvider: oauthProvider || null,
-                });
+                useAsId = mongoose_1.default.isValidObjectId(betterAuthUser.id) ? { _id: betterAuthUser.id } : {};
+                newUser = new userModel(__assign(__assign({}, useAsId), { admin: false, betterAuthId: betterAuthUser.id, email: betterAuthUser.email, name: betterAuthUser.name || betterAuthUser.email.split("@")[0], oauthProvider: oauthProvider || null }));
                 return [4 /*yield*/, newUser.save()];
             case 7:
                 _a.sent();

package/dist/expressServer.js

@@ -242,7 +242,7 @@ function initializeRoutes(UserModel, addRoutes, options) {
     if (options.addMiddleware) {
         options.addMiddleware(app);
     }
-    app.use(express_1.default.json());
+    app.use(express_1.default.json({ limit: "50mb" }));
     // Add login/signup/refresh_token before the JWT/auth middlewares
     (0, auth_1.addAuthRoutes)(app, UserModel, options === null || options === void 0 ? void 0 : options.authOptions);
     (0, auth_1.setupAuth)(app, UserModel);

package/dist/terrenoApp.js

@@ -205,7 +205,7 @@ var TerrenoApp = /** @class */ (function () {
         var app = (0, express_1.default)();
         var options = this.options;
         app.set("query parser", function (str) { var _a; return qs_1.default.parse(str, { arrayLimit: (_a = options.arrayLimit) !== null && _a !== void 0 ? _a : 200 }); });
-        app.use((0, cors_1.default)({ origin: (_c = options.corsOrigin) !== null && _c !== void 0 ? _c : "*" }));
+        app.use((0, cors_1.default)({ credentials: true, origin: (_c = options.corsOrigin) !== null && _c !== void 0 ? _c : "*" }));
         try {
             // Apply custom middleware before JSON parsing
             for (var _d = __values(this.middlewareFns), _e = _d.next(); !_e.done; _e = _d.next()) {

package/package.json

@@ -93,5 +93,5 @@
     "updateSnapshot": "bun test --update-snapshots"
   },
   "types": "dist/index.d.ts",
-  "version": "0.2.0"
+  "version": "0.3.1"
 }

package/src/auth.ts

@@ -44,11 +44,17 @@ export function authenticateMiddleware(anonymous = false) {
   if (anonymous) {
     strategies.push("anonymous");
   }
-  return passport.authenticate(strategies, {
+  const passportAuth = passport.authenticate(strategies, {
     failureMessage: false, // this is just avoiding storing the message in the session
     failWithError: true,
     session: false,
   });
+  return (req: any, res: any, next: any) => {
+    if (req.user) {
+      return next();
+    }
+    return passportAuth(req, res, next);
+  };
 }
 
 export async function signupUser(

package/src/betterAuthSetup.ts

@@ -175,8 +175,10 @@ export const syncBetterAuthUser = async (
       return userByEmail;
     }
 
-    // Create new user
+    // Use Better Auth ID as _id when it's a valid ObjectId (MongoDB adapter) so frontend IDs match
+    const useAsId = mongoose.isValidObjectId(betterAuthUser.id) ? {_id: betterAuthUser.id} : {};
     const newUser: any = new (userModel as any)({
+      ...useAsId,
       admin: false,
       betterAuthId: betterAuthUser.id,
       email: betterAuthUser.email,

package/src/expressServer.ts

@@ -193,7 +193,7 @@ function initializeRoutes(
     options.addMiddleware(app);
   }
 
-  app.use(express.json());
+  app.use(express.json({limit: "50mb"}));
 
   // Add login/signup/refresh_token before the JWT/auth middlewares
   addAuthRoutes(app, UserModel as any, options?.authOptions);

package/src/terrenoApp.ts

@@ -204,7 +204,7 @@ export class TerrenoApp {
       qs.parse(str, {arrayLimit: options.arrayLimit ?? 200})
     );
 
-    app.use(cors({origin: options.corsOrigin ?? "*"}));
+    app.use(cors({credentials: true, origin: options.corsOrigin ?? "*"}));
 
     // Apply custom middleware before JSON parsing
     for (const fn of this.middlewareFns) {