diff options
author | Vijay A <avijayr@protonmail.com> | 2021-08-13 08:18:13 +0530 |
---|---|---|
committer | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-08-13 07:32:56 +0000 |
commit | 5130935ad52c149837fd45e936c943223d13dfc4 (patch) | |
tree | 442283749984f39efba450981c22716c84e613a3 /src/api | |
parent | refactor: Use destructured 'import' (diff) | |
download | ferdium-app-5130935ad52c149837fd45e936c943223d13dfc4.tar.gz ferdium-app-5130935ad52c149837fd45e936c943223d13dfc4.tar.zst ferdium-app-5130935ad52c149837fd45e936c943223d13dfc4.zip |
chore: Refactoring to reuse already defined constants
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/server/ServerApi.js | 8 | ||||
-rw-r--r-- | src/api/utils/auth.js | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index bc0b0dff9..a55997b9d 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import { join } from 'path'; | 1 | import { join } from 'path'; |
2 | import tar from 'tar'; | 2 | import tar from 'tar'; |
3 | import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra'; | 3 | import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra'; |
4 | import { app, require as remoteRequire } from '@electron/remote'; | 4 | import { require as remoteRequire } from '@electron/remote'; |
5 | 5 | ||
6 | import ServiceModel from '../../models/Service'; | 6 | import ServiceModel from '../../models/Service'; |
7 | import RecipePreviewModel from '../../models/RecipePreview'; | 7 | import RecipePreviewModel from '../../models/RecipePreview'; |
@@ -13,7 +13,7 @@ import OrderModel from '../../models/Order'; | |||
13 | import { sleep } from '../../helpers/async-helpers'; | 13 | import { sleep } from '../../helpers/async-helpers'; |
14 | 14 | ||
15 | import { SERVER_NOT_LOADED } from '../../config'; | 15 | import { SERVER_NOT_LOADED } from '../../config'; |
16 | import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath } from '../../environment'; | 16 | import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment'; |
17 | import apiBase from '../apiBase'; | 17 | import apiBase from '../apiBase'; |
18 | import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; | 18 | import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; |
19 | 19 | ||
@@ -435,9 +435,7 @@ export default class ServerApi { | |||
435 | 435 | ||
436 | // News | 436 | // News |
437 | async getLatestNews() { | 437 | async getLatestNews() { |
438 | const url = `${apiBase( | 438 | const url = `${apiBase(true)}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`; |
439 | true, | ||
440 | )}/news?platform=${osPlatform}&arch=${osArch}&version=${app.getVersion()}`; | ||
441 | const request = await sendAuthRequest(url); | 439 | const request = await sendAuthRequest(url); |
442 | if (!request.ok) throw request; | 440 | if (!request.ok) throw request; |
443 | const data = await request.json(); | 441 | const data = await request.json(); |
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js index 9f718f171..e493b2962 100644 --- a/src/api/utils/auth.js +++ b/src/api/utils/auth.js | |||
@@ -1,5 +1,5 @@ | |||
1 | import { app } from '@electron/remote'; | ||
2 | import localStorage from 'mobx-localstorage'; | 1 | import localStorage from 'mobx-localstorage'; |
2 | import { ferdiLocale, ferdiVersion } from '../../environment'; | ||
3 | 3 | ||
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, { |
@@ -7,10 +7,10 @@ export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => | |||
7 | headers: { | 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': ferdiVersion, |
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': ferdiLocale, |
14 | ...options.headers, | 14 | ...options.headers, |
15 | }, | 15 | }, |
16 | }); | 16 | }); |