Use swagger client instead of isomorphic fetch

Author: lukemorton

api/swagger.yml

@@ -13,6 +13,7 @@ produces:
 paths:
   /users/{userId}:
     get:
+      operationId: findUserById
       description: Returns user object
       parameters:
         - name: userId

lib/api/Client.ts

@@ -0,0 +1,23 @@
+import * as Swagger from 'swagger-client'
+import * as fs from 'fs'
+import * as jsYaml from 'js-yaml'
+import * as nock from 'nock'
+
+const API_HOST = process.env.API_HOST
+
+function loadSpec (): any {
+  const spec = fs.readFileSync(__dirname + '/../../api/swagger.yml', 'utf8')
+  return { ...jsYaml.safeLoad(spec), host: API_HOST }
+}
+
+export async function execute (operationId: String, parameters: any): Promise<any> {
+  const spec = loadSpec()
+  const { body } = await Swagger.execute({ spec, operationId, parameters })
+  return body
+}
+
+export function mockExecute (operationId: String, parameters: any): any {
+  const spec = loadSpec()
+  const { method, url } = Swagger.buildRequest({ spec, operationId, parameters })
+  return nock(url).intercept('', method)
+}

lib/user/HTTPUserGateway.test.ts

@@ -1,12 +1,12 @@
 import * as HTTPUserGateway from './HTTPUserGateway'
-import * as nock from 'nock'
+import { mockExecute } from '../api/Client'
 
 const API_ORIGIN = process.env.API_ORIGIN
 
 describe('HTTPUserGateway', () => {
   describe('when finding by id', () => {
     test('user has name', async () => {
-      nock(API_ORIGIN).get('/api/users/guid').reply(200, { name: 'Jim', email: '[email protected]' })
+      mockExecute('findUserById', { userId: 'guid' }).reply(200, { name: 'Jim', email: '[email protected]' })
       const user = await HTTPUserGateway.findById('guid')
       expect(user.name).toBe('Jim')
       expect(user.email).toBe('[email protected]')

lib/user/HTTPUserGateway.ts

@@ -1,10 +1,9 @@
-import 'isomorphic-fetch'
+import { execute } from '../api/Client'
 import User from './User'
 
 const API_ORIGIN = process.env.API_ORIGIN
 
-export async function findById (id: string) : Promise<User> {
-  const res = await fetch(`${API_ORIGIN}/api/users/${id}`)
-  const { name, email } = await res.json()
+export async function findById (userId: string) : Promise<User> {
+  const { name, email } = await execute('findUserById', { userId })
   return new User(name, email)
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "scripts": {
     "build:ts": "tsc -p tsconfig.production.json",
-    "build:next": "API_ORIGIN=http://localhost:8080 next build",
+    "build:next": "API_HOST=localhost:8080 next build",
     "prepare": "npm run clean && npm run build:ts && npm run build:next",
-    "start": "NODE_ENV=production API_ORIGIN=http://localhost:8080 republic lib/app.js",
-    "dev": "tsc && NODE_ENV=development API_ORIGIN=http://localhost:8080 nodemon lib/app.js --exec republic --watch lib/",
+    "start": "NODE_ENV=production API_HOST=localhost:8080 republic lib/app.js",
+    "dev": "tsc && NODE_ENV=development API_HOST=localhost:8080 nodemon lib/app.js --exec republic --watch lib/",
     "api": "cd api && make",
-    "test": "API_ORIGIN=http://api jest --notify",
+    "test": "API_HOST=api jest --notify",
     "clean": "rm -f {lib,pages,spec}/**/*.js"
   },
   "dependencies": {
@@ -15,12 +15,13 @@
     "@types/react": "^16.0",
     "body-parser": "^1.18.2",
     "express": "^4.16.2",
-    "isomorphic-fetch": "^2.2.1",
+    "js-yaml": "^3.10.0",
     "lodash.partial": "^4.2.1",
     "next": "^4.1.4",
     "react": "^16.0",
     "react-dom": "^16.0",
-    "republic": "^0.4.15"
+    "republic": "^0.4.15",
+    "swagger-client": "^3.3.3"
   },
   "devDependencies": {
     "@types/enzyme": "^3.1.4",

package.json

@@ -1,14 +1,14 @@
 import * as React from 'react'
 import { mountPage } from 'republic/test-next'
-import * as nock from 'nock'
+import { mockExecute } from '../../lib/api/Client'
 import UserProfile from './profile'
 
 const API_ORIGIN = process.env.API_ORIGIN
 
 describe('UserProfile', () => {
   describe('when user views the page', () => {
     test('user can see user name', async () => {
-      nock(API_ORIGIN).get('/api/users/guid').reply(200, { name: 'Luke' })
+      mockExecute('findUserById', { userId: 'guid' }).reply(200, { name: 'Luke' })
       const page = await mountPage(UserProfile, 'users#profile')
       expect(page).toIncludeText('Luke')
     })