Merge branch 'master' of github.com:5app/digital-hub-api

5app · Mar 27, 2018 · ae5bd8d · ae5bd8d
2 parents 6c18500 + 9afe22b
commit ae5bd8d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -28,10 +28,10 @@
     "chai": "^4.1.2",
     "coveralls": "^3.0.0",
     "csv-parse": "^2.0.0",
-    "dotenv": "^4.0.0",
+    "dotenv": "^5.0.0",
     "eslint": "^4.11.0",
     "eslint-config-5app": "^0.1.0",
-    "mocha": "^4.0.1",
+    "mocha": "^5.0.0",
     "mockery": "^2.1.0",
     "nyc": "^11.3.0",
     "yamljs": "^0.3.0"

diff --git a/src/api.js b/src/api.js
@@ -83,7 +83,11 @@ module.exports = class Hub {
 
 		// Get the token
 		const access_token = await this.login()
-		extend(options, {qs: {access_token}})
+		extend(options, {
+			headers: {
+				Authorization: `Bearer ${access_token}`
+			}
+		})
 
 		// Prefix the path
 		options.path = path.join('/v2/service/', options.path)

diff --git a/test/specs/api.js b/test/specs/api.js
@@ -43,7 +43,7 @@ describe('Digital Hub API', () => {
 		expect(hub).to.be.instanceof(Hub)
 	})
 
-	it('should trigger a request and append an access_token', done => {
+	it('should trigger a request and append an auth token to the headers', done => {
 
 		const hub = new Hub({
 			tenant,
@@ -55,7 +55,7 @@ describe('Digital Hub API', () => {
 			path: '/api'
 		})
 			.then(resp => {
-				expect(resp.qs).to.have.property('access_token', 'token')
+				expect(resp.headers).to.have.property('Authorization', 'Bearer token')
 				expect(resp).to.have.property('uri', `https://${tenant}/v2/service/api`)
 				done()
 			})
@@ -135,7 +135,7 @@ describe('Digital Hub API', () => {
 			path: '/api'
 		})
 			.then(resp => {
-				expect(resp.qs).to.have.property('access_token', hub.access_token)
+				expect(resp.headers).to.have.property('Authorization', 'Bearer inst_token')
 				done()
 			})
 			.catch(done)
@@ -156,15 +156,18 @@ describe('Digital Hub API', () => {
 		hub.api({
 			path: '/api',
 			qs: {
-				json
+				json,
+				a: 1
 			}
 		})
 			.then(resp => {
 				expect(resp.qs).to.have.property('json', '{"key":"value"}')
+				expect(resp.qs).to.have.property('a', 1)
+				expect(resp.qs).to.not.have.property('token')
+				expect(resp.qs).to.not.have.property('access_token')
 				done()
 			})
 			.catch(done)
 
 	})
-
 })