aboutsummaryrefslogtreecommitdiffstats
path: root/src/api
diff options
context:
space:
mode:
authorLibravatar Vijay A <vraravam@users.noreply.github.com>2021-10-01 21:51:55 +0530
committerLibravatar Vijay A <vraravam@users.noreply.github.com>2021-10-01 21:51:55 +0530
commit204a80708e6e0a2189de16438a3eb4b57ef84987 (patch)
treea8fa3afb58dbfec67bced4281837d33fd4e71413 /src/api
parentrefactor: move 'asarRecipesPath' into 'asar-helpers' (diff)
downloadferdium-app-204a80708e6e0a2189de16438a3eb4b57ef84987.tar.gz
ferdium-app-204a80708e6e0a2189de16438a3eb4b57ef84987.tar.zst
ferdium-app-204a80708e6e0a2189de16438a3eb4b57ef84987.zip
refactor: split 'environment' into 'environment-remote' with only the remote module dependency
(might be a pre-requisite for the electron v14 upgrade)
Diffstat (limited to 'src/api')
-rw-r--r--src/api/apiBase.ts2
-rw-r--r--src/api/server/ServerApi.js9
-rw-r--r--src/api/utils/auth.js2
3 files changed, 4 insertions, 9 deletions
diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts
index 510ccb619..a30793848 100644
--- a/src/api/apiBase.ts
+++ b/src/api/apiBase.ts
@@ -1,7 +1,7 @@
1/** 1/**
2 * Get API base URL from store 2 * Get API base URL from store
3 */ 3 */
4import { API_VERSION } from '../environment'; 4import { API_VERSION } from '../environment-remote';
5import { 5import {
6 DEV_API_FRANZ_WEBSITE, 6 DEV_API_FRANZ_WEBSITE,
7 LIVE_FRANZ_API, 7 LIVE_FRANZ_API,
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index fb0d64dc3..e321f9372 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -22,13 +22,8 @@ import UserModel from '../../models/User';
22import { sleep } from '../../helpers/async-helpers'; 22import { sleep } from '../../helpers/async-helpers';
23 23
24import { SERVER_NOT_LOADED } from '../../config'; 24import { SERVER_NOT_LOADED } from '../../config';
25import { 25import { osArch, osPlatform } from '../../environment';
26 osArch, 26import { userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment-remote';
27 osPlatform,
28 userDataRecipesPath,
29 userDataPath,
30 ferdiVersion,
31} from '../../environment';
32import { asarRecipesPath } from '../../helpers/asar-helpers'; 27import { asarRecipesPath } from '../../helpers/asar-helpers';
33import apiBase from '../apiBase'; 28import apiBase from '../apiBase';
34import { prepareAuthRequest, sendAuthRequest } from '../utils/auth'; 29import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
index 527c68840..07b0c096b 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.js
@@ -1,5 +1,5 @@
1import localStorage from 'mobx-localstorage'; 1import localStorage from 'mobx-localstorage';
2import { ferdiLocale, ferdiVersion } from '../../environment'; 2import { ferdiLocale, ferdiVersion } from '../../environment-remote';
3 3
4export const prepareAuthRequest = ( 4export const prepareAuthRequest = (
5 // eslint-disable-next-line unicorn/no-object-as-default-parameter 5 // eslint-disable-next-line unicorn/no-object-as-default-parameter