Browse Source
Merge pull request #896 from valpinkman/clean/constants
clean constants for web socket urls
master
Valentin D. Pinkman
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
8 additions and
11 deletions
-
src/config/constants.js
-
src/helpers/apps/installApp.js
-
src/helpers/apps/uninstallApp.js
-
src/helpers/urls.js
|
|
|
@ -53,11 +53,8 @@ export const MANAGER_API_BASE = stringFromEnv( |
|
|
|
'MANAGER_API_BASE', |
|
|
|
'https://beta.manager.live.ledger.fr/api', |
|
|
|
) |
|
|
|
export const BASE_SOCKET_URL = stringFromEnv('BASE_SOCKET_URL', 'ws://api.ledgerwallet.com/update') |
|
|
|
export const BASE_SOCKET_URL_SECURE = stringFromEnv( |
|
|
|
'BASE_SOCKET_URL', |
|
|
|
'wss://api.ledgerwallet.com/update', |
|
|
|
) |
|
|
|
|
|
|
|
export const BASE_SOCKET_URL = stringFromEnv('BASE_SOCKET_URL', 'wss://api.ledgerwallet.com/update') |
|
|
|
|
|
|
|
// Flags
|
|
|
|
|
|
|
|
|
|
|
|
@ -2,7 +2,7 @@ |
|
|
|
import qs from 'qs' |
|
|
|
import type Transport from '@ledgerhq/hw-transport' |
|
|
|
|
|
|
|
import { BASE_SOCKET_URL_SECURE } from 'config/constants' |
|
|
|
import { BASE_SOCKET_URL } from 'config/constants' |
|
|
|
import { createDeviceSocket } from 'helpers/socket' |
|
|
|
|
|
|
|
import type { LedgerScriptParams } from 'helpers/common' |
|
|
|
@ -44,6 +44,6 @@ export default async function installApp( |
|
|
|
...app, |
|
|
|
firmwareKey: app.firmware_key, |
|
|
|
} |
|
|
|
const url = `${BASE_SOCKET_URL_SECURE}/install?${qs.stringify(params)}` |
|
|
|
const url = `${BASE_SOCKET_URL}/install?${qs.stringify(params)}` |
|
|
|
return remapError(createDeviceSocket(transport, url).toPromise()) |
|
|
|
} |
|
|
|
|
|
|
|
@ -2,7 +2,7 @@ |
|
|
|
import qs from 'qs' |
|
|
|
import type Transport from '@ledgerhq/hw-transport' |
|
|
|
|
|
|
|
import { BASE_SOCKET_URL_SECURE } from 'config/constants' |
|
|
|
import { BASE_SOCKET_URL } from 'config/constants' |
|
|
|
import { createDeviceSocket } from 'helpers/socket' |
|
|
|
|
|
|
|
import type { LedgerScriptParams } from 'helpers/common' |
|
|
|
@ -38,6 +38,6 @@ export default async function uninstallApp( |
|
|
|
firmware: app.delete, |
|
|
|
firmwareKey: app.delete_key, |
|
|
|
} |
|
|
|
const url = `${BASE_SOCKET_URL_SECURE}/install?${qs.stringify(params)}` |
|
|
|
const url = `${BASE_SOCKET_URL}/install?${qs.stringify(params)}` |
|
|
|
return remapError(createDeviceSocket(transport, url).toPromise()) |
|
|
|
} |
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
// @flow
|
|
|
|
import qs from 'qs' |
|
|
|
|
|
|
|
import { MANAGER_API_BASE, BASE_SOCKET_URL_SECURE } from 'config/constants' |
|
|
|
import { MANAGER_API_BASE, BASE_SOCKET_URL } from 'config/constants' |
|
|
|
import type { LedgerScriptParams } from 'helpers/common' |
|
|
|
|
|
|
|
const urlBuilder = (base: string) => (endpoint: string): string => `${base}/${endpoint}` |
|
|
|
@ -9,7 +9,7 @@ const urlBuilder = (base: string) => (endpoint: string): string => `${base}/${en |
|
|
|
const managerUrlbuilder = urlBuilder(MANAGER_API_BASE) |
|
|
|
|
|
|
|
const wsURLBuilder = (endpoint: string) => (params?: Object) => |
|
|
|
`${BASE_SOCKET_URL_SECURE}/${endpoint}${params ? `?${qs.stringify(params)}` : ''}` |
|
|
|
`${BASE_SOCKET_URL}/${endpoint}${params ? `?${qs.stringify(params)}` : ''}` |
|
|
|
|
|
|
|
// const wsURLBuilderProxy = (endpoint: string) => (params?: Object) =>
|
|
|
|
// `ws://manager.ledger.fr:3501/${endpoint}${params ? `?${qs.stringify(params)}` : ''}`
|
|
|
|
|
