diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-07-02 19:49:55 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-03 07:19:55 +0530 |
commit | 33123c354b79f7951423dd75097b11e7eb075f99 (patch) | |
tree | 29f6e857f02d0e0fc67d89a657a54a865ed5538a /src/api | |
parent | Minor refactoring to move all runtime configs from 'config.js' into 'environm... (diff) | |
download | ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.tar.gz ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.tar.zst ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.zip |
Upgrade various dependencies to latest part 2 (#1557)
* Upgrade various dependencies to latest, remove unnecessary electron-hunspell
- upgrade eslint and friends to latest
- remove deprecated 'node-sass' in favor of 'sass'
- disable new rules from 'eslint-config-airbnb' that are conflicting with current code style
- add workspace config for 'vscode' that silences 'experimentalDecorator' warning and forces 'prettier' to single quote
* Run yarn lint to autofix with new ruleset and worked down lint issues to zero
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/server/ServerApi.js | 4 | ||||
-rw-r--r-- | src/api/utils/auth.js | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index 75d18f234..8fdaed363 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js | |||
@@ -183,9 +183,7 @@ export default class ServerApi { | |||
183 | async createService(recipeId, data) { | 183 | async createService(recipeId, data) { |
184 | const request = await sendAuthRequest(`${apiBase()}/service`, { | 184 | const request = await sendAuthRequest(`${apiBase()}/service`, { |
185 | method: 'POST', | 185 | method: 'POST', |
186 | body: JSON.stringify(Object.assign({ | 186 | body: JSON.stringify({ recipeId, ...data }), |
187 | recipeId, | ||
188 | }, data)), | ||
189 | }); | 187 | }); |
190 | if (!request.ok) { | 188 | if (!request.ok) { |
191 | throw request; | 189 | throw request; |
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js index 5952cfe11..9f718f171 100644 --- a/src/api/utils/auth.js +++ b/src/api/utils/auth.js | |||
@@ -4,14 +4,15 @@ import localStorage from 'mobx-localstorage'; | |||
4 | export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => { | 4 | export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => { |
5 | const request = Object.assign(options, { | 5 | const request = Object.assign(options, { |
6 | mode: 'cors', | 6 | mode: 'cors', |
7 | headers: Object.assign({ | 7 | headers: { |
8 | 'Content-Type': 'application/json', | 8 | 'Content-Type': 'application/json', |
9 | 'X-Franz-Source': 'desktop', | 9 | 'X-Franz-Source': 'desktop', |
10 | 'X-Franz-Version': app.getVersion(), | 10 | 'X-Franz-Version': app.getVersion(), |
11 | 'X-Franz-platform': process.platform, | 11 | 'X-Franz-platform': process.platform, |
12 | 'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(), | 12 | 'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(), |
13 | 'X-Franz-System-Locale': app.getLocale(), | 13 | 'X-Franz-System-Locale': app.getLocale(), |
14 | }, options.headers), | 14 | ...options.headers, |
15 | }, | ||
15 | }); | 16 | }); |
16 | 17 | ||
17 | if (auth) { | 18 | if (auth) { |