expressjs#33: fix bug that dropped support for non-Express apps in ex…

…pressjs#30
gagangupt16 · Nov 10, 2014 · fee800f · fee800f
1 parent 165f35e
commit fee800f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -12,16 +12,23 @@
     };
 
   function configureOrigin(options, req) {
-    var origin = options.origin;
-    if (origin === true) {
-      origin = req.headers.origin;
-    } else if (!origin) {
-      origin = '*';
+    if (!options.origin) {
+      return {
+        key: 'Access-Control-Allow-Origin',
+        value: '*'
+      };
+    } else {
+      return [
+        {
+          key: 'Access-Control-Allow-Origin',
+          value: options.origin === true ? req.headers.origin : options.origin
+        },
+        {
+          key: 'Vary',
+          value: 'Origin'
+        }
+      ];
     }
-    return {
-      key: 'Access-Control-Allow-Origin',
-      value: origin
-    };
   }
 
   function configureMethods(options) {
@@ -95,21 +102,14 @@
         headers.forEach(function (header) {
           if (header) {
             if (Array.isArray(header)) {
-              return applyHeaders(header, res);
+              applyHeaders(header, res);
+            } else if (header.key === 'Vary' && header.value) {
+              vary(res, header.value);
             } else if (header.value) {
-              if (res.set) {
-                // for Express 4+
-                res.set(header.key, header.value);
-              } else {
-                // for Express <4
-                res.setHeader(header.key, header.value);
-              }
+              res.setHeader(header.key, header.value);
             }
           }
         });
-        if (res.get('Origin') !== '*') {
-          vary(res, 'Origin');
-        }
       };
 
     if (method === 'OPTIONS') {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cors",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "author": "Troy Goode <troygoode@gmail.com> (https://github.com/troygoode/)",
   "description": "middleware for dynamically or statically enabling CORS in express/connect applications",
   "keywords": ["cors", "express", "connect", "middleware"],