Skip to content

Fix for empty method when making s.post #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkucharz merged 2 commits into from
Jan 30, 2018
Merged

Fix for empty method when making s.post #113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b88353d
fix(client): empty method when making `s.post`
mkucharz Jan 30, 2018
5dd2b91
style()
mkucharz Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions packages/lib-js-client/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import querystring from 'querystring'
import fetch from 'axios'

function SyncanoClient (instanceName = required('instanceName'), options = {}) {
function SyncanoClient(instanceName = required('instanceName'), options = {}) {
const host = options.host || 'syncano.space'
const DEFAULT_HEADERS = {'Content-Type': 'application/json'}

Expand All @@ -13,25 +13,26 @@ function SyncanoClient (instanceName = required('instanceName'), options = {}) {
client.headers = headers => Object.assign({}, DEFAULT_HEADERS, headers)
client.post = client

client.login = function (username, password) {
client.login = function(username, password) {
const login = this.loginMethod
? this.loginMethod
: (username, password) => {
const url = `https://api.syncano.io/v2/instances/${this
.instanceName}/users/auth/`
const data = JSON.stringify({username, password})
const url = `https://api.syncano.io/v2/instances/${
this.instanceName
}/users/auth/`
const data = JSON.stringify({username, password})

return fetch({url, data}).then(user => {
this.setToken(user.token)
return fetch({url, data}).then(user => {
this.setToken(user.token)

return user
})
}
return user
})
}

return login(username, password)
}

client.url = function (endpoint, data) {
client.url = function(endpoint, data) {
let url = `${this.baseUrl}${endpoint}/?`

if (data) {
Expand All @@ -45,43 +46,43 @@ function SyncanoClient (instanceName = required('instanceName'), options = {}) {
return url
}

client.logout = function () {
client.logout = function() {
this.token = undefined
}

client.setToken = function (token) {
client.setToken = function(token) {
this.token = token

if (typeof client.setTokenCallback === 'function') {
client.setTokenCallback(token)
}
}

client.get = function (
client.get = function(
endpoint = required('endpoint'),
data = {},
options = {}
) {
return this.post(endpoint, {...data, _method: 'GET'}, options)
}

client.delete = function (
client.delete = function(
endpoint = required('endpoint'),
data = {},
options = {}
) {
return this.post(endpoint, {...data, _method: 'DELETE'}, options)
}

client.put = function (
client.put = function(
endpoint = required('endpoint'),
data = {},
options = {}
) {
return this.post(endpoint, {...data, _method: 'PUT'}, options)
}

client.patch = function (
client.patch = function(
endpoint = required('endpoint'),
data = {},
options = {}
Expand All @@ -90,7 +91,7 @@ function SyncanoClient (instanceName = required('instanceName'), options = {}) {
}

// Used by the client.subscribe method to start polling from the correct id
client.setLastId = function (endpoint, data) {
client.setLastId = function(endpoint, data) {
const url = this.url(`${endpoint}/history`, data)
// eslint-disable-next-line camelcase
if (data.last_id) {
Expand All @@ -103,7 +104,7 @@ function SyncanoClient (instanceName = required('instanceName'), options = {}) {
})
}

client.subscribe = function (endpoint = required('endpoint'), data, callback) {
client.subscribe = function(endpoint = required('endpoint'), data, callback) {
let abort = false
const hasData = typeof data === 'object' && data !== null
const options = {
Expand All @@ -115,7 +116,7 @@ function SyncanoClient (instanceName = required('instanceName'), options = {}) {
let url = this.url(endpoint, data)
const cb = hasData ? callback : data

function loop () {
function loop() {
if (abort) {
return
}
Expand Down Expand Up @@ -152,7 +153,7 @@ function SyncanoClient (instanceName = required('instanceName'), options = {}) {
}
}

client.subscribe.once = function (
client.subscribe.once = function(
endpoint = required('endpoint'),
data = {},
callback
Expand All @@ -171,12 +172,12 @@ function SyncanoClient (instanceName = required('instanceName'), options = {}) {

return client

function client (endpoint = required('endpoint'), data = {}, options = {}) {
function client(endpoint = required('endpoint'), data = {}, options = {}) {
const url = this.url(endpoint)
const headers = this.headers(options.headers)

const transformRequest = [
function (data) {
function(data) {
if (data instanceof window.FormData) {
return data
}
Expand All @@ -186,18 +187,17 @@ function SyncanoClient (instanceName = required('instanceName'), options = {}) {
]

return fetch({
method: data._method,
method: data._method || 'POST',
url,
data: data._method !== 'POST' ? {params: data} : data,
headers,
transformRequest,
...options
})
.then(response => response.data)
}).then(response => response.data)
}
}

function required (param) {
function required(param) {
throw new Error(`${param} parameter is required by SyncanoClient`)
}

Expand Down