From 5130935ad52c149837fd45e936c943223d13dfc4 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Fri, 13 Aug 2021 08:18:13 +0530
Subject: chore: Refactoring to reuse already defined constants

---
 src/api/server/ServerApi.js | 8 +++-----
 src/api/utils/auth.js       | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/api')

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 @@
 import { join } from 'path';
 import tar from 'tar';
 import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra';
-import { app, require as remoteRequire } from '@electron/remote';
+import { require as remoteRequire } from '@electron/remote';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
@@ -13,7 +13,7 @@ import OrderModel from '../../models/Order';
 import { sleep } from '../../helpers/async-helpers';
 
 import { SERVER_NOT_LOADED } from '../../config';
-import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath } from '../../environment';
+import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
@@ -435,9 +435,7 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `${apiBase(
-      true,
-    )}/news?platform=${osPlatform}&arch=${osArch}&version=${app.getVersion()}`;
+    const url = `${apiBase(true)}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     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 @@
-import { app } from '@electron/remote';
 import localStorage from 'mobx-localstorage';
+import { ferdiLocale, ferdiVersion } from '../../environment';
 
 export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => {
   const request = Object.assign(options, {
@@ -7,10 +7,10 @@ export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) =>
     headers: {
       'Content-Type': 'application/json',
       'X-Franz-Source': 'desktop',
-      'X-Franz-Version': app.getVersion(),
+      'X-Franz-Version': ferdiVersion,
       'X-Franz-platform': process.platform,
       'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(),
-      'X-Franz-System-Locale': app.getLocale(),
+      'X-Franz-System-Locale': ferdiLocale,
       ...options.headers,
     },
   });
-- 
cgit v1.2.3-54-g00ecf