@terreno/api 0.13.2 → 0.14.0

package/dist/expressServer.d.ts

@@ -5,13 +5,13 @@ import type { ModelRouterOptions } from "./api";
 import { type UserModel as UserMongooseModel } from "./auth";
 import { type GitHubAuthOptions } from "./githubAuth";
 import { type LoggingOptions } from "./logger";
-export declare function setupEnvironment(): void;
+export declare const setupEnvironment: () => void;
 export type AddRoutes = (router: Router, options?: Partial<ModelRouterOptions<unknown>>) => void;
-export declare function logRequests(req: any, res: any, next: any): void;
-export declare function createRouter(rootPath: string, addRoutes: AddRoutes, middleware?: any[]): any[];
-export declare function createRouterWithAuth(rootPath: string, addRoutes: (router: Router) => void, middleware?: any[]): any[];
+export declare const logRequests: (req: any, res: any, next: express.NextFunction) => void;
+export declare const createRouter: (rootPath: string, addRoutes: AddRoutes, middleware?: express.RequestHandler[]) => Array<string | express.RequestHandler | Router>;
+export declare const createRouterWithAuth: (rootPath: string, addRoutes: (router: Router) => void, middleware?: express.RequestHandler[]) => Array<string | express.RequestHandler | Router>;
 export interface AuthOptions {
-    generateJWTPayload?: (user: any) => Record<string, any>;
+    generateJWTPayload?: (user: any) => Record<string, unknown>;
     generateTokenExpiration?: (user: any) => number | jwt.SignOptions["expiresIn"];
     generateRefreshTokenExpiration?: (user: any) => number | jwt.SignOptions["expiresIn"];
 }
@@ -19,6 +19,7 @@ export interface SetupServerOptions {
     userModel: UserMongooseModel;
     addRoutes: AddRoutes;
     loggingOptions?: LoggingOptions;
+    logRequests?: boolean;
     authOptions?: AuthOptions;
     /**
      * GitHub OAuth configuration. When provided, enables GitHub authentication.
@@ -31,11 +32,11 @@ export interface SetupServerOptions {
     ignoreTraces?: string[];
     sentryOptions?: Sentry.BunOptions;
 }
-export declare function setupServer(options: SetupServerOptions): express.Application;
-export declare function cronjob(name: string, schedule: "hourly" | "minutely" | string, callback: () => void): void;
+export declare const setupServer: (options: SetupServerOptions) => express.Application;
+export declare const cronjob: (name: string, schedule: "hourly" | "minutely" | string, callback: () => void) => void;
 export interface WrapScriptOptions {
-    onFinish?: (result?: any) => void | Promise<void>;
+    onFinish?: (result?: unknown) => void | Promise<void>;
     terminateTimeout?: number;
     slackChannel?: string;
 }
-export declare function wrapScript(func: () => Promise<any>, options?: WrapScriptOptions): Promise<void>;
+export declare const wrapScript: (func: () => Promise<unknown>, options?: WrapScriptOptions) => Promise<void>;

package/dist/expressServer.js

@@ -97,13 +97,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupEnvironment = setupEnvironment;
-exports.logRequests = logRequests;
-exports.createRouter = createRouter;
-exports.createRouterWithAuth = createRouterWithAuth;
-exports.setupServer = setupServer;
-exports.cronjob = cronjob;
-exports.wrapScript = wrapScript;
+exports.wrapScript = exports.cronjob = exports.setupServer = exports.createRouterWithAuth = exports.createRouter = exports.logRequests = exports.setupEnvironment = void 0;
 var Sentry = __importStar(require("@sentry/bun"));
 var cors_1 = __importDefault(require("cors"));
 var cron_1 = __importDefault(require("cron"));
@@ -119,11 +113,12 @@ var logger_1 = require("./logger");
 var notifiers_1 = require("./notifiers");
 var openApiCompat_1 = require("./openApiCompat");
 var openApiEtag_1 = require("./openApiEtag");
+var requestContext_1 = require("./requestContext");
 var index_1 = __importDefault(require("./vendor/wesleytodd-openapi/index"));
 var SLOW_READ_MAX = 200;
 var SLOW_WRITE_MAX = 500;
 var IS_JEST = process.env.JEST_WORKER_ID !== undefined;
-function setupEnvironment() {
+var setupEnvironment = function () {
     if (!process.env.TOKEN_ISSUER) {
         throw new Error("TOKEN_ISSUER must be set in env.");
     }
@@ -142,12 +137,14 @@ function setupEnvironment() {
     if (!process.env.REFRESH_TOKEN_EXPIRES_IN && !IS_JEST) {
         logger_1.logger.warn("REFRESH_TOKEN_EXPIRES_IN not set so using default.");
     }
-}
+};
+exports.setupEnvironment = setupEnvironment;
+// biome-ignore lint/suspicious/noExplicitAny: also called from tests with mock request/response objects
 var logRequestsFinished = function (req, res, startTime) {
-    var _a, _b, _c;
-    var options = ((_a = res.locals.loggingOptions) !== null && _a !== void 0 ? _a : {});
-    var slowReadMs = (_b = options.logSlowRequestsReadMs) !== null && _b !== void 0 ? _b : SLOW_READ_MAX;
-    var slowWriteMs = (_c = options.logSlowRequestsWriteMs) !== null && _c !== void 0 ? _c : SLOW_WRITE_MAX;
+    var _a, _b, _c, _d;
+    var options = ((_b = (_a = res.locals) === null || _a === void 0 ? void 0 : _a.loggingOptions) !== null && _b !== void 0 ? _b : {});
+    var slowReadMs = (_c = options.logSlowRequestsReadMs) !== null && _c !== void 0 ? _c : SLOW_READ_MAX;
+    var slowWriteMs = (_d = options.logSlowRequestsWriteMs) !== null && _d !== void 0 ? _d : SLOW_WRITE_MAX;
     var diff = process.hrtime.bigint() - startTime;
     var diffInMs = Number(diff) / 1000000;
     var pathName = "unknown";
@@ -180,7 +177,8 @@ var logRequestsFinished = function (req, res, startTime) {
         }
     }
 };
-function logRequests(req, res, next) {
+// biome-ignore lint/suspicious/noExplicitAny: also called from tests with mock request/response objects
+var logRequests = function (req, res, next) {
     var _a, _b, _c, _d;
     var startTime = process.hrtime.bigint();
     var userString = "";
@@ -210,35 +208,38 @@ function logRequests(req, res, next) {
     }
     (0, on_finished_1.default)(res, function () { return logRequestsFinished(req, res, startTime); });
     next();
-}
-function createRouter(rootPath, addRoutes, middleware) {
+};
+exports.logRequests = logRequests;
+var createRouter = function (rootPath, addRoutes, middleware) {
     if (middleware === void 0) { middleware = []; }
-    function routePathMiddleware(req, _res, next) {
+    var routePathMiddleware = function (req, _res, next) {
         if (!req.routeMount) {
             req.routeMount = [];
         }
         req.routeMount.push(rootPath);
         next();
-    }
+    };
     var router = express_1.default.Router();
     router.use(routePathMiddleware);
     addRoutes(router);
     return __spreadArray(__spreadArray([rootPath], __read(middleware), false), [router], false);
-}
-function createRouterWithAuth(rootPath, addRoutes, middleware) {
+};
+exports.createRouter = createRouter;
+var createRouterWithAuth = function (rootPath, addRoutes, middleware) {
     if (middleware === void 0) { middleware = []; }
-    return createRouter(rootPath, addRoutes, __spreadArray([
+    return (0, exports.createRouter)(rootPath, addRoutes, __spreadArray([
         passport_1.default.authenticate("firebase-jwt", { session: false })
     ], __read(middleware), false));
-}
-function initializeRoutes(UserModel, addRoutes, options) {
+};
+exports.createRouterWithAuth = createRouterWithAuth;
+var initializeRoutes = function (UserModel, addRoutes, options) {
     var _a;
     if (options === void 0) { options = {}; }
     var app = (0, express_1.default)();
     // Record mount paths on layers for Express 5 → OpenAPI compat
     (0, openApiCompat_1.patchAppUse)(app);
-    // TODO: Log a warning when we hit the array limit.
     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(requestContext_1.requestContextMiddleware);
     app.use((0, cors_1.default)({
         origin: (_a = options.corsOrigin) !== null && _a !== void 0 ? _a : "*",
     }));
@@ -249,8 +250,12 @@ function initializeRoutes(UserModel, addRoutes, options) {
     // 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);
+    app.use(function (req, res, next) {
+        (0, requestContext_1.updateRequestContextFromRequest)(req, res);
+        next();
+    });
     if (options.logRequests !== false) {
-        app.use(logRequests);
+        app.use(exports.logRequests);
     }
     // Store the logging options on the request so we can access them later.
     app.use(function (_req, res, next) {
@@ -259,17 +264,21 @@ function initializeRoutes(UserModel, addRoutes, options) {
     });
     // Add Sentry scopes for session, transaction, and userId if any are set
     app.use(function (req, _res, next) {
-        var _a;
+        var _a, _b;
+        var context = (0, requestContext_1.getCurrentRequestContext)();
         var transactionId = req.header("X-Transaction-ID");
-        var sessionId = req.header("X-Session-ID");
+        var sessionId = (_a = context === null || context === void 0 ? void 0 : context.sessionId) !== null && _a !== void 0 ? _a : req.header("X-Session-ID");
+        if (context === null || context === void 0 ? void 0 : context.requestId) {
+            Sentry.getCurrentScope().setTag("request_id", context.requestId);
+        }
         if (transactionId) {
             Sentry.getCurrentScope().setTag("transaction_id", transactionId);
         }
         if (sessionId) {
             Sentry.getCurrentScope().setTag("session_id", sessionId);
         }
-        if ((_a = req.user) === null || _a === void 0 ? void 0 : _a._id) {
-            Sentry.getCurrentScope().setTag("user", req.user._id);
+        if ((_b = req.user) === null || _b === void 0 ? void 0 : _b._id) {
+            Sentry.getCurrentScope().setTag("user", String(req.user._id));
         }
         next();
     });
@@ -299,16 +308,10 @@ function initializeRoutes(UserModel, addRoutes, options) {
     // Catch any thrown APIErrors and return them in an OpenAPI compatible format
     app.use(errors_1.apiUnauthorizedMiddleware);
     app.use(errors_1.apiErrorMiddleware);
-    app.use(function onError(err, _req, res, _next) {
-        logger_1.logger.error("Fallthrough error: ".concat(err).concat((err === null || err === void 0 ? void 0 : err.stack) ? "\n".concat(err.stack) : "", "}"));
-        Sentry.captureException(err);
-        res.statusCode = 500;
-        res.end("".concat(res.sentry, "\n"));
-    });
+    app.use(errors_1.apiFallthroughErrorMiddleware);
     return app;
-}
-// Sets up the routes and returns the app.
-function setupServer(options) {
+};
+var setupServer = function (options) {
     var UserModel = options.userModel;
     var addRoutes = options.addRoutes;
     (0, logger_1.setupLogging)(options.loggingOptions);
@@ -319,10 +322,13 @@ function setupServer(options) {
             authOptions: options.authOptions,
             corsOrigin: options.corsOrigin,
             githubAuth: options.githubAuth,
+            loggingOptions: options.loggingOptions,
+            logRequests: options.logRequests,
         });
     }
     catch (error) {
-        logger_1.logger.error("Error initializing routes: ".concat(error.stack));
+        var stack = error instanceof Error && error.stack ? error.stack : String(error);
+        logger_1.logger.error("Error initializing routes: ".concat(stack));
         throw error;
     }
     if (!options.skipListen) {
@@ -333,14 +339,15 @@ function setupServer(options) {
             });
         }
         catch (error) {
-            logger_1.logger.error("Error trying to start HTTP server: ".concat(error, "\n").concat(error.stack));
+            var stack = error instanceof Error ? error.stack : String(error);
+            logger_1.logger.error("Error trying to start HTTP server: ".concat(error, "\n").concat(stack));
             process.exit(1);
         }
     }
     return app;
-}
-// Convenience method to execute cronjobs with an always-running server.
-function cronjob(name, schedule, callback) {
+};
+exports.setupServer = setupServer;
+var cronjob = function (name, schedule, callback) {
     var cronSchedule = schedule === "hourly" ? "0 * * * *" : schedule === "minutely" ? "* * * * *" : schedule;
     logger_1.logger.info("Adding cronjob ".concat(name, ", running at: ").concat(cronSchedule));
     try {
@@ -349,13 +356,15 @@ function cronjob(name, schedule, callback) {
     catch (error) {
         throw new Error("Failed to create cronjob: ".concat(error));
     }
-}
-// Wrap up a script with some helpers, such as catching errors, reporting them to sentry, notifying
-// Slack of runs, etc. Also supports timeouts.
-function wrapScript(func_1) {
-    return __awaiter(this, arguments, void 0, function (func, options) {
+};
+exports.cronjob = cronjob;
+var wrapScript = function (func_1) {
+    var args_1 = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args_1[_i - 1] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([func_1], __read(args_1), false), void 0, function (func, options) {
         var name, warnTime_1, closeTime, result, error_1;
-        var _this = this;
         var _a, _b, _c;
         if (options === void 0) { options = {}; }
         return __generator(this, function (_d) {
@@ -371,7 +380,7 @@ function wrapScript(func_1) {
                     if (options.terminateTimeout !== 0) {
                         warnTime_1 = (((_b = options.terminateTimeout) !== null && _b !== void 0 ? _b : 300) / 2) * 1000;
                         closeTime = ((_c = options.terminateTimeout) !== null && _c !== void 0 ? _c : 300) * 1000;
-                        setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+                        setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
                             var msg;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -385,7 +394,7 @@ function wrapScript(func_1) {
                                 }
                             });
                         }); }, warnTime_1);
-                        setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+                        setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
                             var msg;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -432,10 +441,10 @@ function wrapScript(func_1) {
                 case 9: return [4 /*yield*/, (0, notifiers_1.sendToSlack)("Success running script ".concat(name, ": ").concat(result))];
                 case 10:
                     _d.sent();
-                    // Unclear why we have to exit here to prevent the script for continuing to run.
                     process.exit(0);
                     return [2 /*return*/];
             }
         });
     });
-}
+};
+exports.wrapScript = wrapScript;

package/dist/expressServer.test.js

@@ -86,10 +86,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+// biome-ignore-all lint/suspicious/noExplicitAny: test mock typing
 var bun_test_1 = require("bun:test");
+var node_stream_1 = require("node:stream");
 var express_1 = __importDefault(require("express"));
 var supertest_1 = __importDefault(require("supertest"));
+var winston_1 = __importDefault(require("winston"));
 var expressServer_1 = require("./expressServer");
+var logger_1 = require("./logger");
 var tests_1 = require("./tests");
 (0, bun_test_1.describe)("expressServer", function () {
     (0, bun_test_1.describe)("setupEnvironment", function () {
@@ -122,6 +126,55 @@ var tests_1 = require("./tests");
         });
     });
     (0, bun_test_1.describe)("logRequests", function () {
+        (0, bun_test_1.it)("attaches request and session context to route logs", function () { return __awaiter(void 0, void 0, void 0, function () {
+            var logs, logStream, transport, app, res, parsedLog;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        logs = [];
+                        logStream = new node_stream_1.Writable({
+                            write: function (chunk, _encoding, callback) {
+                                logs.push(chunk.toString());
+                                callback();
+                            },
+                        });
+                        transport = new winston_1.default.transports.Stream({
+                            format: winston_1.default.format.json(),
+                            stream: logStream,
+                        });
+                        app = (0, expressServer_1.setupServer)({
+                            addRoutes: function (router) {
+                                router.get("/context-test", function (req, res) {
+                                    logger_1.logger.info("context route log");
+                                    return res.json({ requestId: req.requestId, sessionId: req.sessionId });
+                                });
+                            },
+                            logRequests: false,
+                            skipListen: true,
+                            userModel: tests_1.UserModel,
+                        });
+                        logger_1.winstonLogger.add(transport);
+                        return [4 /*yield*/, (0, supertest_1.default)(app)
+                                .get("/context-test")
+                                .set("X-Request-ID", "req-123")
+                                .set("X-Session-ID", "session-123")
+                                .expect(200)];
+                    case 1:
+                        res = _a.sent();
+                        (0, bun_test_1.expect)(res.headers["x-request-id"]).toBe("req-123");
+                        (0, bun_test_1.expect)(res.headers["x-session-id"]).toBe("session-123");
+                        (0, bun_test_1.expect)(res.body).toEqual({ requestId: "req-123", sessionId: "session-123" });
+                        parsedLog = logs
+                            .map(function (entry) { return JSON.parse(entry); })
+                            .find(function (entry) { return entry.message === "context route log"; });
+                        (0, bun_test_1.expect)(parsedLog).toBeDefined();
+                        (0, bun_test_1.expect)(parsedLog.requestId).toBe("req-123");
+                        (0, bun_test_1.expect)(parsedLog.sessionId).toBe("session-123");
+                        logger_1.winstonLogger.remove(transport);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
         (0, bun_test_1.it)("logs request with admin user type", function () {
             var req = {
                 body: {},
@@ -793,7 +846,6 @@ var tests_1 = require("./tests");
         var originalSetTimeout = globalThis.setTimeout;
         var timerIds = [];
         (0, bun_test_1.beforeEach)(function () {
-            // biome-ignore lint/suspicious/noExplicitAny: Mock requires type override for process.exit.
             process.exit = (0, bun_test_1.mock)(function () {
                 throw new Error("process.exit called");
             });
@@ -930,7 +982,6 @@ var tests_1 = require("./tests");
                 return (0, expressServer_1.setupServer)({
                     addRoutes: addRoutes,
                     skipListen: true,
-                    // biome-ignore lint/suspicious/noExplicitAny: Test mock for UserModel.
                     userModel: tests_1.UserModel,
                 });
             }).toThrow("route initialization failed");

package/dist/githubAuth.d.ts

@@ -1,4 +1,5 @@
 import type express from "express";
+import type { Schema } from "mongoose";
 import { type Profile } from "passport-github2";
 import { type UserModel } from "./auth";
 import type { AuthOptions } from "./expressServer";
@@ -46,7 +47,7 @@ export interface GitHubUserFields {
  * userSchema.plugin(githubUserPlugin);
  * ```
  */
-export declare const githubUserPlugin: (schema: any) => void;
+export declare const githubUserPlugin: (schema: Schema<any, any, any, any>) => void;
 /**
  * Sets up GitHub OAuth authentication strategy.
  * Call this after setupAuth() in your server initialization.

package/dist/githubAuth.js

@@ -58,12 +58,19 @@ var plugins_1 = require("./plugins");
  * userSchema.plugin(githubUserPlugin);
  * ```
  */
+// biome-ignore lint/suspicious/noExplicitAny: Schema generics must be loose to accept arbitrary consumer schemas
 var githubUserPlugin = function (schema) {
     schema.add({
-        githubAvatarUrl: { type: String },
-        githubId: { index: true, sparse: true, type: String, unique: true },
-        githubProfileUrl: { type: String },
-        githubUsername: { type: String },
+        githubAvatarUrl: { description: "GitHub avatar image URL", type: String },
+        githubId: {
+            description: "GitHub user ID",
+            index: true,
+            sparse: true,
+            type: String,
+            unique: true,
+        },
+        githubProfileUrl: { description: "GitHub profile URL", type: String },
+        githubUsername: { description: "GitHub username", type: String },
     });
 };
 exports.githubUserPlugin = githubUserPlugin;
@@ -74,14 +81,16 @@ exports.githubUserPlugin = githubUserPlugin;
 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({
+    passport_1.default.use("github", 
+    // biome-ignore lint/suspicious/noExplicitAny: passport-github2's typed constructor overloads don't match passReqToCallback variant
+    new passport_github2_1.Strategy({
         callbackURL: githubOptions.callbackURL,
         clientID: githubOptions.clientId,
         clientSecret: githubOptions.clientSecret,
         passReqToCallback: true,
         scope: scope,
-    }, (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;
+    }, function (req, accessToken, refreshToken, profile, done) { return __awaiter(void 0, void 0, void 0, function () {
+        var existingUser, user, githubId, existingGitHubUser, user, userWithGitHub, email, existingEmailUser, emailUserWithGitHub, newUser, error_1;
         var _a, _b, _c, _d, _e, _f, _g, _h;
         return __generator(this, function (_j) {
             switch (_j.label) {
@@ -113,10 +122,11 @@ var setupGitHubAuth = function (_app, userModel, githubOptions) {
                 case 4:
                     user = _j.sent();
                     if (!user) return [3 /*break*/, 6];
-                    user.githubId = githubId;
-                    user.githubUsername = profile.username;
-                    user.githubProfileUrl = profile.profileUrl;
-                    user.githubAvatarUrl = (_b = (_a = profile.photos) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value;
+                    userWithGitHub = user;
+                    userWithGitHub.githubId = githubId;
+                    userWithGitHub.githubUsername = profile.username;
+                    userWithGitHub.githubProfileUrl = profile.profileUrl;
+                    userWithGitHub.githubAvatarUrl = (_b = (_a = profile.photos) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value;
                     return [4 /*yield*/, user.save()];
                 case 5:
                     _j.sent();
@@ -134,10 +144,11 @@ var setupGitHubAuth = function (_app, userModel, githubOptions) {
                     existingEmailUser = _j.sent();
                     if (!existingEmailUser) return [3 /*break*/, 11];
                     if (!(githubOptions.allowAccountLinking !== false)) return [3 /*break*/, 10];
-                    existingEmailUser.githubId = githubId;
-                    existingEmailUser.githubUsername = profile.username;
-                    existingEmailUser.githubProfileUrl = profile.profileUrl;
-                    existingEmailUser.githubAvatarUrl = (_f = (_e = profile.photos) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.value;
+                    emailUserWithGitHub = existingEmailUser;
+                    emailUserWithGitHub.githubId = githubId;
+                    emailUserWithGitHub.githubUsername = profile.username;
+                    emailUserWithGitHub.githubProfileUrl = profile.profileUrl;
+                    emailUserWithGitHub.githubAvatarUrl = (_f = (_e = profile.photos) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.value;
                     return [4 /*yield*/, existingEmailUser.save()];
                 case 9:
                     _j.sent();
@@ -166,7 +177,7 @@ var setupGitHubAuth = function (_app, userModel, githubOptions) {
                 case 14: return [2 /*return*/];
             }
         });
-    }); })));
+    }); }));
 };
 exports.setupGitHubAuth = setupGitHubAuth;
 /**
@@ -182,11 +193,13 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
     var router = (0, express_1.Router)();
     // Initiate GitHub OAuth flow
     router.get("/github", function (req, _res, next) {
+        var _a;
         // Store the return URL in session or query for redirect after auth
         var returnTo = req.query.returnTo;
         if (returnTo) {
-            req.session = req.session || {};
-            req.session.returnTo = returnTo;
+            var reqWithSession = req;
+            reqWithSession.session = (_a = reqWithSession.session) !== null && _a !== void 0 ? _a : {};
+            reqWithSession.session.returnTo = returnTo;
         }
         next();
     }, passport_1.default.authenticate("github", { session: false }));
@@ -208,11 +221,11 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
                     // If there's a return URL, redirect with tokens as query params
                     if (returnTo) {
                         url = new URL(returnTo);
-                        url.searchParams.set("token", tokens.token || "");
+                        url.searchParams.set("token", (_b = tokens.token) !== null && _b !== void 0 ? _b : "");
                         if (tokens.refreshToken) {
                             url.searchParams.set("refreshToken", tokens.refreshToken);
                         }
-                        url.searchParams.set("userId", ((_c = (_b = req.user) === null || _b === void 0 ? void 0 : _b._id) === null || _c === void 0 ? void 0 : _c.toString()) || "");
+                        url.searchParams.set("userId", ((_c = req.user) === null || _c === void 0 ? void 0 : _c._id) ? String(req.user._id) : "");
                         return [2 /*return*/, res.redirect(url.toString())];
                     }
                     // Otherwise return JSON response
@@ -250,7 +263,7 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
         }, 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(void 0, void 0, void 0, function () {
-            var user, hasPassword, error_3;
+            var user, userWithAuth, hasPassword, userWithGitHub, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -266,16 +279,18 @@ var addGitHubAuthRoutes = function (app, userModel, githubOptions, authOptions)
                         if (!user) {
                             return [2 /*return*/, res.status(404).json({ message: "User not found" })];
                         }
-                        hasPassword = !!user.hash || !!user.salt;
+                        userWithAuth = user;
+                        hasPassword = !!userWithAuth.hash || !!userWithAuth.salt;
                         if (!hasPassword) {
                             return [2 /*return*/, res.status(400).json({
                                     message: "Cannot unlink GitHub account without another authentication method. Set a password first.",
                                 })];
                         }
-                        user.githubId = undefined;
-                        user.githubUsername = undefined;
-                        user.githubProfileUrl = undefined;
-                        user.githubAvatarUrl = undefined;
+                        userWithGitHub = user;
+                        userWithGitHub.githubId = undefined;
+                        userWithGitHub.githubUsername = undefined;
+                        userWithGitHub.githubProfileUrl = undefined;
+                        userWithGitHub.githubAvatarUrl = undefined;
                         return [4 /*yield*/, user.save()];
                     case 3:
                         _a.sent();

package/dist/githubAuth.test.js

@@ -72,6 +72,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+// biome-ignore-all lint/suspicious/noExplicitAny: test mock typing
 var bun_test_1 = require("bun:test");
 var mongoose_1 = __importStar(require("mongoose"));
 var passport_1 = __importDefault(require("passport"));

package/dist/index.d.ts

@@ -3,9 +3,11 @@ export * from "./auth";
 export * from "./betterAuth";
 export * from "./betterAuthApp";
 export * from "./betterAuthSetup";
+export * from "./config";
 export * from "./configurationApp";
 export * from "./configurationPlugin";
 export * from "./consentApp";
+export * from "./envConfigurationPlugin";
 export * from "./errors";
 export * from "./expressServer";
 export * from "./githubAuth";
@@ -22,6 +24,8 @@ export * from "./openApiValidator";
 export * from "./permissions";
 export * from "./plugins";
 export * from "./populate";
+export * from "./realtime";
+export * from "./requestContext";
 export * from "./scriptRunner";
 export * from "./secretProviders";
 export * from "./syncConsents";

package/dist/index.js

@@ -19,9 +19,11 @@ __exportStar(require("./auth"), exports);
 __exportStar(require("./betterAuth"), exports);
 __exportStar(require("./betterAuthApp"), exports);
 __exportStar(require("./betterAuthSetup"), exports);
+__exportStar(require("./config"), exports);
 __exportStar(require("./configurationApp"), exports);
 __exportStar(require("./configurationPlugin"), exports);
 __exportStar(require("./consentApp"), exports);
+__exportStar(require("./envConfigurationPlugin"), exports);
 __exportStar(require("./errors"), exports);
 __exportStar(require("./expressServer"), exports);
 __exportStar(require("./githubAuth"), exports);
@@ -38,6 +40,8 @@ __exportStar(require("./openApiValidator"), exports);
 __exportStar(require("./permissions"), exports);
 __exportStar(require("./plugins"), exports);
 __exportStar(require("./populate"), exports);
+__exportStar(require("./realtime"), exports);
+__exportStar(require("./requestContext"), exports);
 __exportStar(require("./scriptRunner"), exports);
 __exportStar(require("./secretProviders"), exports);
 __exportStar(require("./syncConsents"), exports);

package/dist/logger.d.ts

@@ -20,4 +20,4 @@ export interface LoggingOptions {
     logSlowRequestsReadMs?: number;
     logSlowRequestsWriteMs?: number;
 }
-export declare function setupLogging(options?: LoggingOptions): void;
+export declare const setupLogging: (options?: LoggingOptions) => void;