ensure that passed in headers can override CORS headers

Author: cjus

lib/server-response.js

@@ -72,15 +72,15 @@ class ServerResponse {
       'Content-Type': 'application/json'
     };
 
-    if (data) {
-      headers = Object.assign(headers, data.headers);
-    }
-
     let response = Object.assign(this.createResponseObject(code), data || {});
     if (this.corsEnabled) {
       headers = Object.assign(headers, this.corsHeaders);
     }
 
+    if (data) {
+      headers = Object.assign(headers, data.headers);
+    }
+
     let responseString = JSON.stringify(response);
     headers['Content-Length'] = Buffer.byteLength(responseString);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hydra",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "license": "MIT",
   "author": "Carlos Justiniano",
   "contributors": "https://github.com/pnxtech/hydra/graphs/contributors",
@@ -36,8 +36,8 @@
     "eslint": "4.18.2",
     "eslint-config-google": "0.7.1",
     "eslint-plugin-mocha": "4.9.0",
-    "mocha": "^8.1.3",
-    "nyc": "^15.1.0",
+    "mocha": "8.1.3",
+    "nyc": "15.1.0",
     "redis-mock": "0.17.0"
   },
   "nyc": {