fastify-txstate 3.2.10 → 3.2.12

package/lib/analytics.js

@@ -17,6 +17,7 @@ class AnalyticsClient {
 }
 exports.AnalyticsClient = AnalyticsClient;
 class LoggingAnalyticsClient extends AnalyticsClient {
+    logger;
     constructor(logger) {
         super();
         this.logger = logger;
@@ -28,30 +29,29 @@ class LoggingAnalyticsClient extends AnalyticsClient {
 }
 exports.LoggingAnalyticsClient = LoggingAnalyticsClient;
 class ElasticAnalyticsClient extends AnalyticsClient {
+    elasticClient;
     constructor() {
-        var _a, _b;
         super();
         this.elasticClient = new elasticsearch_1.default.Client({
             node: process.env.ELASTICSEARCH_URL,
             auth: {
-                username: (_a = process.env.ELASTICSEARCH_USER) !== null && _a !== void 0 ? _a : 'elastic',
-                password: (_b = process.env.ELASTICSEARCH_PASS) !== null && _b !== void 0 ? _b : 'not_provided'
+                username: process.env.ELASTICSEARCH_USER ?? 'elastic',
+                password: process.env.ELASTICSEARCH_PASS ?? 'not_provided'
             }
         });
     }
     async push(events) {
         if (events.length)
-            await this.elasticClient.bulk({ body: events.reduce((acc, event) => { var _a; acc.push({ index: { _index: (_a = process.env.ELASTICSEARCH_USEREVENTS_INDEX) !== null && _a !== void 0 ? _a : 'interaction-analytics' } }, event); return acc; }, []) });
+            await this.elasticClient.bulk({ body: events.reduce((acc, event) => { acc.push({ index: { _index: process.env.ELASTICSEARCH_USEREVENTS_INDEX ?? 'interaction-analytics' } }, event); return acc; }, []) });
     }
 }
 exports.ElasticAnalyticsClient = ElasticAnalyticsClient;
 function analyticsPlugin(fastify, opts, done) {
-    var _a;
     const environment = process.env.NODE_ENV;
     if ((0, txstate_utils_1.isBlank)(environment))
         throw new Error('Must set NODE_ENV when reporting analytics.');
     const eventQueue = [];
-    const analyticsClient = (_a = opts.analyticsClient) !== null && _a !== void 0 ? _a : ((0, txstate_utils_1.isBlank)(process.env.ELASTICSEARCH_URL)
+    const analyticsClient = opts.analyticsClient ?? ((0, txstate_utils_1.isBlank)(process.env.ELASTICSEARCH_URL)
         ? environment === 'development'
             ? new AnalyticsClient()
             : new LoggingAnalyticsClient(fastify.log)
@@ -93,14 +93,13 @@ function analyticsPlugin(fastify, opts, done) {
     }
     setTimeout(() => { void flushQueue(); }, 5000);
     function queueEvents(auth, headers, remoteIp, events) {
-        var _a, _b, _c;
         for (const event of events) {
             eventQueue.push({
                 event,
                 remoteIp,
-                ua: (_a = headers['user-agent']) !== null && _a !== void 0 ? _a : '',
+                ua: headers['user-agent'] ?? '',
                 time: new Date().toISOString(),
-                gaCookie: (_c = (_b = headers.cookie) === null || _b === void 0 ? void 0 : _b.replace(/^.*?(?:_ga=([^;]+))?.*$/, '$1')) !== null && _c !== void 0 ? _c : '',
+                gaCookie: headers.cookie?.replace(/^.*?(?:_ga=([^;]+))?.*$/, '$1') ?? '',
                 auth
             });
         }
@@ -109,7 +108,7 @@ function analyticsPlugin(fastify, opts, done) {
         const { auth } = req;
         if (opts.authorize && !opts.authorize(req))
             throw new _1.HttpError(401);
-        queueEvents(auth !== null && auth !== void 0 ? auth : { username: 'unauthenticated' }, req.headers, req.ip, req.body);
+        queueEvents(auth ?? { username: 'unauthenticated' }, req.headers, req.ip, req.body);
         res.statusCode = 202;
         return 'OK';
     });

package/lib/error.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fstValidationToMessage = exports.FailedValidationError = exports.HttpError = void 0;
 const http_status_codes_1 = require("http-status-codes");
 class HttpError extends Error {
+    statusCode;
     constructor(statusCode, message) {
         if (!message) {
             if (statusCode === 401)
@@ -18,6 +19,7 @@ class HttpError extends Error {
 }
 exports.HttpError = HttpError;
 class FailedValidationError extends HttpError {
+    errors;
     constructor(errors) {
         super(422, 'Validation failure.');
         this.errors = errors;

package/lib/index.js

@@ -28,7 +28,6 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_http_1 = __importDefault(require("node:http"));
 const txstate_utils_1 = require("txstate-utils");
 const error_1 = require("./error");
-const unified_auth_1 = require("./unified-auth");
 exports.devLogger = {
     level: 'info',
     info: (msg) => { console.info(msg.req ? `${msg.req.method} ${msg.req.url}` : msg.res ? `${msg.res.statusCode} - ${msg.responseTime}` : msg); },
@@ -52,27 +51,30 @@ exports.prodLogger = {
             };
         },
         res(res) {
-            var _a, _b, _c, _d;
             return {
                 statusCode: res.statusCode,
-                url: (_a = res.request) === null || _a === void 0 ? void 0 : _a.url.replace(/(token|unifiedJwt)=[\w.]+/i, '$1=redacted'),
-                length: Number((0, txstate_utils_1.toArray)((_b = res.getHeader) === null || _b === void 0 ? void 0 : _b.call(res, 'content-length'))[0]),
+                url: res.request?.url.replace(/(token|unifiedJwt)=[\w.]+/i, '$1=redacted'),
+                length: Number((0, txstate_utils_1.toArray)(res.getHeader?.('content-length'))[0]),
                 ...res.extraLogInfo,
-                auth: (_d = (_c = res.request) === null || _c === void 0 ? void 0 : _c.auth) !== null && _d !== void 0 ? _d : res.extraLogInfo.auth
+                auth: res.request?.auth ?? res.extraLogInfo.auth
             };
         }
     }
 };
 class Server {
+    config;
+    https = false;
+    errorHandlers = [];
+    healthMessage;
+    healthCallback;
+    shuttingDown = false;
+    sigHandler;
+    validOrigins = {};
+    validOriginHosts = {};
+    validOriginSuffixes = new Set();
+    app;
     constructor(config = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         this.config = config;
-        this.https = false;
-        this.errorHandlers = [];
-        this.shuttingDown = false;
-        this.validOrigins = {};
-        this.validOriginHosts = {};
-        this.validOriginSuffixes = new Set();
         try {
             const key = node_fs_1.default.readFileSync('/securekeys/private.key');
             const cert = node_fs_1.default.readFileSync('/securekeys/cert.pem');
@@ -101,16 +103,15 @@ class Server {
             else
                 config.trustProxy = process.env.TRUST_PROXY;
         }
-        config.ajv = { ...config.ajv, plugins: [...((_b = (_a = config.ajv) === null || _a === void 0 ? void 0 : _a.plugins) !== null && _b !== void 0 ? _b : []), ajv_errors_1.default, [ajv_formats_1.default, { mode: 'fast' }]], customOptions: { ...(_c = config.ajv) === null || _c === void 0 ? void 0 : _c.customOptions, allErrors: true, strictSchema: false } };
+        config.ajv = { ...config.ajv, plugins: [...(config.ajv?.plugins ?? []), ajv_errors_1.default, [ajv_formats_1.default, { mode: 'fast' }]], customOptions: { ...config.ajv?.customOptions, allErrors: true, strictSchema: false } };
         this.healthCallback = config.checkHealth;
         this.app = (0, fastify_1.fastify)(config);
         this.app.addHook('onRoute', route => {
-            var _a, _b, _c;
-            if (!((_a = route.schema) === null || _a === void 0 ? void 0 : _a.body))
+            if (!route.schema?.body)
                 return;
-            const missingResponse = ((_b = route.schema) === null || _b === void 0 ? void 0 : _b.response) == null;
+            const missingResponse = route.schema?.response == null;
             const response400 = (0, txstate_utils_1.set)(fastify_shared_1.validatedResponse.properties.messages, 'description', 'Basic validation failure. This means that the UI provided input that failed validation as defined in the openapi specification published by the API. The UI is at fault and should be re-coded to avoid sending invalid data.');
-            let newSchema = (0, txstate_utils_1.set)((_c = route.schema) !== null && _c !== void 0 ? _c : {}, 'response.400', response400);
+            let newSchema = (0, txstate_utils_1.set)(route.schema ?? {}, 'response.400', response400);
             const response422 = (0, txstate_utils_1.set)(fastify_shared_1.validatedResponse, 'description', 'Validation failure. This means that the user provided an invalid object. The user should be shown their error so that they can correct it.');
             newSchema = (0, txstate_utils_1.set)(newSchema, 'response.422', response422);
             if (missingResponse) {
@@ -130,15 +131,13 @@ class Server {
          * convert all nulls to undefined before fastify validates.
          */
         this.app.addHook('preSerialization', async (req, res, payload) => {
-            var _a;
-            return ((_a = req.routeSchema) === null || _a === void 0 ? void 0 : _a.response) ? (0, txstate_utils_1.destroyNulls)(payload) : payload;
+            return req.routeSchema?.response ? (0, txstate_utils_1.destroyNulls)(payload) : payload;
         });
         if (!config.skipOriginCheck && !process.env.SKIP_ORIGIN_CHECK) {
-            this.setValidOrigins([...((_d = config.validOrigins) !== null && _d !== void 0 ? _d : []), ...((_f = (_e = process.env.VALID_ORIGINS) === null || _e === void 0 ? void 0 : _e.split(',')) !== null && _f !== void 0 ? _f : [])]);
-            this.setValidOriginHosts([...((_g = config.validOriginHosts) !== null && _g !== void 0 ? _g : []), ...((_j = (_h = process.env.VALID_ORIGIN_HOSTS) === null || _h === void 0 ? void 0 : _h.split(',')) !== null && _j !== void 0 ? _j : [])]);
-            this.setValidOriginSuffixes([...((_k = config.validOriginSuffixes) !== null && _k !== void 0 ? _k : []), ...((_m = (_l = process.env.VALID_ORIGIN_SUFFIXES) === null || _l === void 0 ? void 0 : _l.split(',')) !== null && _m !== void 0 ? _m : [])]);
+            this.setValidOrigins([...(config.validOrigins ?? []), ...(process.env.VALID_ORIGINS?.split(',') ?? [])]);
+            this.setValidOriginHosts([...(config.validOriginHosts ?? []), ...(process.env.VALID_ORIGIN_HOSTS?.split(',') ?? [])]);
+            this.setValidOriginSuffixes([...(config.validOriginSuffixes ?? []), ...(process.env.VALID_ORIGIN_SUFFIXES?.split(',') ?? [])]);
             this.app.addHook('preHandler', async (req, res) => {
-                var _a;
                 res.extraLogInfo = {};
                 if (!req.headers.origin)
                     return;
@@ -160,7 +159,7 @@ class Server {
                         }
                     }
                 }
-                if (!passed && ((_a = config.checkOrigin) === null || _a === void 0 ? void 0 : _a.call(config, req)))
+                if (!passed && config.checkOrigin?.(req))
                     passed = true;
                 if (!passed) {
                     await res.status(403).send('Origin check failed. Suspected XSRF attack.');
@@ -169,6 +168,8 @@ class Server {
                 else {
                     void res.header('Access-Control-Allow-Origin', req.headers.origin);
                     void res.header('Access-Control-Max-Age', '600'); // ask browser to skip pre-flights for 10 minutes after a yes
+                    if (req.headers['access-control-request-method'])
+                        void res.header('access-control-allow-methods', req.headers['access-control-request-method']);
                     if (req.headers['access-control-request-headers'])
                         void res.header('Access-Control-Allow-Headers', req.headers['access-control-request-headers']);
                 }
@@ -211,7 +212,6 @@ class Server {
             });
         this.app.setNotFoundHandler((req, res) => { void res.status(404).send('Not Found.'); });
         this.app.setErrorHandler(async (err, req, res) => {
-            var _a;
             req.log.warn(err);
             for (const errorHandler of this.errorHandlers) {
                 if (!res.sent)
@@ -227,7 +227,7 @@ class Server {
                 else if (err.code === 'FST_ERR_VALIDATION') {
                     const developerErrors = [];
                     const userErrors = [];
-                    for (const v of (_a = err.validation) !== null && _a !== void 0 ? _a : []) {
+                    for (const v of err.validation ?? []) {
                         if (v.keyword === 'errorMessage') {
                             for (const ov of v.params.errors) {
                                 if (['type', 'additionalProperties'].includes(ov.keyword))
@@ -269,11 +269,11 @@ class Server {
             }
             else if (this.healthCallback) {
                 const resp = await this.healthCallback();
-                const [status, msg] = typeof resp === 'string' ? [500, resp] : [resp === null || resp === void 0 ? void 0 : resp.status, resp === null || resp === void 0 ? void 0 : resp.message];
+                const [status, msg] = typeof resp === 'string' ? [500, resp] : [resp?.status, resp?.message];
                 if (!!msg || !!status) {
                     res.log.info(resp, 'Health check callback failed.');
-                    void res.status(status !== null && status !== void 0 ? status : 500);
-                    return msg !== null && msg !== void 0 ? msg : 'FAIL';
+                    void res.status(status ?? 500);
+                    return msg ?? 'FAIL';
                 }
             }
             return 'OK';
@@ -287,18 +287,16 @@ class Server {
         process.on('SIGINT', this.sigHandler);
     }
     async start(port) {
-        var _a, _b, _c;
-        const customPort = port !== null && port !== void 0 ? port : parseInt((_a = process.env.PORT) !== null && _a !== void 0 ? _a : '0');
+        const customPort = port ?? parseInt(process.env.PORT ?? '0');
         await this.app.ready();
-        (_c = (_b = this.app).swagger) === null || _c === void 0 ? void 0 : _c.call(_b);
+        this.app.swagger?.();
         if (customPort) {
             await this.app.listen({ port: customPort, host: '0.0.0.0' });
         }
         else if (this.https) {
             // redirect 80 to 443
             node_http_1.default.createServer((req, res) => {
-                var _a, _b, _c, _d;
-                res.writeHead(301, { Location: 'https://' + ((_c = (_b = (_a = req === null || req === void 0 ? void 0 : req.headers) === null || _a === void 0 ? void 0 : _a.host) === null || _b === void 0 ? void 0 : _b.replace(/:\d+$/, '')) !== null && _c !== void 0 ? _c : '') + ((_d = req.url) !== null && _d !== void 0 ? _d : '') });
+                res.writeHead(301, { Location: 'https://' + (req?.headers?.host?.replace(/:\d+$/, '') ?? '') + (req.url ?? '') });
                 res.end();
             }).listen(80);
             await this.app.listen({ port: 443, host: '0.0.0.0' });
@@ -328,9 +326,8 @@ class Server {
             this.validOriginSuffixes.add(s);
     }
     async swagger(opts) {
-        var _a, _b, _c, _d;
-        let openapi = (_a = opts === null || opts === void 0 ? void 0 : opts.openapi) !== null && _a !== void 0 ? _a : {};
-        if (this.config.authenticate === unified_auth_1.unifiedAuthenticate) {
+        let openapi = opts?.openapi ?? {};
+        if (this.config.authenticate != null) {
             openapi = (0, txstate_utils_1.set)(openapi, 'components.securitySchemes', {
                 unifiedAuth: {
                     type: 'http',
@@ -344,12 +341,11 @@ this is log into this application and use dev tools to pull your token from the
             openapi.security = [{ unifiedAuth: [] }];
         }
         await this.app.register(swagger_1.default, { openapi });
-        await this.app.register(swagger_ui_1.default, { ...opts === null || opts === void 0 ? void 0 : opts.ui, routePrefix: (_d = (_b = opts === null || opts === void 0 ? void 0 : opts.path) !== null && _b !== void 0 ? _b : (_c = opts === null || opts === void 0 ? void 0 : opts.ui) === null || _c === void 0 ? void 0 : _c.routePrefix) !== null && _d !== void 0 ? _d : '/docs' });
+        await this.app.register(swagger_ui_1.default, { ...opts?.ui, routePrefix: opts?.path ?? opts?.ui?.routePrefix ?? '/docs' });
     }
     async close(softSeconds) {
-        var _a;
         if (typeof softSeconds === 'undefined')
-            softSeconds = parseInt((_a = process.env.LOAD_BALANCE_TIMEOUT) !== null && _a !== void 0 ? _a : '0');
+            softSeconds = parseInt(process.env.LOAD_BALANCE_TIMEOUT ?? '0');
         process.removeListener('SIGTERM', this.sigHandler);
         process.removeListener('SIGINT', this.sigHandler);
         if (softSeconds) {

package/lib/unified-auth.js

@@ -1,14 +1,14 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unifiedAuthenticateAll = exports.unifiedAuthenticate = void 0;
 const crypto_1 = require("crypto");
 const jose_1 = require("jose");
 const txstate_utils_1 = require("txstate-utils");
 function cleanPem(secretOrPem) {
-    return secretOrPem === null || secretOrPem === void 0 ? void 0 : secretOrPem.replace(/(-+BEGIN [\w\s]+ KEY-+)\s*(.*?)\s*(-+END [\w\s]+ KEY-+)/, '$1\n$2\n$3');
+    return secretOrPem?.replace(/(-+BEGIN [\w\s]+ KEY-+)\s*(.*?)\s*(-+END [\w\s]+ KEY-+)/, '$1\n$2\n$3');
 }
 class MockContext {
+    auth;
     constructor(auth) {
         this.auth = auth;
     }
@@ -18,6 +18,36 @@ class MockContext {
     static init() { }
 }
 class Context extends MockContext {
+    authPromise;
+    static jwtVerifyKey;
+    static issuerKeys = new Map();
+    static issuerConfig = new Map();
+    static tokenCache = new txstate_utils_1.Cache(async (token, { req, ctx }) => {
+        // `this` is always the Context class, even if we are making instances of a subclass of Context
+        // we need to get the instance's constructor instead in case it has overridden one of our
+        // static methods/variables
+        const ctxStatic = ctx.constructor;
+        const logger = req?.log ?? console;
+        let verifyKey = Context.jwtVerifyKey;
+        try {
+            const claims = (0, jose_1.decodeJwt)(token);
+            if (claims.iss && ctxStatic.issuerKeys.has(claims.iss))
+                verifyKey = ctxStatic.issuerKeys.get(claims.iss);
+            if (!verifyKey) {
+                logger.info(`Received token with issuer: ${claims.iss} but JWT secret could not be found. The server may be misconfigured or the user may have presented a JWT from an untrusted issuer.`);
+                return undefined;
+            }
+            await ctxStatic.validateToken?.(token, ctxStatic.issuerConfig.get(claims.iss), claims);
+            const { payload } = await (0, jose_1.jwtVerify)(token, verifyKey);
+            return await ctx.authFromPayload(payload);
+        }
+        catch (e) {
+            // squelch errors about bad tokens, we can already see the 401 in the log
+            if (e.code !== 'ERR_JWS_SIGNATURE_VERIFICATION_FAILED')
+                logger.error(e);
+            return undefined;
+        }
+    }, { freshseconds: 10 });
     constructor(req) {
         super(undefined);
         this.authPromise = this.authFromReq(req);
@@ -26,31 +56,31 @@ class Context extends MockContext {
         this.auth = await this.authPromise;
         return this.auth;
     }
+    static hasInitialized = false;
     static init() {
-        var _b;
         if (this.hasInitialized)
             return;
         this.hasInitialized = true;
         let secret = cleanPem(process.env.JWT_SECRET_VERIFY);
         if (secret != null) {
-            _a.jwtVerifyKey = (0, crypto_1.createPublicKey)(secret);
+            Context.jwtVerifyKey = (0, crypto_1.createPublicKey)(secret);
         }
         else {
             secret = cleanPem(process.env.JWT_SECRET);
             if (secret != null) {
                 try {
-                    _a.jwtVerifyKey = (0, crypto_1.createPublicKey)(secret);
+                    Context.jwtVerifyKey = (0, crypto_1.createPublicKey)(secret);
                 }
                 catch (e) {
                     console.info('JWT_SECRET was not a private key, treating it as symmetric.');
-                    _a.jwtVerifyKey = (0, crypto_1.createSecretKey)(Buffer.from(secret, 'ascii'));
+                    Context.jwtVerifyKey = (0, crypto_1.createSecretKey)(Buffer.from(secret, 'ascii'));
                 }
             }
         }
         if (process.env.JWT_TRUSTED_ISSUERS) {
             const issuers = (0, txstate_utils_1.toArray)(JSON.parse(process.env.JWT_TRUSTED_ISSUERS));
             for (const issuer of issuers) {
-                this.issuerConfig.set(issuer.iss, (_b = this.processIssuerConfig) === null || _b === void 0 ? void 0 : _b.call(this, (0, txstate_utils_1.omit)(issuer, 'publicKey', 'secret')));
+                this.issuerConfig.set(issuer.iss, this.processIssuerConfig?.((0, txstate_utils_1.omit)(issuer, 'publicKey', 'secret')));
                 if (issuer.url)
                     this.issuerKeys.set(issuer.iss, (0, jose_1.createRemoteJWKSet)(new URL(issuer.url)));
                 else if (issuer.publicKey)
@@ -60,10 +90,27 @@ class Context extends MockContext {
             }
         }
     }
+    /**
+     * If implemented, this method will be called on startup, once per configured issuer. It receives
+     * the issuer configuration from the JWT_TRUSTED_ISSUERS environment variable and allows you to manipulate
+     * the configuration before storing it.
+     *
+     * Once stored, whatever you create may be used in your custom validateToken method. For example,
+     * you might want to create an in-memory URL object with an issuer's URL so that it can be manipulated
+     * easily to send validation checks to the issuer.
+     */
+    static processIssuerConfig;
+    /**
+     * If implemented, this method is called after a token's signature is checked and passes. You would
+     * typically implement this method to check whether the user has manually signed out, or the token has
+     * been otherwise deauthorized before its expiration date.
+     *
+     * If the token is not valid, this method should throw an error with an appropriate message.
+     */
+    static validateToken;
     tokenFromReq(req) {
-        var _b;
-        const m = (_b = req === null || req === void 0 ? void 0 : req.headers.authorization) === null || _b === void 0 ? void 0 : _b.match(/^bearer (.*)$/i);
-        return m === null || m === void 0 ? void 0 : m[1];
+        const m = req?.headers.authorization?.match(/^bearer (.*)$/i);
+        return m?.[1];
     }
     async authFromReq(req) {
         const token = this.tokenFromReq(req);
@@ -75,55 +122,22 @@ class Context extends MockContext {
         return payload;
     }
 }
-_a = Context;
-Context.issuerKeys = new Map();
-Context.issuerConfig = new Map();
-Context.tokenCache = new txstate_utils_1.Cache(async (token, { req, ctx }) => {
-    var _b, _c;
-    // `this` is always the Context class, even if we are making instances of a subclass of Context
-    // we need to get the instance's constructor instead in case it has overridden one of our
-    // static methods/variables
-    const ctxStatic = ctx.constructor;
-    const logger = (_b = req === null || req === void 0 ? void 0 : req.log) !== null && _b !== void 0 ? _b : console;
-    let verifyKey = _a.jwtVerifyKey;
-    try {
-        const claims = (0, jose_1.decodeJwt)(token);
-        if (claims.iss && ctxStatic.issuerKeys.has(claims.iss))
-            verifyKey = ctxStatic.issuerKeys.get(claims.iss);
-        if (!verifyKey) {
-            logger.info(`Received token with issuer: ${claims.iss} but JWT secret could not be found. The server may be misconfigured or the user may have presented a JWT from an untrusted issuer.`);
-            return undefined;
-        }
-        await ((_c = ctxStatic.validateToken) === null || _c === void 0 ? void 0 : _c.call(ctxStatic, token, ctxStatic.issuerConfig.get(claims.iss), claims));
-        const { payload } = await (0, jose_1.jwtVerify)(token, verifyKey);
-        return await ctx.authFromPayload(payload);
-    }
-    catch (e) {
-        // squelch errors about bad tokens, we can already see the 401 in the log
-        if (e.code !== 'ERR_JWS_SIGNATURE_VERIFICATION_FAILED')
-            logger.error(e);
-        return undefined;
-    }
-}, { freshseconds: 10 });
-Context.hasInitialized = false;
 class TxStateUAuthContext extends Context {
     static processIssuerConfig(config) {
-        var _b;
         if (config.iss === 'unified-auth') {
-            config.validateUrl = new URL((_b = config.url) !== null && _b !== void 0 ? _b : '');
+            config.validateUrl = new URL(config.url ?? '');
             config.validateUrl.pathname = '/validateToken';
         }
         return config;
     }
     static async validateToken(token, issuerConfig, claims) {
-        var _b;
         if (claims.iss === 'unified-auth') {
             const validateUrl = new URL(issuerConfig.validateUrl);
             validateUrl.searchParams.set('unifiedJwt', token);
             const resp = await fetch(validateUrl);
             const validate = await resp.json();
             if (!validate.valid)
-                throw new Error((_b = validate.reason) !== null && _b !== void 0 ? _b : 'Your session has been ended on another device or in another browser tab/window. It\'s also possible your NetID is no longer active.');
+                throw new Error(validate.reason ?? 'Your session has been ended on another device or in another browser tab/window. It\'s also possible your NetID is no longer active.');
         }
     }
     async authFromPayload(payload) {
@@ -142,11 +156,10 @@ async function unifiedAuthenticate(req, ContextClass = TxStateUAuthContext) {
 }
 exports.unifiedAuthenticate = unifiedAuthenticate;
 async function unifiedAuthenticateAll(req, ContextClass = TxStateUAuthContext) {
-    var _b;
     ContextClass.init();
     const ctx = new ContextClass(req);
     const auth = await ctx.waitForAuth();
-    if (!(auth === null || auth === void 0 ? void 0 : auth.username.length) && !((_b = req.routeOptions.url) === null || _b === void 0 ? void 0 : _b.startsWith('/docs')))
+    if (!auth?.username.length && !req.routeOptions.url?.startsWith('/docs'))
         throw new Error('All requests require authentication.');
     return auth;
 }

package/lib-esm/index.d.ts

@@ -77,7 +77,7 @@ export interface FastifyTxStateOptions extends Partial<FastifyServerOptions> {
      *
      * If this function throws, the client will receive a 401 response.
      */
-    authenticate?: <T extends FastifyTxStateAuthInfo>(req: FastifyRequest) => Promise<T | undefined>;
+    authenticate?: (req: FastifyRequest) => Promise<FastifyTxStateAuthInfo | undefined>;
 }
 declare module 'fastify' {
     interface FastifyRequest {
@@ -114,6 +114,8 @@ export declare const devLogger: {
     child(bindings: any, options?: any): any;
 };
 export declare const prodLogger: FastifyLoggerOptions;
+export type FastifyInstanceTyped = FastifyInstance<RawServerDefault, http.IncomingMessage, http.ServerResponse<http.IncomingMessage>, FastifyBaseLogger, JsonSchemaToTsProvider>;
+export type TxServer = Server;
 export default class Server {
     protected config: FastifyTxStateOptions & {
         http2?: true;
@@ -130,7 +132,7 @@ export default class Server {
     protected validOrigins: Record<string, boolean>;
     protected validOriginHosts: Record<string, boolean>;
     protected validOriginSuffixes: Set<string>;
-    app: FastifyInstance<RawServerDefault, http.IncomingMessage, http.ServerResponse<http.IncomingMessage>, FastifyBaseLogger, JsonSchemaToTsProvider>;
+    app: FastifyInstanceTyped;
     constructor(config?: FastifyTxStateOptions & {
         http2?: true;
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify-txstate",
-  "version": "3.2.10",
+  "version": "3.2.12",
   "description": "A small wrapper for fastify providing a set of common conventions & utility functions we use.",
   "exports": {
     ".": {
@@ -23,6 +23,7 @@
     "@fastify/swagger-ui": "^3.0.0",
     "@fastify/type-provider-json-schema-to-ts": "^3.0.0",
     "@txstate-mws/fastify-shared": "^1.0.9",
+    "@types/ua-parser-js": ">=0.7.39",
     "ajv-errors": "^3.0.0",
     "ajv-formats": "^2.1.1",
     "fastify": "^4.9.2",
@@ -36,7 +37,6 @@
     "@types/chai": "^4.2.14",
     "@types/mocha": "^10.0.0",
     "@types/node": "^20.0.0",
-    "@types/ua-parser-js": ">=0.7.39",
     "axios": "^1.6.8",
     "chai": "^4.2.0",
     "eslint-config-standard-with-typescript": "^43.0.0",