Merge pull request #19 from deskbookers/develop

v1.3.1

Author: izolate

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.3.1 - 2017-04-25
+### Fixed
+- `POST` request bug
+
 ## 1.3.0 - 2017-04-19
 ### Changed
 - Added `backoffice` parameter to `account.login`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deskbookers",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Deskbookers API JavaScript SDK",
   "main": "dist/index.js",
   "scripts": {

src/resources/Account.js

@@ -2,10 +2,6 @@ import Resource from './Resource'
 import bcrypt from 'bcryptjs'
 
 export default class Account extends Resource {
-  constructor (api) {
-    super(api)
-  }
-
   async retrieveSalt (email) {
     return await this.request({
       method: 'GET',
@@ -86,7 +82,7 @@ export default class Account extends Resource {
       email,
       name: fullName,
       first_name: firstName,
-      lastName,
+      lastName
     } = result.user
 
     return {

src/resources/Cart.js

@@ -102,8 +102,8 @@ export default class Cart extends Resource {
       params: {
         group: this.getGroup(),
         voucherCode: this.getVoucherCode(),
-        ignoreBooking: ignoreBooking && ignoreBooking.id || null,
-        action: ignoreBooking && ignoreBooking.action || null,
+        ignoreBooking: (ignoreBooking && ignoreBooking.id) || null,
+        action: (ignoreBooking && ignoreBooking.action) || null,
         batch
       }
     })
@@ -341,5 +341,5 @@ export const normalizeDate = (date) => date ? moment(date) : null
 
 export const unix = (date) => {
   const normalized = normalizeDate(date)
-  return normalized && normalized.unix() || null
+  return (normalized && normalized.unix()) || null
 }

src/resources/Resource.js

@@ -19,6 +19,7 @@ export default class Resource {
     mode = 'cors',
     credentials = 'include'
   }) {
+    method = method.toUpperCase()
     const options = {
       mode,
       credentials,
@@ -31,11 +32,11 @@ export default class Resource {
       __fields: fields,
       ...params
     }
-    const queryStr = formatArgs(args, options.method === 'post')
+    const queryStr = formatArgs(args, options.method === 'POST')
     const pathFixed = path.replace(/^\/+|\/+$/, '')
 
     let url
-    if (options.method === 'post') {
+    if (options.method === 'POST') {
       options.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
       options.body = queryStr
       url = `${this.apiUrl}/${pathFixed}`
@@ -69,27 +70,24 @@ export default class Resource {
     // If "data" exists in response
     if (dataProp) {
       return dataProp
-    }
 
     // If "result" exists in response
-    else if (result) {
+    } else if (result) {
       const { errors } = result
       if (errors) {
         for (let error in errors) {
           throw new Error(errors[error])
         }
       }
       return result
-    }
 
     // If "error" exists in response
-    else if (error) {
+    } else if (error) {
       const msg = data.errorMessage || 'An error occurred'
       throw new Error(msg)
-    }
 
     // If "errors" exists in response
-    else if (errors) {
+    } else if (errors) {
       for (let error in errors) {
         const msg = errors[error].title || errors[error].detail
         throw new Error(msg)

test/account.js

@@ -52,6 +52,6 @@ test('Logout', async t => {
 
 test('Retrieve', async t => {
   t.throws(deskbookers.account.retrieve())
-  const login = await deskbookers.account.login(LOGIN_EMAIL, LOGIN_PASSWORD)
+  await deskbookers.account.login(LOGIN_EMAIL, LOGIN_PASSWORD)
   t.notThrows(deskbookers.account.retrieve())
 })

test/cart.js

@@ -14,7 +14,7 @@ const deskbookers = new Deskbookers({
 test('Test cart availability', async t => {
   const cart = await prepareCart(t)
 
-  t.true(deskbookers.cart.available())
+  t.true(cart.available())
 
   // TODO: test more
 })
@@ -39,7 +39,7 @@ const prepareCart = async (t) => {
 
     return deskbookers.cart
   } catch (e) {
-    t.fail(`Error while preparing cart: ${e && e.message || 'Exception occurred'}`)
+    t.fail(`Error while preparing cart: ${(e && e.message) || 'Exception occurred'}`)
     return deskbookers.cart
   }
 }

test/index.js

@@ -2,10 +2,8 @@ import dotenv from 'dotenv'
 import 'fetch-everywhere'
 import test from 'ava'
 import Deskbookers from '../src'
-import moment from 'moment'
 dotenv.load()
 
-
 // Shopping cart
 test('Initialise', async t => {
   const deskbookers = new Deskbookers({

test/workplaces.js

@@ -19,7 +19,7 @@ test('Urgency', async t => {
   const request = [
     { type: 'bookings', start, end },
     { type: 'visitors', start, end },
-    { type: 'visitors', city: 'amsterdam', start, end },
+    { type: 'visitors', city: 'amsterdam', start, end }
   ]
 
   const response = await deskbookers.workplaces.urgency(17657, request)