Merge pull request #33 from digitalsadhu/fix/406_not_acceptable

Fix 406 Not Acceptable

Author: digitalsadhu

lib/headers.js

@@ -1,12 +1,29 @@
 'use strict';
-
-var bodyParser = require('body-parser');
+var is = require('type-is');
 
 module.exports = function (app, options) {
 
-  //registered at the beginning of the routes phase due to usage of
-  //express app.use instead of app.middleware.
-  //We need to do this as bodyParser doesn't support
-  //JSON APIs application/vnd.api+json format by default
-  app.use(bodyParser.json({ type: 'application/vnd.api+json' }));
+  app.remotes().before('**', function (ctx, next) {
+    if (ctx.req.accepts('application/vnd.api+json')) {
+      ctx.req.headers.accept = 'application/json';
+    }
+    next();
+  });
+
+  app.remotes().options.rest = {
+    //turn off strong remotings error handler so we can handle ourselves in error.js
+    handleErrors: false,
+
+    //extend support for application/vnd.api+json
+    supportedTypes: ['json', 'application/javascript', 'text/javascript', 'application/vnd.api+json']
+  };
+
+  //extend rest body parser to also parse application/vnd.api+json
+  app.remotes().options.json = {
+    strict: false,
+    type: function (req) {
+      //if Content-Type is any of the following, then parse otherwise don't
+      return !!is(req, ['json', 'application/json', 'application/vnd.api+json']);
+    }
+  };
 };

package.json

@@ -4,7 +4,7 @@
   "description": "JSONAPI support for loopback",
   "main": "lib/index.js",
   "scripts": {
-    "test": "npm run lint && mocha --reporter=spec ./test/**/*",
+    "test": "npm run lint && mocha --reporter=spec ./test/**/*.test.js",
     "lint": "eslint ."
   },
   "repository": {
@@ -28,7 +28,9 @@
     "body-parser": "^1.14.1",
     "debug": "^2.2.0",
     "inflection": "^1.7.2",
-    "lodash": "^3.10.1"
+    "lodash": "^3.10.1",
+    "loopback": "^2.22.2",
+    "type-is": "^1.6.9"
   },
   "devDependencies": {
     "babel-eslint": "^4.1.3",

test/create.test.js

@@ -1,6 +1,7 @@
 var request = require('supertest');
 var loopback = require('loopback');
 var expect = require('chai').expect;
+var query = require('./util/query');
 var JSONAPIComponent = require('../');
 var app;
 var Post;
@@ -17,30 +18,56 @@ describe('loopback json api component create method', function () {
     });
     app.model(Post);
     app.use(loopback.rest());
-    JSONAPIComponent(app);
+    JSONAPIComponent(app, { restApiRoot: '' });
   });
 
   describe('headers', function () {
+    it('POST /models should be created when Accept header is set to application/vnd.api+json', function (done) {
+      request(app).post('/posts')
+        .send({
+          data: {
+            type: 'posts',
+            attributes: {
+              title: 'my post',
+              content: 'my post content'
+            }
+          }
+        })
+        .set('Accept', 'application/vnd.api+json')
+        .set('Content-Type', 'application/json')
+        .expect(201)
+        .end(done);
+    });
     it('POST /models should have the JSON API Content-Type header set on response', function (done) {
-      //TODO: superagent/supertest breaks when trying to use JSON API Content-Type header
+      var data = {
+        data: {
+          type: 'posts',
+          attributes: {
+            title: 'my post',
+            content: 'my post content'
+          }
+        }
+      };
+
+      var options = {
+        headers: {
+          'Accept': 'application/vnd.api+json',
+          'Content-Type': 'application/vnd.api+json'
+        }
+      };
+
+      //use http module via util to make this post to check headers are working since
+      //superagent/supertest breaks when trying to use JSON API Content-Type header
       //waiting on a fix
       //see https://github.com/visionmedia/superagent/issues/753
-      //using Content-Type: application/json in the mean time.
-      //Have tested correct header using curl and all is well
-      // request(app).post('/posts')
-      //   .send({
-      //     data: {
-      //       type: 'posts',
-      //       attributes: {
-      //         title: 'my post',
-      //         content: 'my post content'
-      //       }
-      //     }
-      //   })
-      //   .set('Content-Type', 'application/vnd.api+json')
-      //   .expect('Content-Type', 'application/vnd.api+json; charset=utf-8')
-      //   .end(done);
-      done();
+      query(app).post('/posts', data, options, function (err, res) {
+        if (err) console.log(err);
+        expect(res.headers['content-type']).to.match(/application\/vnd\.api\+json/);
+        expect(res.statusCode).to.equal(201);
+        expect(res.body).to.have.all.keys('data');
+        expect(res.body.data).to.have.all.keys('type', 'id', 'links', 'attributes');
+        done();
+      });
     });
 
     it('POST /models should have the Location header set on response', function (done) {

test/util/query.js

@@ -0,0 +1,32 @@
+var http = require('http');
+
+module.exports = function (app) {
+  return {
+    post: function (path, data, options, cb) {
+      var s = app.listen(function () {
+        var req = http.request({
+          port: s.address().port,
+          path: path,
+          headers: options.headers || {},
+          method: 'POST'
+        }, function (res) {
+          res.setEncoding('utf8');
+          res.rawData = '';
+          res.on('data', function (chunk) {
+            res.rawData += chunk;
+          });
+          res.on('end', function () {
+            res.body = JSON.parse(res.rawData);
+            cb(null, res);
+          });
+        });
+        req.on('error', function (err) {
+          cb(err);
+        });
+        var postData = JSON.stringify(data || {});
+        req.write(postData);
+        req.end();
+      });
+    }
+  };
+};