fix(AjaxObservable): ignore content-type for formdata (#1746)

allow undefined content-type header if body is formdata references GitHub issue #1729
ReactiveX · Jun 27, 2016 · 43d05e7 · 43d05e7
1 parent 57d64cb
commit 43d05e7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/spec/observables/dom/ajax-spec.ts b/spec/observables/dom/ajax-spec.ts
@@ -399,6 +399,9 @@ describe('Observable.ajax', () => {
 
       expect(MockXMLHttpRequest.mostRecent.url).to.equal('/flibbertyJibbet');
       expect(MockXMLHttpRequest.mostRecent.data).to.deep.equal(body);
+      expect(MockXMLHttpRequest.mostRecent.requestHeaders).to.deep.equal({
+        'X-Requested-With': 'XMLHttpRequest',
+      });
     });
 
     it('should not fail when FormData is undefined', () => {
@@ -552,4 +555,3 @@ describe('Observable.ajax', () => {
     });
   });
 });
-
diff --git a/src/observable/dom/AjaxObservable.ts b/src/observable/dom/AjaxObservable.ts
@@ -198,7 +198,7 @@ export class AjaxSubscriber<T> extends Subscriber<Event> {
     }
 
     // ensure content type is set
-    if (!('Content-Type' in headers)) {
+    if (!('Content-Type' in headers) && !(root.FormData && request.body instanceof root.FormData)) {
       headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
     }
 
@@ -271,23 +271,27 @@ export class AjaxSubscriber<T> extends Subscriber<Event> {
     }
   }
 
-  private serializeBody(body: any, contentType: string) {
+  private serializeBody(body: any, contentType?: string) {
     if (!body || typeof body === 'string') {
       return body;
     } else if (root.FormData && body instanceof root.FormData) {
       return body;
     }
 
-    const splitIndex = contentType.indexOf(';');
-    if (splitIndex !== -1) {
-      contentType = contentType.substring(0, splitIndex);
+    if (contentType) {
+      const splitIndex = contentType.indexOf(';');
+      if (splitIndex !== -1) {
+        contentType = contentType.substring(0, splitIndex);
+      }
     }
 
     switch (contentType) {
       case 'application/x-www-form-urlencoded':
         return Object.keys(body).map(key => `${encodeURI(key)}=${encodeURI(body[key])}`).join('&');
       case 'application/json':
         return JSON.stringify(body);
+      default:
+        return body;
     }
   }