Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-22 00:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate LocalSyncRoot

Browse source
This commit is contained in:
Evan Morikawa 2016-11-28 15:44:36 -08:00
parent e1f1c23626
commit a2e3c98d84
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/chaos-monkey.coffee
View file

@ -7,9 +7,9 @@ class ChaosMonkey
errorCode ?= 500
numMonkeys ?= "all the monkeys"
makeTimeout ?= false
nGet = nock(NylasAPI.LocalSyncRoot)
nPut = nock(NylasAPI.LocalSyncRoot)
nPost = nock(NylasAPI.LocalSyncRoot)
nGet = nock(NylasAPI.APIRoot)
nPut = nock(NylasAPI.APIRoot)
nPost = nock(NylasAPI.APIRoot)
numTimes = 1
if numMonkeys.toLowerCase() is "all the monkeys"

2
src/flux/nylas-api-request.es6
View file

@ -12,7 +12,7 @@ import NylasAPI from './nylas-api'
export default class NylasAPIRequest {
constructor(api, options) {
const defaults = {
url: `${options.APIRoot || options.LocalSyncRoot || api.APIRoot || api.LocalSyncRoot}${options.path}`,
url: `${options.APIRoot || api.APIRoot}${options.path}`,
method: 'GET',
json: true,
timeout: 15000,

4
src/flux/nylas-api.coffee
View file

@ -56,7 +56,7 @@ class NylasAPI
constructor: ->
@_lockTracker = new NylasAPIChangeLockTracker()
@LocalSyncRoot = 'http://localhost:2578'
@APIRoot = "http://localhost:2578"
# Delegates to node's request object.
# On success, it will call the passed in success callback with options.
@ -79,8 +79,6 @@ class NylasAPI
return Promise.resolve()
NylasAPIRequest ?= require('./nylas-api-request').default
options.APIRoot = @LocalSyncRoot
req = new NylasAPIRequest(@, options)
success = (body) =>

4
src/flux/nylas-long-connection.es6
View file

@ -115,11 +115,11 @@ class NylasLongConnection {
throw new Error(`Can't establish NylasLongConnection: No account token available for account ${this._accountId}`)
}
const options = url.parse(`${this._api.LocalSyncRoot}${this._path}`)
const options = url.parse(`${this._api.APIRoot}${this._path}`)
options.auth = `${accountToken}:${identityToken}`
let lib;
if (this._api.LocalSyncRoot.indexOf('https') === -1) {
if (this._api.APIRoot.indexOf('https') === -1) {
lib = require('http')
} else {
lib = require('https')