Merge pull request #7 from wadetandy/master

Allow arbitrary fetch() options to be specified

Author: wadetandy

.gitignore

@@ -6,3 +6,4 @@ lib
 lib-esm
 _bundles
 yarn.lock
+yarn-error.log

src/model.ts

@@ -70,6 +70,21 @@ export default class Model {
     }
   }
 
+  static fetchOptions() : RequestInit {
+    let options = {
+      headers: {
+        Accept: 'application/json',
+        ['Content-Type']: 'application/json'
+      } as any
+    }
+
+    if (this.getJWT()) {
+      options.headers.Authorization = `Token token="${this.getJWT()}"`;
+    }
+
+    return options
+  }
+
   static getJWTOwner() : typeof Model {
     if (this.isJWTOwner) {
       return this;

src/request.ts

@@ -2,27 +2,27 @@ import Config from './configuration';
 import colorize from './util/colorize';
 
 export default class Request {
-  get(url : string, options: Object) : Promise<any> {
-    options['method'] = 'GET';
+  get(url : string, options: RequestInit) : Promise<any> {
+    options.method = 'GET';
     return this._fetchWithLogging(url, options);
   }
 
-  post(url: string, payload: Object, options: Object) : Promise<any> {
-    options['method'] = 'POST';
-    options['body']   = JSON.stringify(payload);
+  post(url: string, payload: Object, options: RequestInit) : Promise<any> {
+    options.method = 'POST';
+    options.body   = JSON.stringify(payload);
 
     return this._fetchWithLogging(url, options);
   }
 
-  put(url: string, payload: Object, options: Object) : Promise<any> {
-    options['method'] = 'PUT';
-    options['body']   = JSON.stringify(payload);
+  put(url: string, payload: Object, options: RequestInit) : Promise<any> {
+    options.method = 'PUT';
+    options.body   = JSON.stringify(payload);
 
     return this._fetchWithLogging(url, options);
   }
 
-  delete(url: string, options: Object) : Promise<any> {
-    options['method'] = 'DELETE';
+  delete(url: string, options: RequestInit) : Promise<any> {
+    options.method = 'DELETE';
     return this._fetchWithLogging(url, options);
   }
 
@@ -36,40 +36,26 @@ export default class Request {
     Config.logger.debug(colorize('bold', JSON.stringify(responseJSON, null, 4)));
   }
 
-  private _fetchWithLogging(url: string, options: Object) : Promise<any> {
-    this._logRequest(options['method'], url);
+  private _fetchWithLogging(url: string, options: RequestInit) : Promise<any> {
+    this._logRequest(options.method, url);
     let promise = this._fetch(url, options);
     promise.then((response : any) => {
       this._logResponse(response['jsonPayload']);
     });
     return promise;
   }
 
-  private _fetch(url: string, options: Object) : Promise<any> {
+  private _fetch(url: string, options: RequestInit) : Promise<any> {
     return new Promise((resolve, reject) => {
-      let headers = this.buildHeaders(options);
-      options['headers'] = headers;
-
       let fetchPromise = fetch(url, options);
       fetchPromise.then((response) => {
         response.json().then((json) => {
           response['jsonPayload'] = json;
           resolve(response);
         }).catch((e) => { throw(e); });
       });
+
       fetchPromise.catch(reject);
     });
   }
-
-  private buildHeaders(options: Object) : any {
-    let headers = {};
-    headers['Accept'] = 'application/json';
-    headers['Content-Type'] = 'application/json';
-
-    if (options['jwt']) {
-      headers['Authorization'] = `Token token="${options['jwt']}"`;
-    }
-
-    return headers;
-  }
 }

src/scope.ts

@@ -219,9 +219,9 @@ export default class Scope {
       url = `${url}?${qp}`;
     }
     let request = new Request();
-    let jwt = this.model.getJWT();
+    let fetchOpts = this.model.fetchOptions()
 
-    return request.get(url, { jwt }).then((response) => {
+    return request.get(url, fetchOpts).then((response) => {
       let jwtHeader = response.headers.get('X-JWT');
       if (jwtHeader) {
         this.model.setJWT(jwtHeader);

test/unit/model-test.ts

@@ -134,6 +134,28 @@ describe('Model', function() {
     });
   });
 
+  describe('#fetchOptions', function() {
+    context('jwt is set', function() {
+      beforeEach(function() {
+        ApplicationRecord.jwt = 'g3tm3';
+      });
+
+      afterEach(function() {
+        ApplicationRecord.jwt = null;
+      });
+
+      it('sets the auth header', function() {
+        expect(Author.fetchOptions().headers.Authorization).to.eq('Token token="g3tm3"');
+      });
+    })
+
+    it('includes the content headers', function() {
+      let headers = Author.fetchOptions().headers
+      expect(headers.Accept).to.eq('application/json')
+      expect(headers['Content-Type']).to.eq('application/json')
+    })
+  })
+
   describe('#isType', function() {
     it('checks the jsonapiType of class', function() {
       instance = new Author()