Merge pull request #478 from ingiulio/allowXHTTPMethodOverrideHeader

allow x-http-method-override header to be passed in from the client request
rendrjs · Jun 12, 2015 · 2b0cccc · 2b0cccc
2 parents b105588 + cf94929
commit 2b0cccc
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/server/middleware/apiProxy.js b/server/middleware/apiProxy.js
@@ -24,6 +24,8 @@ function apiProxy(dataAdapter) {
       'x-forwarded-for': apiProxy.getXForwardedForHeader(req.headers, req.ip)
     };
 
+    api.headers = apiProxy.setXHTTPMethodOverride(req.headers, api.headers);
+
     dataAdapter.request(req, api, {
       convertErrorCode: false
     }, function(err, response, body) {
@@ -65,3 +67,10 @@ apiProxy.getXForwardedForHeader = function (headers, clientIp) {
 
   return newHeaderValue;
 };
+
+apiProxy.setXHTTPMethodOverride = function (requestHeaders, apiHeaders) {
+  if (requestHeaders['x-http-method-override']) {
+    apiHeaders['x-http-method-override'] = requestHeaders['x-http-method-override'];
+  }
+  return apiHeaders;
+};
diff --git a/test/server/middleware/apiProxy.test.js b/test/server/middleware/apiProxy.test.js
@@ -85,6 +85,33 @@ describe('apiProxy', function() {
         incomingHeaders['x-forwarded-for']);
     });
 
+    it('should add an x-http-method-override header to the request if there is one', function () {
+      var incomingHeaders = { 'x-http-method-override': 'PUT' },
+        outgoingHeaders;
+
+      requestFromClient.headers = incomingHeaders;
+
+      proxy(requestFromClient, responseToClient);
+
+      requestToApi.should.have.been.calledOnce;
+      outgoingHeaders = requestToApi.firstCall.args[1].headers;
+      outgoingHeaders['x-http-method-override'].should.eq(incomingHeaders['x-http-method-override']);
+    });
+
+    it('should not add an x-http-method-override header to the request if there is not one', function () {
+      var incomingHeaders = {},
+        outgoingHeaders;
+
+      requestFromClient.headers = incomingHeaders;
+
+      proxy(requestFromClient, responseToClient);
+
+      requestToApi.should.have.been.calledOnce;
+      outgoingHeaders = requestToApi.firstCall.args[1].headers;
+
+      expect(outgoingHeaders['x-http-method-override']).to.be.undefined;
+    });
+
 
    it('should not pass through the host header', function () {
       proxy(requestFromClient, responseToClient);