Merge pull request #5 from tyler-johnson/dev

Dev

.eslintrc.json

@@ -1,17 +1,18 @@
 {
-    "parser": "babel-eslint",
-    "extends": "eslint:recommended",
-	"rules": {
-		"semi": 1,
-		"no-console": 0
-	},
-	"parserOptions": {
-		"ecmaVersion": 6,
-		"sourceType": "module"
-	},
-	"env": {
-		"node": true,
-		"es6": true,
-        "browser": true
-	}
+  "parser": "babel-eslint",
+  "extends": "eslint:recommended",
+  "rules": {
+    "semi": 1,
+    "no-console": 0,
+    "no-shadow": 1
+  },
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "env": {
+    "node": true,
+    "es6": true,
+    "browser": true
+  }
 }

src/index.js

@@ -35,6 +35,12 @@ export default function(fn, opts={}) {
 
 	const proxy = httpProxy.createProxyServer({ target });
 
+	proxy.on("proxyRes", function(proxyRes, req, res) {
+		const existing = res.getHeader("Via");
+		const viaheader = `${existing ? existing + ", " : ""}${req.httpVersion} ${via} (${name}/${version})`;
+		res.setHeader("Via", viaheader);
+	});
+
 	return async function(req, res, next) {
 		try {
 			// hijack the root response and inject proxy information
@@ -45,24 +51,10 @@ export default function(fn, opts={}) {
 			// inject couchdb proxy headers into request
 			const ctx = await confusedAsync(fn, null, [ req, res ]);
 			if (ctx != null) {
-				const name = typeof ctx.name === "string" ? ctx.name : "";
-				req.headers[headerFields.username] = name;
+				const n = typeof ctx.name === "string" ? ctx.name : "";
+				req.headers[headerFields.username] = n;
 				req.headers[headerFields.roles] = Array.isArray(ctx.roles) ? ctx.roles.join(",") : "";
-				if (secret) req.headers[headerFields.token] = signRequest(name, secret);
-			}
-
-			// attach Via header on response
-			// do this last in case there was an error
-			if (via) {
-				const writeHead = res.writeHead;
-				res.writeHead = function(code, headers) {
-					const existing = res.getHeader("Via");
-					const viaheader = `${existing ? existing + ", " : ""}${req.httpVersion} ${via} (${name}/${version})`;
-					res.setHeader("Via", viaheader);
-					if (headers) headers["Via"] = viaheader;
-
-					return writeHead.apply(res, arguments);
-				};
+				if (secret) req.headers[headerFields.token] = signRequest(n, secret);
 			}
 
 			proxy.web(req, res);