json-rest-api 1.0.14 → 1.0.15

package/plugins/core/rest-api-cors-plugin.js

@@ -1,192 +1,191 @@
-  export const CorsPlugin = {
-    name: 'rest-api-cors',
-    dependencies: ['rest-api'],
-
-    async install({ api, addHook, vars, helpers, log, pluginOptions, runHooks }) {
-      // Get CORS configuration
-      const corsOptions = pluginOptions || {};
-
-      // Store configuration - using a plain object for runtime updates
-      const corsConfig = {
-        // Origin configuration
-        origin: corsOptions.origin || '*', // Can be string, regex, array, or function
-        credentials: corsOptions.credentials !== undefined ? corsOptions.credentials : true,
-
-        // Allowed methods
-        methods: corsOptions.methods || ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
-
-        // Allowed headers
-        allowedHeaders: corsOptions.allowedHeaders || [
-          'Content-Type',
-          'Authorization',
-          'X-Requested-With',
-          'X-HTTP-Method-Override',
-          'Accept',
-          'Origin'
-        ],
-
-        // Exposed headers (for client to read)
-        exposedHeaders: corsOptions.exposedHeaders || [
-          'X-Total-Count',
-          'X-Page-Count',
-          'Link',
-          'Location'
-        ],
-
-        // Preflight cache
-        maxAge: corsOptions.maxAge || 86400, // 24 hours
-
-        // Options success status
-        optionsSuccessStatus: corsOptions.optionsSuccessStatus || 204
-      };
-
-      // Store reference in vars for access in hooks
-      vars.cors = corsConfig;
-
-      // Helper to check if origin is allowed
-      function isOriginAllowed(origin, allowedOrigin) {
-        if (!origin) return !corsConfig.credentials; // No origin = same-origin request
-
-        // String match
-        if (typeof allowedOrigin === 'string') {
-          return allowedOrigin === '*' || allowedOrigin === origin;
-        }
+export const CorsPlugin = {
+  name: 'rest-api-cors',
+  dependencies: ['rest-api'],
+
+  async install ({ api, addHook, vars, helpers, log, pluginOptions, runHooks }) {
+    // Get CORS configuration
+    const corsOptions = pluginOptions || {}
+
+    // Store configuration - using a plain object for runtime updates
+    const corsConfig = {
+      // Origin configuration
+      origin: corsOptions.origin || '*', // Can be string, regex, array, or function
+      credentials: corsOptions.credentials !== undefined ? corsOptions.credentials : true,
+
+      // Allowed methods
+      methods: corsOptions.methods || ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
+
+      // Allowed headers
+      allowedHeaders: corsOptions.allowedHeaders || [
+        'Content-Type',
+        'Authorization',
+        'X-Requested-With',
+        'X-HTTP-Method-Override',
+        'Accept',
+        'Origin'
+      ],
+
+      // Exposed headers (for client to read)
+      exposedHeaders: corsOptions.exposedHeaders || [
+        'X-Total-Count',
+        'X-Page-Count',
+        'Link',
+        'Location'
+      ],
+
+      // Preflight cache
+      maxAge: corsOptions.maxAge || 86400, // 24 hours
+
+      // Options success status
+      optionsSuccessStatus: corsOptions.optionsSuccessStatus || 204
+    }
 
-        // Regex match
-        if (allowedOrigin instanceof RegExp) {
-          return allowedOrigin.test(origin);
-        }
+    // Store reference in vars for access in hooks
+    vars.cors = corsConfig
 
-        // Array of allowed origins
-        if (Array.isArray(allowedOrigin)) {
-          return allowedOrigin.some(allowed => isOriginAllowed(origin, allowed));
-        }
+    // Helper to check if origin is allowed
+    function isOriginAllowed (origin, allowedOrigin) {
+      if (!origin) return !corsConfig.credentials // No origin = same-origin request
 
-        // Function check
-        if (typeof allowedOrigin === 'function') {
-          return allowedOrigin(origin);
-        }
+      // String match
+      if (typeof allowedOrigin === 'string') {
+        return allowedOrigin === '*' || allowedOrigin === origin
+      }
+
+      // Regex match
+      if (allowedOrigin instanceof RegExp) {
+        return allowedOrigin.test(origin)
+      }
 
-        return false;
+      // Array of allowed origins
+      if (Array.isArray(allowedOrigin)) {
+        return allowedOrigin.some(allowed => isOriginAllowed(origin, allowed))
       }
 
-      // Check if transport plugin is available
-      if (!vars.transport) {
-        log.error('CORS plugin requires a transport plugin (express, koa, etc.) to be installed');
-        return;
+      // Function check
+      if (typeof allowedOrigin === 'function') {
+        return allowedOrigin(origin)
       }
 
+      return false
+    }
 
-      // Register OPTIONS handler for all routes
-      const optionsHandler = async ({ context, headers }) => {
-        const origin = headers?.origin;
-        
-        log.debug('CORS OPTIONS request', { origin });
-
-        // Check if origin is allowed
-        if (isOriginAllowed(origin, corsConfig.origin)) {
-          const responseHeaders = {
-            'Access-Control-Allow-Methods': corsConfig.methods.join(', '),
-            'Access-Control-Allow-Headers': corsConfig.allowedHeaders.join(', '),
-            'Access-Control-Max-Age': String(corsConfig.maxAge)
-          };
-
-          // Set origin header
-          if (corsConfig.origin === '*' && !corsConfig.credentials) {
-            responseHeaders['Access-Control-Allow-Origin'] = '*';
-          } else if (origin) {
-            responseHeaders['Access-Control-Allow-Origin'] = origin;
-            responseHeaders['Vary'] = 'Origin';
-          }
-
-          // Set credentials if enabled
-          if (corsConfig.credentials) {
-            responseHeaders['Access-Control-Allow-Credentials'] = 'true';
-          }
-
-          return {
-            statusCode: corsConfig.optionsSuccessStatus,
-            headers: responseHeaders,
-            body: null
-          };
-        } else {
-          // Origin not allowed
-          log.warn('CORS origin not allowed', { origin });
-          return {
-            statusCode: 403,
-            body: { error: 'CORS origin not allowed' }
-          };
+    // Check if transport plugin is available
+    if (!vars.transport) {
+      log.error('CORS plugin requires a transport plugin (express, koa, etc.) to be installed')
+      return
+    }
+
+    // Register OPTIONS handler for all routes
+    const optionsHandler = async ({ context, headers }) => {
+      const origin = headers?.origin
+
+      log.debug('CORS OPTIONS request', { origin })
+
+      // Check if origin is allowed
+      if (isOriginAllowed(origin, corsConfig.origin)) {
+        const responseHeaders = {
+          'Access-Control-Allow-Methods': corsConfig.methods.join(', '),
+          'Access-Control-Allow-Headers': corsConfig.allowedHeaders.join(', '),
+          'Access-Control-Max-Age': String(corsConfig.maxAge)
         }
-      };
-
-      // Register OPTIONS route for all paths
-      await api.addRoute({
-        method: 'OPTIONS',
-        path: vars.transport.matchAll,
-        handler: optionsHandler
-      });
-
-      // Hook to handle CORS headers for all responses
-      addHook('transport:response', 'cors-headers', { order: -1000 }, async ({ context }) => {
-        // Transport data is now nested in context
-        const { request, response } = context.transport || {};
-        
-        if (!request) {
-          log.error('CORS: request is undefined in transport:response hook');
-          return;
+
+        // Set origin header
+        if (corsConfig.origin === '*' && !corsConfig.credentials) {
+          responseHeaders['Access-Control-Allow-Origin'] = '*'
+        } else if (origin) {
+          responseHeaders['Access-Control-Allow-Origin'] = origin
+          responseHeaders['Vary'] = 'Origin'
         }
-        
-        const origin = request.headers?.origin;
-        const method = request.method?.toUpperCase();
 
-        log.debug('CORS processing response', {
-          origin,
-          method,
-          path: request.path
-        });
+        // Set credentials if enabled
+        if (corsConfig.credentials) {
+          responseHeaders['Access-Control-Allow-Credentials'] = 'true'
+        }
 
-        // Skip if this was an OPTIONS request (already handled by route)
-        if (method === 'OPTIONS') {
-          return;
+        return {
+          statusCode: corsConfig.optionsSuccessStatus,
+          headers: responseHeaders,
+          body: null
         }
+      } else {
+        // Origin not allowed
+        log.warn('CORS origin not allowed', { origin })
+        return {
+          statusCode: 403,
+          body: { error: 'CORS origin not allowed' }
+        }
+      }
+    }
+
+    // Register OPTIONS route for all paths
+    await api.addRoute({
+      method: 'OPTIONS',
+      path: vars.transport.matchAll,
+      handler: optionsHandler
+    })
+
+    // Hook to handle CORS headers for all responses
+    addHook('transport:response', 'cors-headers', { order: -1000 }, async ({ context }) => {
+      // Transport data is now nested in context
+      const { request, response } = context.transport || {}
+
+      if (!request) {
+        log.error('CORS: request is undefined in transport:response hook')
+        return
+      }
+
+      const origin = request.headers?.origin
+      const method = request.method?.toUpperCase()
+
+      log.debug('CORS processing response', {
+        origin,
+        method,
+        path: request.path
+      })
+
+      // Skip if this was an OPTIONS request (already handled by route)
+      if (method === 'OPTIONS') {
+        return
+      }
 
-        // Check if origin is allowed
-        if (isOriginAllowed(origin, corsConfig.origin)) {
-          // Set origin header
-          if (corsConfig.origin === '*' && !corsConfig.credentials) {
-            response.headers['Access-Control-Allow-Origin'] = '*';
-          } else if (origin) {
-            response.headers['Access-Control-Allow-Origin'] = origin;
-            response.headers['Vary'] = 'Origin';
-          }
-
-          // Set credentials if enabled
-          if (corsConfig.credentials) {
-            response.headers['Access-Control-Allow-Credentials'] = 'true';
-          }
-
-          // Set exposed headers
-          if (corsConfig.exposedHeaders.length > 0) {
-            response.headers['Access-Control-Expose-Headers'] = corsConfig.exposedHeaders.join(', ');
-          }
+      // Check if origin is allowed
+      if (isOriginAllowed(origin, corsConfig.origin)) {
+        // Set origin header
+        if (corsConfig.origin === '*' && !corsConfig.credentials) {
+          response.headers['Access-Control-Allow-Origin'] = '*'
         } else if (origin) {
-          // Origin not allowed - don't set any CORS headers
-          log.warn('CORS origin not allowed for response', {
-            origin,
-            allowedOrigins: corsConfig.origin
-          });
+          response.headers['Access-Control-Allow-Origin'] = origin
+          response.headers['Vary'] = 'Origin'
         }
-      });
 
-      log.info('CORS plugin installed', {
-        origin: corsConfig.origin,
-        credentials: corsConfig.credentials,
-        methods: corsConfig.methods
-      });
-    }
-  };
+        // Set credentials if enabled
+        if (corsConfig.credentials) {
+          response.headers['Access-Control-Allow-Credentials'] = 'true'
+        }
+
+        // Set exposed headers
+        if (corsConfig.exposedHeaders.length > 0) {
+          response.headers['Access-Control-Expose-Headers'] = corsConfig.exposedHeaders.join(', ')
+        }
+      } else if (origin) {
+        // Origin not allowed - don't set any CORS headers
+        log.warn('CORS origin not allowed for response', {
+          origin,
+          allowedOrigins: corsConfig.origin
+        })
+      }
+    })
+
+    log.info('CORS plugin installed', {
+      origin: corsConfig.origin,
+      credentials: corsConfig.credentials,
+      methods: corsConfig.methods
+    })
+  }
+}
 
-  /* 
+/*
   Usage examples:
 
   // Basic usage - allow all origins
@@ -235,4 +234,4 @@
     }
   });
 
-*/
+*/