Merge pull request #25 from deskbookers/revert-24-ft-744-store-user-language

Revert "feat: add setLanguage / setTimezone functions"

Author: izolate

README.md

@@ -43,8 +43,6 @@ for (let workplace of workplaces) {
   * [`retrieve()`](docs/account.md#retrieve)
   * [`contexts(params)`](docs/account.md#contextsparams)
   * [`menu(context)`](docs/account.md#menucontext)
-  * [`setLanguage(language)`](docs/account.md#setlanguagelanguage)
-  * [`setTimezone(timezone)`](docs/account.md#settimezonetimezone)
 * workplaces
   * [`urgency(id, params)`](docs/workplaces.md#urgencyid-params)
 * events

docs/account.md

@@ -204,37 +204,3 @@ context | String | Context code | Yes
   }]
 }
 ```
-
-## `setLanguage(language)`
-Store user language.
-
-```js
-await deskbookers.account.setLanguage('en-gb')
-```
-
-### Arguments
-Name | Type | Description | Required
---- | --- | --- | ---
-language | String | Language code | Yes
-
-### Example response
-```json
-true
-```
-
-## `setTimezone(timezone)`
-Store user timezone.
-
-```js
-await deskbookers.account.setTimezone('Europe/Amsterdam')
-```
-
-### Arguments
-Name | Type | Description | Required
---- | --- | --- | ---
-timezone | String | Timezone | Yes
-
-### Example response
-```json
-true
-```

src/DeskbookersError.js renamed to src/Error.js

@@ -1,6 +1,7 @@
 export default class DeskbookersError extends Error {
   constructor (message) {
-    super(message)
-    this.name = 'DeskbookersError'
+    super()
+    this.type = 'DeskbookersError'
+    this.message = message
   }
 }

src/InvalidResponseError.js

@@ -136,26 +136,6 @@ export default class Account extends Resource {
     }
   }
 
-  async setLanguage (language) {
-    return await this.request({
-      method: 'POST',
-      path: 'user/language',
-      params: {
-        lang: language
-      }
-    })
-  }
-
-  async setTimezone (timezone) {
-    return await this.request({
-      method: 'POST',
-      path: 'user/timezone',
-      params: {
-        timezone
-      }
-    })
-  }
-
   async contexts ({ ...params } = {}) {
     return await this.request({
       method: 'GET',

src/resources/Account.js

@@ -1,5 +1,4 @@
 import Resource from './Resource'
-import DeskbookersError from '../DeskbookersError'
 
 export default class Events extends Resource {
   constructor (api) {
@@ -15,7 +14,7 @@ export default class Events extends Resource {
 
   async retrieve (tabId = null, limit = 10) {
     if (!tabId) {
-      throw new DeskbookersError('No tab id')
+      throw new Error('No tab id')
     }
 
     const events = await this.request({
@@ -24,7 +23,7 @@ export default class Events extends Resource {
     })
 
     if (!events.length) {
-      throw new DeskbookersError('No events')
+      throw new Error('No events')
     }
 
     // Get most recent event id

src/resources/Events.js

@@ -1,6 +1,4 @@
 import { signer, formatArgs } from '../utils/requests'
-import DeskbookersError from '../DeskbookersError'
-import InvalidResponseError from '../InvalidResponseError'
 
 export default class Resource {
   constructor (api) {
@@ -60,15 +58,7 @@ export default class Resource {
   }
 
   async parseResponse (response) {
-    // In case of an incorrect response we want to know that the raw response
-    // was. Because of this we can't use response.json()
-    let text = await response.text()
-    let data
-    try {
-      data = JSON.parse(text)
-    } catch (e) {
-      throw new InvalidResponseError(text)
-    }
+    const data = await response.json()
 
     const {
       data: dataProp,
@@ -86,26 +76,26 @@ export default class Resource {
       const { errors } = result
       if (errors) {
         for (let error in errors) {
-          throw new DeskbookersError(errors[error])
+          throw new Error(errors[error])
         }
       }
       return result
 
     // If "error" exists in response
     } else if (error) {
       const msg = data.errorMessage || 'An error occurred'
-      throw new DeskbookersError(msg)
+      throw new Error(msg)
 
     // If "errors" exists in response
     } else if (errors) {
       for (let error in errors) {
         const msg = errors[error].title || errors[error].detail
-        throw new DeskbookersError(msg)
+        throw new Error(msg)
       }
     }
 
     // Reject
-    throw new DeskbookersError('Invalid response received')
+    throw new Error('Invalid response received')
   }
 
   prepareRequest (url, options, args) {

src/resources/Resource.js

@@ -1,5 +1,4 @@
 import Resource from './Resource'
-import DeskbookersError from '../DeskbookersError'
 
 export default class Workplaces extends Resource {
   constructor (api) {
@@ -18,6 +17,7 @@ export default class Workplaces extends Resource {
   async list (params) {
     // Build query from params
     // if Location, etc.
+
     return await this.request({
       method: 'GET',
       path: '/search/results',
@@ -32,9 +32,7 @@ export default class Workplaces extends Resource {
     if (!isArray && typeof params === 'object') {
       params = [ params ]
     } else if (!isArray) {
-      throw new DeskbookersError(
-        'Parameters must be an Object or Array'
-      )
+      throw new Error('Parameters must be an Object or Array')
     }
 
     return await this.request({

src/resources/Workplaces.js

@@ -5,87 +5,53 @@ import Deskbookers from '../src'
 import faker from 'faker'
 dotenv.load()
 
+const deskbookers = new Deskbookers({
+  https: process.env.API_HTTPS === 'true',
+  host: process.env.API_HOST
+})
+
 const {
   LOGIN_EMAIL,
   LOGIN_PASSWORD
 } = process.env
 
-function client () {
-  return new Deskbookers({
-    https: process.env.API_HTTPS === 'true',
-    host: process.env.API_HOST
-  })
-}
-
-async function login (t, deskbookers, dbg) {
-  const user = await deskbookers.account.login(
-    LOGIN_EMAIL,
-    LOGIN_PASSWORD
-  )
-
-  t.truthy(deskbookers.session)
-
-  return user
-}
-
 test('Login', async t => {
-  const user = await login(t, client(), 'Login')
-
-  t.truthy(user.id)
+  const login = await deskbookers.account.login(LOGIN_EMAIL, LOGIN_PASSWORD)
+  t.truthy(login.id)
 })
 
 test('Signup', async t => {
-  const signup = await client().account.signup({
+  const signup = await deskbookers.account.signup({
     firstName: faker.name.firstName(),
     lastName: faker.name.lastName(),
     email: faker.internet.email(),
     password: 'p4ssw0rd'
   })
-
   t.truthy(signup.id)
 })
 
 test('Forgot', async t => {
-  const forgot = await client().account.forgot(faker.internet.email())
+  const forgot = await deskbookers.account.forgot(faker.internet.email())
 
   t.truthy(forgot)
 })
 
 test('Logout', async t => {
-  const deskbookers = client()
-  await login(t, deskbookers, 'Logout')
+  // Login and store session
+  await deskbookers.account.login(
+    process.env.LOGIN_EMAIL,
+    process.env.LOGIN_PASSWORD
+  )
 
   t.truthy(deskbookers.session)
 
   // Logout
   await deskbookers.account.logout()
-
   t.is(deskbookers.session, null)
 })
 
 test('Retrieve', async t => {
-  const deskbookers = client()
-
-  // Should fail whilte logged out
   t.throws(deskbookers.account.retrieve())
-
-  await login(t, deskbookers, 'Retrieve')
-
-  // Should succeed while logged in
+  await deskbookers.account.login(LOGIN_EMAIL, LOGIN_PASSWORD)
   t.notThrows(deskbookers.account.retrieve())
 })
-
-test('Set language', async t => {
-  // Login
-  const deskbookers = client()
-  await login(t, deskbookers, 'Set language')
-
-  // Set language test
-  for (let language of ['en-gb']) { // 'en-gb', 'nl-nl', 'de-de']) {
-    const result = await deskbookers.account.setLanguage(language)
-    const user = await deskbookers.account.retrieve()
-
-    t.truthy(result)
-    t.is(user.language, language)
-  }
-})

test/account.js

@@ -4,16 +4,12 @@ import test from 'ava'
 import Deskbookers from '../src'
 dotenv.load()
 
-function client () {
-  return new Deskbookers({
-    https: process.env.API_HTTPS === 'true',
-    host: process.env.API_HOST
-  })
-}
+const deskbookers = new Deskbookers({
+  https: process.env.API_HTTPS === 'true',
+  host: process.env.API_HOST
+})
 
 test('Unread count', async t => {
-  const deskbookers = client()
-
   await deskbookers.account.login(
     process.env.LOGIN_EMAIL,
     process.env.LOGIN_PASSWORD
@@ -24,8 +20,6 @@ test('Unread count', async t => {
 })
 
 test('Events', async t => {
-  const deskbookers = client()
-
   await deskbookers.account.login(
     process.env.LOGIN_EMAIL,
     process.env.LOGIN_PASSWORD
@@ -42,8 +36,6 @@ test('Events', async t => {
 })
 
 test('Can retrieve first page containing all events', async t => {
-  const deskbookers = client()
-
   await deskbookers.account.login(
     process.env.LOGIN_EMAIL,
     process.env.LOGIN_PASSWORD
@@ -55,8 +47,6 @@ test('Can retrieve first page containing all events', async t => {
 })
 
 test('Can mark all events as read', async t => {
-  const deskbookers = client()
-
   await deskbookers.account.login(
     process.env.LOGIN_EMAIL,
     process.env.LOGIN_PASSWORD
@@ -66,3 +56,4 @@ test('Can mark all events as read', async t => {
 
   t.truthy(res)
 })
+