Merge pull request #4 from bytewitchcraft/feature/pass-headers-throgh…

…-middlware

added passing headers from context

.babelrc

@@ -0,0 +1,6 @@
+{
+  "presets": ["env"],
+  "plugins": [
+    "transform-object-rest-spread"
+  ]
+}

.eslintrc

@@ -1,4 +1,5 @@
 {
+  "parser": "babel-eslint",
   "plugins": [
     "prettier"
   ],

package.json

@@ -6,6 +6,9 @@
   "repository": "https://github.com/bytewitchcraft/apollo-absinthe-upload-link",
   "author": "Ihor Katkov",
   "license": "MIT",
+  "scripts": {
+    "test": "jest"
+  },
   "dependencies": {
     "apollo-client": "^2.0.4",
     "apollo-link": "^1.0.7",
@@ -15,8 +18,15 @@
     "rxjs": "5.4.3"
   },
   "devDependencies": {
+    "babel-core": "^6.26.0",
+    "babel-eslint": "^8.2.1",
+    "babel-jest": "^22.2.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
     "eslint": "^4.14.0",
     "eslint-plugin-prettier": "^2.4.0",
-    "prettier": "1.9.2"
+    "jest": "^22.2.1",
+    "prettier": "1.9.2",
+    "regenerator-runtime": "^0.11.1"
   }
 }

src/__mocks__/extractFiles.js

@@ -0,0 +1 @@
+export default () => ({ variables: {}, files: [{ file: {}, name: 'file' }] })

src/__mocks__/request.js

@@ -0,0 +1,6 @@
+export default jest.fn(opts => ({
+  url: opts.url,
+  method: 'POST',
+  body: opts.body,
+  headers: opts.headers,
+}))

src/__tests__/index.test.js

@@ -0,0 +1,50 @@
+import { createUploadMiddleware } from '../index'
+
+jest.mock('../request')
+jest.mock('../extractFiles')
+
+const generateOperations = (context = { headers: {} }) => ({
+  variables: {},
+  getContext: () => context,
+})
+
+describe('#createUploadMiddleware', () => {
+  it('should pass headers from context', () => {
+    const { request } = createUploadMiddleware({ uri: 'http://example.com' })
+    const headers = { authorization: '1234' }
+    const operations = generateOperations({ headers })
+    const forward = jest.fn()
+
+    const result = request(operations, forward)
+
+    expect(forward).toHaveBeenCalledTimes(0)
+    expect(result.headers).toEqual(headers)
+  })
+  it('should pass headers from options', () => {
+    const headers = { authorization: '1234' }
+    const { request } = createUploadMiddleware({
+      uri: 'http://example.com',
+      headers,
+    })
+    const operations = generateOperations()
+    const forward = jest.fn()
+
+    const result = request(operations, forward)
+
+    expect(result.headers).toEqual(headers)
+  })
+  it('should combine headers from options and context', () => {
+    const optionsHeaders = { 'x-spree-token': 'token' }
+    const contextHeaders = { authorization: '1234' }
+    const { request } = createUploadMiddleware({
+      uri: 'http://example.com',
+      headers: optionsHeaders,
+    })
+    const operations = generateOperations({ headers: contextHeaders })
+    const forward = jest.fn()
+
+    const result = request(operations, forward)
+
+    expect(result.headers).toEqual({ ...contextHeaders, ...optionsHeaders })
+  })
+})

src/extractFiles.js

@@ -0,0 +1,33 @@
+import { pipe, append, join } from 'ramda'
+import { isFileList, isObject, isUploadFile } from './validators'
+
+const extractFiles = variables => {
+  const files = []
+  const walkTree = (tree, path = []) => {
+    const mapped = Array.isArray(tree) ? tree : Object.assign({}, tree)
+    Object.keys(mapped).forEach(key => {
+      const value = mapped[key]
+      const name = pipe(append(key), join('.'))(path)
+
+      if (isUploadFile(value) || isFileList(value)) {
+        const file = isFileList(value)
+          ? Array.prototype.slice.call(value)
+          : value
+
+        files.push({ file, name })
+        mapped[key] = name
+      } else if (isObject(value)) {
+        mapped[key] = walkTree(value, name)
+      }
+    })
+
+    return mapped
+  }
+
+  return {
+    files,
+    variables: walkTree(variables),
+  }
+}
+
+export default extractFiles

src/index.js

@@ -1,64 +1,28 @@
 import { HttpLink } from 'apollo-link-http'
 import { ApolloLink, concat } from 'apollo-link'
 import { printAST } from 'apollo-client'
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/dom/ajax';
-import 'rxjs/add/operator/map';
-import { pipe, append, join } from 'ramda'
+import request from './request'
+import extractFiles from './extractFiles'
+import { isObject } from './validators'
 
-const isObject = value => value !== null && typeof value === 'object'
-
-const isFileList = value =>
-  typeof FileList !== 'undefined' && value instanceof FileList
-
-const isUploadFile = value =>
-  typeof File !== 'undefined' && value instanceof File
-
-const extractFiles = variables => {
-  const files = []
-  const walkTree = (tree, path = []) => {
-    const mapped = Array.isArray(tree) ? tree : Object.assign({}, tree)
-    Object.keys(mapped).forEach(key => {
-      const value = mapped[key]
-      const name = pipe(append(key), join('.'))(path)
-
-      if (isUploadFile(value) || isFileList(value)) {
-        const file = isFileList(value)
-          ? Array.prototype.slice.call(value)
-          : value
-
-        files.push({ file, name })
-        mapped[key] = name
-      } else if (isObject(value)) {
-        mapped[key] = walkTree(value, name)
-      }
-    })
-
-    return mapped
-  }
-
-  return {
-    files,
-    variables: walkTree(variables),
-  }
-}
-
-const createUploadMiddleware = ({ uri }) =>
+export const createUploadMiddleware = ({ uri, headers }) =>
   new ApolloLink((operation, forward) => {
     if (typeof FormData !== 'undefined' && isObject(operation.variables)) {
       const { variables, files } = extractFiles(operation.variables)
 
       if (files.length > 0) {
+        const { headers: contextHeaders } = operation.getContext()
         const formData = new FormData()
+
         formData.append('query', printAST(operation.query))
         formData.append('variables', JSON.stringify(variables))
         files.forEach(({ name, file }) => formData.append(name, file))
 
-        return Observable.ajax({
-          url: uri,
+        return request({
+          uri,
           body: formData,
-          method: 'POST',
-        }).map(({ response }) => response)
+          headers: { ...contextHeaders, ...headers },
+        })
       }
     }
 

src/request.js

@@ -0,0 +1,18 @@
+import { Observable } from 'rxjs/Observable'
+import 'rxjs/add/observable/dom/ajax'
+import 'rxjs/add/operator/map'
+
+/**
+ * Request function
+ *
+ * @param {Object} opts
+ */
+const request = opts =>
+  Observable.ajax({
+    url: opts.uri,
+    body: opts.body,
+    method: 'POST',
+    headers: opts.headers,
+  }).map(({ response }) => response)
+
+export default request

src/validators.js

@@ -0,0 +1,6 @@
+export const isObject = value => value !== null && typeof value === 'object'
+export const isFileList = value =>
+  typeof FileList !== 'undefined' && value instanceof FileList
+
+export const isUploadFile = value =>
+  typeof File !== 'undefined' && value instanceof File