fastify-txstate 3.2.11 → 3.2.13

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); },
@@ -132,13 +131,13 @@ class Server {
          * convert all nulls to undefined before fastify validates.
          */
         this.app.addHook('preSerialization', async (req, res, payload) => {
-            return req.routeSchema?.response ? (0, txstate_utils_1.destroyNulls)(payload) : payload;
+            return req.routeOptions.schema?.response ? (0, txstate_utils_1.destroyNulls)(payload) : payload;
         });
         if (!config.skipOriginCheck && !process.env.SKIP_ORIGIN_CHECK) {
             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) => {
+            this.app.addHook('onRequest', async (req, res) => {
                 res.extraLogInfo = {};
                 if (!req.headers.origin)
                     return;
@@ -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']);
                 }
@@ -185,7 +186,7 @@ class Server {
                 PATCH: true,
                 DELETE: true
             };
-            this.app.addHook('preHandler', async (req, res) => {
+            this.app.addHook('onRequest', async (req, res) => {
                 if (!authenticatedMethods[req.method])
                     return;
                 try {
@@ -229,14 +230,14 @@ class Server {
                     for (const v of err.validation ?? []) {
                         if (v.keyword === 'errorMessage') {
                             for (const ov of v.params.errors) {
-                                if (['type', 'additionalProperties'].includes(ov.keyword))
+                                if (['type', 'additionalProperties', 'minProperties'].includes(ov.keyword))
                                     developerErrors.push({ ...ov, message: v.message });
                                 else
                                     userErrors.push({ ...ov, message: v.message });
                             }
                         }
                         else {
-                            if (['type', 'additionalProperties'].includes(v.keyword))
+                            if (['type', 'additionalProperties', 'minProperties'].includes(v.keyword))
                                 developerErrors.push(v);
                             else
                                 userErrors.push(v);
@@ -326,7 +327,7 @@ class Server {
     }
     async swagger(opts) {
         let openapi = opts?.openapi ?? {};
-        if (this.config.authenticate === unified_auth_1.unifiedAuthenticate) {
+        if (this.config.authenticate != null) {
             openapi = (0, txstate_utils_1.set)(openapi, 'components.securitySchemes', {
                 unifiedAuth: {
                     type: 'http',
@@ -339,7 +340,31 @@ this is log into this application and use dev tools to pull your token from the
             // Apply the security globally to all operations
             openapi.security = [{ unifiedAuth: [] }];
         }
-        await this.app.register(swagger_1.default, { openapi });
+        function findRefs(obj, id) {
+            if (obj == null)
+                return undefined;
+            if (obj.$id?.length)
+                id = obj.$id;
+            if (obj.$ref === '#' && id?.length) {
+                obj.type = 'string';
+                obj.enum = [id];
+                delete obj.$ref;
+            }
+            else {
+                for (const val of Object.values(obj)) {
+                    if (typeof val === 'object' && !(val instanceof Date))
+                        findRefs(val, id);
+                }
+            }
+            return obj;
+        }
+        await this.app.register(swagger_1.default, {
+            openapi,
+            transform({ schema, url, route, swaggerObject, openapiObject }) {
+                const newSchema = findRefs((0, txstate_utils_1.clone)(schema));
+                return { schema: newSchema, url, route, swaggerObject, openapiObject };
+            }
+        });
         await this.app.register(swagger_ui_1.default, { ...opts?.ui, routePrefix: opts?.path ?? opts?.ui?.routePrefix ?? '/docs' });
     }
     async close(softSeconds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify-txstate",
-  "version": "3.2.11",
+  "version": "3.2.13",
   "description": "A small wrapper for fastify providing a set of common conventions & utility functions we use.",
   "exports": {
     ".": {