@terreno/api 0.11.7 → 0.11.9

package/dist/githubAuth.js

@@ -39,14 +39,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.githubUserPlugin = githubUserPlugin;
-exports.setupGitHubAuth = setupGitHubAuth;
-exports.addGitHubAuthRoutes = addGitHubAuthRoutes;
+exports.addGitHubAuthRoutes = exports.setupGitHubAuth = exports.githubUserPlugin = void 0;
 var passport_1 = __importDefault(require("passport"));
 var passport_github2_1 = require("passport-github2");
 var auth_1 = require("./auth");
 var errors_1 = require("./errors");
 var logger_1 = require("./logger");
+var plugins_1 = require("./plugins");
 /**
  * Plugin to add GitHub authentication fields to a user schema.
  * Apply this plugin to your User schema if you want to enable GitHub auth.
@@ -58,20 +57,20 @@ var logger_1 = require("./logger");
  * userSchema.plugin(githubUserPlugin);
  * ```
  */
-function githubUserPlugin(schema) {
+var githubUserPlugin = function (schema) {
     schema.add({
         githubAvatarUrl: { type: String },
         githubId: { index: true, sparse: true, type: String, unique: true },
         githubProfileUrl: { type: String },
         githubUsername: { type: String },
     });
-}
+};
+exports.githubUserPlugin = githubUserPlugin;
 /**
  * Sets up GitHub OAuth authentication strategy.
  * Call this after setupAuth() in your server initialization.
  */
-function setupGitHubAuth(_app, userModel, githubOptions) {
-    var _this = this;
+var setupGitHubAuth = function (_app, userModel, githubOptions) {
     var _a;
     var scope = (_a = githubOptions.scope) !== null && _a !== void 0 ? _a : ["user:email"];
     passport_1.default.use("github", new passport_github2_1.Strategy({
@@ -80,7 +79,7 @@ function setupGitHubAuth(_app, userModel, githubOptions) {
         clientSecret: githubOptions.clientSecret,
         passReqToCallback: true,
         scope: scope,
-    }, (function (req, accessToken, refreshToken, profile, done) { return __awaiter(_this, void 0, void 0, function () {
+    }, (function (req, accessToken, refreshToken, profile, done) { return __awaiter(void 0, void 0, void 0, function () {
         var existingUser, user, githubId, existingGitHubUser, user, email, existingEmailUser, newUser, error_1;
         var _a, _b, _c, _d, _e, _f, _g, _h;
         return __generator(this, function (_j) {
@@ -95,7 +94,7 @@ function setupGitHubAuth(_app, userModel, githubOptions) {
                     return [2 /*return*/, done(null, user)];
                 case 2:
                     githubId = profile.id;
-                    return [4 /*yield*/, userModel.findOne({ githubId: githubId })];
+                    return [4 /*yield*/, (0, plugins_1.findOneOrNoneFor)(userModel, { githubId: githubId })];
                 case 3:
                     existingGitHubUser = _j.sent();
                     if (!existingUser) return [3 /*break*/, 7];
@@ -129,7 +128,7 @@ function setupGitHubAuth(_app, userModel, githubOptions) {
                     }
                     email = (_d = (_c = profile.emails) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.value;
                     if (!email) return [3 /*break*/, 11];
-                    return [4 /*yield*/, userModel.findOne({ email: email })];
+                    return [4 /*yield*/, (0, plugins_1.findOneOrNoneFor)(userModel, { email: email })];
                 case 8:
                     existingEmailUser = _j.sent();
                     if (!existingEmailUser) return [3 /*break*/, 11];
@@ -167,7 +166,8 @@ function setupGitHubAuth(_app, userModel, githubOptions) {
             }
         });
     }); })));
-}
+};
+exports.setupGitHubAuth = setupGitHubAuth;
 /**
  * Adds GitHub OAuth routes to the Express application.
  *
@@ -177,8 +177,7 @@ function setupGitHubAuth(_app, userModel, githubOptions) {
  * - POST /auth/github/link - Links GitHub account to authenticated user (requires JWT auth)
  * - DELETE /auth/github/unlink - Unlinks GitHub account from authenticated user (requires JWT auth)
  */
-function addGitHubAuthRoutes(app, userModel, githubOptions, authOptions) {
-    var _this = this;
+var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions) {
     var router = require("express").Router();
     // Initiate GitHub OAuth flow
     router.get("/github", function (req, _res, next) {
@@ -194,7 +193,7 @@ function addGitHubAuthRoutes(app, userModel, githubOptions, authOptions) {
     router.get("/github/callback", passport_1.default.authenticate("github", {
         failureRedirect: "/auth/github/failure",
         session: false,
-    }), function (req, res) { return __awaiter(_this, void 0, void 0, function () {
+    }), function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
         var tokens, returnTo, url, error_2;
         var _a, _b, _c, _d;
         return __generator(this, function (_e) {
@@ -249,7 +248,7 @@ function addGitHubAuthRoutes(app, userModel, githubOptions, authOptions) {
             })(req, res, next);
         }, passport_1.default.authenticate("github", { session: false }));
         // Unlink GitHub from user account
-        router.delete("/github/unlink", passport_1.default.authenticate("jwt", { session: false }), function (req, res) { return __awaiter(_this, void 0, void 0, function () {
+        router.delete("/github/unlink", passport_1.default.authenticate("jwt", { session: false }), function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
             var user, hasPassword, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -290,4 +289,5 @@ function addGitHubAuthRoutes(app, userModel, githubOptions, authOptions) {
         }); });
     }
     app.use("/auth", router);
-}
+};
+exports.addGitHubAuthRoutes = addGitHubAuthRoutes;

package/dist/middleware.d.ts

@@ -7,4 +7,4 @@ import type { NextFunction, Request, Response } from "express";
  *
  * Expected header: `App-Version`
  */
-export declare function sentryAppVersionMiddleware(req: Request, _res: Response, next: NextFunction): void;
+export declare const sentryAppVersionMiddleware: (req: Request, _res: Response, next: NextFunction) => void;

package/dist/middleware.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sentryAppVersionMiddleware = sentryAppVersionMiddleware;
+exports.sentryAppVersionMiddleware = void 0;
 var Sentry = __importStar(require("@sentry/bun"));
 /**
  * Express middleware that captures the app version from the request header
@@ -43,10 +43,11 @@ var Sentry = __importStar(require("@sentry/bun"));
  *
  * Expected header: `App-Version`
  */
-function sentryAppVersionMiddleware(req, _res, next) {
+var sentryAppVersionMiddleware = function (req, _res, next) {
     var appVersion = req.get("App-Version");
     if (appVersion) {
         Sentry.getCurrentScope().setTag("app_version", appVersion);
     }
     next();
-}
+};
+exports.sentryAppVersionMiddleware = sentryAppVersionMiddleware;

package/dist/middleware.test.d.ts

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

package/dist/middleware.test.js

@@ -0,0 +1,82 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var bun_test_1 = require("bun:test");
+var Sentry = __importStar(require("@sentry/bun"));
+var middleware_1 = require("./middleware");
+var buildReq = function (headers) {
+    return {
+        get: function (name) { return headers[name]; },
+    };
+};
+var buildNext = function () { return (0, bun_test_1.mock)(function () { }); };
+(0, bun_test_1.describe)("sentryAppVersionMiddleware", function () {
+    var setTagMock;
+    (0, bun_test_1.beforeEach)(function () {
+        // bunSetup.ts mocks @sentry/bun so that getCurrentScope() returns a scope
+        // with a Bun mock setTag. Clear that mock between tests so each assertion
+        // sees only its own calls.
+        setTagMock = Sentry.getCurrentScope().setTag;
+        setTagMock.mockClear();
+    });
+    (0, bun_test_1.it)("sets the app_version tag when the App-Version header is present", function () {
+        var next = buildNext();
+        var req = buildReq({ "App-Version": "1.2.3" });
+        (0, middleware_1.sentryAppVersionMiddleware)(req, {}, next);
+        (0, bun_test_1.expect)(setTagMock).toHaveBeenCalledTimes(1);
+        (0, bun_test_1.expect)(setTagMock.mock.calls[0]).toEqual(["app_version", "1.2.3"]);
+        (0, bun_test_1.expect)(next).toHaveBeenCalledTimes(1);
+    });
+    (0, bun_test_1.it)("does not set a tag when the App-Version header is missing", function () {
+        var next = buildNext();
+        var req = buildReq({});
+        (0, middleware_1.sentryAppVersionMiddleware)(req, {}, next);
+        (0, bun_test_1.expect)(setTagMock).not.toHaveBeenCalled();
+        (0, bun_test_1.expect)(next).toHaveBeenCalledTimes(1);
+    });
+    (0, bun_test_1.it)("does not set a tag when the App-Version header is an empty string", function () {
+        var next = buildNext();
+        var req = buildReq({ "App-Version": "" });
+        (0, middleware_1.sentryAppVersionMiddleware)(req, {}, next);
+        (0, bun_test_1.expect)(setTagMock).not.toHaveBeenCalled();
+        (0, bun_test_1.expect)(next).toHaveBeenCalledTimes(1);
+    });
+    (0, bun_test_1.it)("calls next exactly once with no arguments when the header is present", function () {
+        var next = buildNext();
+        (0, middleware_1.sentryAppVersionMiddleware)(buildReq({ "App-Version": "9.9.9" }), {}, next);
+        (0, bun_test_1.expect)(next).toHaveBeenCalledTimes(1);
+        (0, bun_test_1.expect)(next.mock.calls[0]).toHaveLength(0);
+    });
+});

package/dist/notifiers/googleChatNotifier.js

@@ -108,7 +108,7 @@ var sendToGoogleChat = function (messageText_1) {
         args_1[_i - 1] = arguments[_i];
     }
     return __awaiter(void 0, __spreadArray([messageText_1], __read(args_1), false), void 0, function (messageText, _a) {
-        var chatWebhooksString, msg, chatWebhooks, chatChannel, chatWebhookUrl, msg, formattedMessageText, error_1;
+        var chatWebhooksString, msg, chatWebhooks, chatChannel, chatWebhookUrl, msg, formattedMessageText, error_1, errorObj;
         var _b, _c, _d;
         var _e = _a === void 0 ? {} : _a, channel = _e.channel, _f = _e.shouldThrow, shouldThrow = _f === void 0 ? false : _f, env = _e.env;
         return __generator(this, function (_g) {
@@ -143,12 +143,13 @@ var sendToGoogleChat = function (messageText_1) {
                     return [3 /*break*/, 4];
                 case 3:
                     error_1 = _g.sent();
-                    logger_1.logger.error("Error posting to Google Chat: ".concat((_c = error_1.text) !== null && _c !== void 0 ? _c : error_1.message));
+                    errorObj = error_1;
+                    logger_1.logger.error("Error posting to Google Chat: ".concat((_c = errorObj.text) !== null && _c !== void 0 ? _c : errorObj.message));
                     Sentry.captureException(error_1);
                     if (shouldThrow) {
                         throw new errors_1.APIError({
                             status: 500,
-                            title: "Error posting to Google Chat: ".concat((_d = error_1.text) !== null && _d !== void 0 ? _d : error_1.message),
+                            title: "Error posting to Google Chat: ".concat((_d = errorObj.text) !== null && _d !== void 0 ? _d : errorObj.message),
                         });
                     }
                     return [3 /*break*/, 4];

package/dist/notifiers/zoomNotifier.js

@@ -103,12 +103,12 @@ var logger_1 = require("../logger");
  * Uses Zoom's rich message format (format=full) with structured header and body.
  */
 var sendToZoom = function (_a, _b) { return __awaiter(void 0, [_a, _b], void 0, function (_c, _d) {
-    var zoomWebhooksString, msg, zoomWebhooks, zoomChannel, zoomWebhookUrl, msg, zoomToken, msg, messageBody, error_1;
-    var _e, _f, _g, _h, _j, _k, _l, _m;
+    var zoomWebhooksString, msg, zoomWebhooks, zoomChannel, zoomWebhookUrl, msg, zoomToken, msg, messageBody, error_1, errorMessage;
+    var _e, _f, _g, _h, _j, _k;
     var header = _c.header, body = _c.body, subheader = _c.subheader;
-    var channel = _d.channel, _o = _d.shouldThrow, shouldThrow = _o === void 0 ? false : _o, env = _d.env;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var channel = _d.channel, _l = _d.shouldThrow, shouldThrow = _l === void 0 ? false : _l, env = _d.env;
+    return __generator(this, function (_m) {
+        switch (_m.label) {
             case 0:
                 zoomWebhooksString = process.env.ZOOM_CHAT_WEBHOOKS;
                 if (!zoomWebhooksString) {
@@ -149,9 +149,9 @@ var sendToZoom = function (_a, _b) { return __awaiter(void 0, [_a, _b], void 0,
                         text: subheader,
                     };
                 }
-                _p.label = 1;
+                _m.label = 1;
             case 1:
-                _p.trys.push([1, 3, , 4]);
+                _m.trys.push([1, 3, , 4]);
                 return [4 /*yield*/, axios_1.default.post("".concat(zoomWebhookUrl, "?format=full"), { content: messageBody }, {
                         headers: {
                             Authorization: zoomToken,
@@ -159,16 +159,17 @@ var sendToZoom = function (_a, _b) { return __awaiter(void 0, [_a, _b], void 0,
                         },
                     })];
             case 2:
-                _p.sent();
+                _m.sent();
                 return [3 /*break*/, 4];
             case 3:
-                error_1 = _p.sent();
-                logger_1.logger.error("Error posting to Zoom: ".concat((_l = error_1.text) !== null && _l !== void 0 ? _l : error_1.message));
+                error_1 = _m.sent();
+                errorMessage = error_1 instanceof Error ? error_1.message : String(error_1);
+                logger_1.logger.error("Error posting to Zoom: ".concat(errorMessage));
                 Sentry.captureException(error_1);
                 if (shouldThrow) {
                     throw new errors_1.APIError({
                         status: 500,
-                        title: "Error posting to Zoom: ".concat((_m = error_1.text) !== null && _m !== void 0 ? _m : error_1.message),
+                        title: "Error posting to Zoom: ".concat(errorMessage),
                     });
                 }
                 return [3 /*break*/, 4];

package/dist/openApiCompat.js

@@ -158,7 +158,7 @@ var patchRouterStack = function (stack) {
  */
 var patchAppUse = function (app) {
     var originalUse = app.use.bind(app);
-    app.use = function patchedUse() {
+    var patchedUse = function () {
         var _a, _b;
         var args = [];
         for (var _i = 0; _i < arguments.length; _i++) {
@@ -182,6 +182,7 @@ var patchAppUse = function (app) {
         }
         return result;
     };
+    app.use = patchedUse;
 };
 exports.patchAppUse = patchAppUse;
 /**

package/dist/openApiEtag.d.ts

@@ -4,4 +4,4 @@ import type { NextFunction, Request, Response } from "express";
  * This middleware should be added before the @wesleytodd/openapi middleware
  * to intercept requests to /openapi.json and add conditional request support.
  */
-export declare function openApiEtagMiddleware(req: Request, res: Response, next: NextFunction): void;
+export declare const openApiEtagMiddleware: (req: Request, res: Response, next: NextFunction) => void;

package/dist/openApiEtag.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openApiEtagMiddleware = openApiEtagMiddleware;
+exports.openApiEtagMiddleware = void 0;
 var node_crypto_1 = __importDefault(require("node:crypto"));
 /**
  * Middleware to add ETag support for OpenAPI JSON endpoint.
  * This middleware should be added before the @wesleytodd/openapi middleware
  * to intercept requests to /openapi.json and add conditional request support.
  */
-function openApiEtagMiddleware(req, res, next) {
+var openApiEtagMiddleware = function (req, res, next) {
     // Only handle GET requests to /openapi.json
     if (req.method !== "GET" || req.path !== "/openapi.json") {
         next();
@@ -35,4 +35,5 @@ function openApiEtagMiddleware(req, res, next) {
         return originalJson(body);
     };
     next();
-}
+};
+exports.openApiEtagMiddleware = openApiEtagMiddleware;

package/dist/openApiValidator.d.ts

@@ -83,7 +83,7 @@ export interface OpenApiValidatorConfig {
  * Check whether `configureOpenApiValidator()` has been called.
  * Validation middleware is a no-op when this returns false.
  */
-export declare function isOpenApiValidatorConfigured(): boolean;
+export declare const isOpenApiValidatorConfigured: () => boolean;
 /**
  * Configure the global OpenAPI validator settings.
  * Calling this function activates validation — middleware that was previously
@@ -101,17 +101,17 @@ export declare function isOpenApiValidatorConfigured(): boolean;
  * });
  * ```
  */
-export declare function configureOpenApiValidator(config?: Partial<OpenApiValidatorConfig>): void;
+export declare const configureOpenApiValidator: (config?: Partial<OpenApiValidatorConfig>) => void;
 /**
  * Get the current global validator configuration.
  */
-export declare function getOpenApiValidatorConfig(): OpenApiValidatorConfig;
+export declare const getOpenApiValidatorConfig: () => OpenApiValidatorConfig;
 /**
  * Reset the global validator configuration to defaults.
  * Also resets `isConfigured` to false.
  * Useful for testing.
  */
-export declare function resetOpenApiValidatorConfig(): void;
+export declare const resetOpenApiValidatorConfig: () => void;
 /**
  * Options for the request body validator middleware.
  */
@@ -149,7 +149,7 @@ export interface RequestBodyValidatorOptions {
  * @param options - Optional configuration for this validator
  * @returns Express middleware function
  */
-export declare function validateRequestBody(schema: Record<string, OpenApiSchemaProperty>, options?: RequestBodyValidatorOptions): (req: Request, res: Response, next: NextFunction) => void;
+export declare const validateRequestBody: (schema: Record<string, OpenApiSchemaProperty>, options?: RequestBodyValidatorOptions) => ((req: Request, res: Response, next: NextFunction) => void);
 /**
  * Options for the query parameter validator middleware.
  */
@@ -170,7 +170,7 @@ export interface QueryValidatorOptions {
  * @param options - Optional configuration for this validator
  * @returns Express middleware function
  */
-export declare function validateQueryParams(schema: Record<string, OpenApiSchemaProperty>, options?: QueryValidatorOptions): (req: Request, res: Response, next: NextFunction) => void;
+export declare const validateQueryParams: (schema: Record<string, OpenApiSchemaProperty>, options?: QueryValidatorOptions) => ((req: Request, res: Response, next: NextFunction) => void);
 /**
  * Options for creating a combined validation middleware.
  */
@@ -205,7 +205,7 @@ export interface CreateValidatorOptions {
  * ], handler);
  * ```
  */
-export declare function createValidator(options: CreateValidatorOptions): (req: Request, res: Response, next: NextFunction) => void;
+export declare const createValidator: (options: CreateValidatorOptions) => ((req: Request, res: Response, next: NextFunction) => void);
 /**
  * Validates response data against a schema.
  * This is primarily for development/testing to ensure responses match documentation.
@@ -214,7 +214,7 @@ export declare function createValidator(options: CreateValidatorOptions): (req:
  * @param schema - The expected schema
  * @returns Object with valid flag and any errors
  */
-export declare function validateResponseData(data: unknown, schema: Record<string, OpenApiSchemaProperty>): {
+export declare const validateResponseData: (data: unknown, schema: Record<string, OpenApiSchemaProperty>) => {
     valid: boolean;
     errors?: ErrorObject[];
 };
@@ -226,7 +226,7 @@ export declare function validateResponseData(data: unknown, schema: Record<strin
  * @param model - A Mongoose model
  * @returns Schema properties suitable for validation
  */
-export declare function getSchemaFromModel<T>(model: Model<T>): Record<string, OpenApiSchemaProperty>;
+export declare const getSchemaFromModel: <T>(model: Model<T>) => Record<string, OpenApiSchemaProperty>;
 /**
  * Creates a request body validator middleware from a Mongoose model.
  * This is a convenience function that combines getSchemaFromModel and validateRequestBody.
@@ -235,7 +235,7 @@ export declare function getSchemaFromModel<T>(model: Model<T>): Record<string, O
  * @param options - Optional configuration for the validator
  * @returns Express middleware function
  */
-export declare function validateModelRequestBody<T>(model: Model<T>, options?: RequestBodyValidatorOptions): (req: Request, res: Response, next: NextFunction) => void;
+export declare const validateModelRequestBody: <T>(model: Model<T>, options?: RequestBodyValidatorOptions) => ((req: Request, res: Response, next: NextFunction) => void);
 /**
  * Options for creating validation middleware for a modelRouter.
  */
@@ -281,7 +281,7 @@ export interface ModelRouterValidationOptions {
  * @param options - Configuration options
  * @returns Object with create and update validation middleware
  */
-export declare function createModelValidators<T>(model: Model<T>, options?: ModelRouterValidationOptions): {
+export declare const createModelValidators: <T>(model: Model<T>, options?: ModelRouterValidationOptions) => {
     create: (req: Request, res: Response, next: NextFunction) => void;
     update: (req: Request, res: Response, next: NextFunction) => void;
 };
@@ -293,4 +293,4 @@ export declare function createModelValidators<T>(model: Model<T>, options?: Mode
  * @param queryFields - Array of field names allowed for querying
  * @returns Schema properties suitable for query validation
  */
-export declare function buildQuerySchemaFromFields<T>(model: Model<T>, queryFields?: string[]): Record<string, OpenApiSchemaProperty>;
+export declare const buildQuerySchemaFromFields: <T>(model: Model<T>, queryFields?: string[]) => Record<string, OpenApiSchemaProperty>;