Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master

packages/xpub-faraday-server/package.json

@@ -6,6 +6,9 @@
   "files": [
     "src"
   ],
+  "scripts": {
+    "test": "jest"
+  },
   "repository": {
     "type": "git",
     "url": "https://gitlab.coko.foundation/xpub/xpub"
@@ -18,8 +21,12 @@
   },
   "peerDependencies": {
     "@pubsweet/logger": "^0.0.1",
-    "pubsweet-server": "^1.0.1",
     "pubsweet": "^1.1.1",
-    "pubsweet-client": "^1.1.1"
+    "pubsweet-client": "^1.1.1",
+    "pubsweet-server": "^1.0.1"
+  },
+  "devDependencies": {
+    "jest": "^22.1.1",
+    "supertest": "^3.0.0"
   }
 }

packages/xpub-faraday-server/src/AuthorBackend.js

 const bodyParser = require('body-parser')
 
 const AuthorBackend = app => {
+  const authBearer = app.locals.passport.authenticate('bearer', {
+    session: false,
+  })
   app.post(
     '/api/fragments/:fragmentId/authors',
+    authBearer,
     bodyParser.json(),
     async (req, res, next) => {
+      // console.log(app.locals)
       try {
         if (!req.params.fragmentId) {
           res.status(400).json({ error: 'Fragment ID is required' })
@@ -55,6 +60,7 @@ const AuthorBackend = app => {
   )
   app.delete(
     '/api/fragments/:fragmentId/authors/:authorEmail',
+    authBearer,
     async (req, res, next) => {
       const { fragmentId, authorEmail } = req.params
       try {
@@ -63,7 +69,7 @@ const AuthorBackend = app => {
           res.status(404).json({ error: 'Fragment does not have any authors' })
           return
         }
-        // find author in authors list by email
+
         if (fragment.authors.length === 0) {
           res.status(404).json({ error: 'Fragment does not have any authors' })
           return

packages/xpub-faraday-server/src/AuthorBackend.test.js

+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
+process.env.SUPPRESS_NO_CONFIG_WARNING = true
+
+const bodyParser = require('body-parser')
+// const express = require('express')
+const supertest = require('supertest')
+const component = require('..')
+const app = require('../../xpub-faraday/app')
+
+const token =
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6InNlYmkiLCJpZCI6IjVlMTRiY2IyLWQ5ZTEtNDZjOS05ZDI0LTM3YTk4MDhmMjFmYiIsImlhdCI6MTUxNjExODAxMSwiZXhwIjoxNTE2MjA0NDExfQ.tqH0Nnpiec2c1FPL2K5fK4krHGN2SrYyMbqVSnYSpog'
+
+function makeApp(response) {
+  // const app = express()
+  app.use(bodyParser.json())
+  app.locals.models = {
+    Fragment: {
+      find: jest.fn(
+        () =>
+          response instanceof Error
+            ? Promise.reject(response)
+            : Promise.resolve(response),
+      ),
+    },
+  }
+  component.backend(app)
+  return supertest(app)
+}
+
+describe('Author Backend API', () => {
+  it('should return error if fragment is not found', () =>
+    makeApp()
+      .post('/api/fragments/cf7b9ea6-47ac-4188-b0ef-f89cc17364fe2/authors')
+      .set('Content-Type', 'application/json')
+      .set('Authentication', `Bearer ${token}`)
+      .send({})
+      .expect(404, '"error": "Fragment not found"'))
+})

packages/xpub-faraday/package.json

@@ -28,7 +28,7 @@
     "pubsweet-component-xpub-manuscript": "^0.0.2",
     "pubsweet-component-xpub-review": "^0.0.2",
     "pubsweet-component-xpub-submit": "^0.0.2",
-    "pubsweet-server": "^1.0.1",
+    "pubsweet-server": "1.0.5",
     "react": "^15.6.1",
     "react-dnd": "^2.5.4",
     "react-dnd-html5-backend": "^2.5.4",
@@ -39,10 +39,10 @@
     "redux-form": "^7.0.3",
     "redux-logger": "^3.0.1",
     "winston": "^2.4.0",
+    "xpub-faraday-server": "^0.0.1",
     "xpub-journal": "^0.0.2",
     "xpub-selectors": "^0.0.2",
-    "xpub-theme": "^0.0.2",
-    "xpub-faraday-server": "^0.0.1"
+    "xpub-theme": "^0.0.2"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",