@terreno/api 0.3.0 → 0.4.0

package/dist/api.js

@@ -879,7 +879,7 @@ function _buildModelRouter(model, options) {
     }); }));
     function arrayOperation(req, res, operation) {
         return __awaiter(this, void 0, void 0, function () {
-            var doc, prevDoc, field, array, index, body, error_17, error_18, error_19;
+            var doc, prevDoc, field, itemId, array, index, body, error_17, error_18, error_19;
             var _a;
             var _b, _c;
             return __generator(this, function (_d) {
@@ -911,36 +911,37 @@ function _buildModelRouter(model, options) {
                                 title: "Patch not allowed for user ".concat((_c = req.user) === null || _c === void 0 ? void 0 : _c.id, " on doc ").concat(doc._id),
                             });
                         }
+                        field = req.params.field;
+                        itemId = req.params.itemId;
                         // We apply the operation *before* the hooks. As far as the callers are concerned, this should
                         // be like PATCHing the field and replacing the whole thing.
-                        if (operation !== "DELETE" && req.body[req.params.field] === undefined) {
+                        if (operation !== "DELETE" && req.body[field] === undefined) {
                             throw new errors_1.APIError({
                                 status: 400,
                                 title: "Malformed body, array operations should have a single, top level key, got: ".concat(Object.keys(req.body).join(",")),
                             });
                         }
-                        field = req.params.field;
                         array = __spreadArray([], __read(doc[field]), false);
                         if (operation === "POST") {
                             array.push(req.body[field]);
                         }
                         else if (operation === "PATCH" || operation === "DELETE") {
                             index = void 0;
-                            if ((0, utils_1.isValidObjectId)(req.params.itemId)) {
-                                index = array.findIndex(function (x) { return x.id === req.params.itemId; });
+                            if ((0, utils_1.isValidObjectId)(itemId)) {
+                                index = array.findIndex(function (x) { return x.id === itemId; });
                             }
                             else {
-                                index = array.findIndex(function (x) { return x === req.params.itemId; });
+                                index = array.findIndex(function (x) { return x === itemId; });
                             }
                             if (index === -1) {
                                 throw new errors_1.APIError({
                                     status: 404,
-                                    title: "Could not find ".concat(field, "/").concat(req.params.itemId),
+                                    title: "Could not find ".concat(field, "/").concat(itemId),
                                 });
                             }
                             // For PATCHing an item by ID, we need to merge the objects so we don't override the _id or
                             // other parts of the subdocument.
-                            if (operation === "PATCH" && (0, utils_1.isValidObjectId)(req.params.itemId)) {
+                            if (operation === "PATCH" && (0, utils_1.isValidObjectId)(itemId)) {
                                 Object.assign(array[index], req.body[field]);
                             }
                             else if (operation === "PATCH") {

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();
@@ -229,7 +235,7 @@ var mountBetterAuthRoutes = function (app, auth, basePath) {
     if (basePath === void 0) { basePath = "/api/auth"; }
     var handler = (0, node_1.toNodeHandler)(auth);
     // Mount at the base path with wildcard
-    app.all("".concat(basePath, "/*"), function (req, res) {
+    app.all("".concat(basePath, "/*path"), function (req, res) {
         return handler(req, res);
     });
     logger_1.logger.info("Better Auth routes mounted at ".concat(basePath, "/*"));

package/dist/configuration.test.d.ts

@@ -0,0 +1 @@
+export {};