diff options
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/announcements/api.js | 2 | ||||
-rw-r--r-- | src/features/apiBase.js | 25 | ||||
-rw-r--r-- | src/features/workspaces/api.js | 2 |
3 files changed, 2 insertions, 27 deletions
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js index 3cf90fa4a..eadb7dfce 100644 --- a/src/features/announcements/api.js +++ b/src/features/announcements/api.js | |||
@@ -1,6 +1,6 @@ | |||
1 | import { remote } from 'electron'; | 1 | import { remote } from 'electron'; |
2 | import Request from '../../stores/lib/Request'; | 2 | import Request from '../../stores/lib/Request'; |
3 | import apiBase from '../apiBase'; | 3 | import apiBase from '../../api/apiBase'; |
4 | 4 | ||
5 | const debug = require('debug')('Franz:feature:announcements:api'); | 5 | const debug = require('debug')('Franz:feature:announcements:api'); |
6 | 6 | ||
diff --git a/src/features/apiBase.js b/src/features/apiBase.js deleted file mode 100644 index d4b092995..000000000 --- a/src/features/apiBase.js +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | /** | ||
2 | * Get API base URL from store | ||
3 | */ | ||
4 | import { | ||
5 | API_VERSION, | ||
6 | API, | ||
7 | } from '../environment'; | ||
8 | |||
9 | const apiBase = () => { | ||
10 | let url; | ||
11 | if (!window.ferdi.stores.settings) { | ||
12 | // Stores have not yet been loaded - send invalid URL to force a retry when stores are loaded | ||
13 | url = 'https://localhost:9999'; | ||
14 | } else if (window.ferdi.stores.settings.all.app.server) { | ||
15 | // Load URL from store | ||
16 | url = window.ferdi.stores.settings.all.app.server; | ||
17 | } else { | ||
18 | // Use default server url | ||
19 | url = API; | ||
20 | } | ||
21 | |||
22 | return `${url}/${API_VERSION}`; | ||
23 | }; | ||
24 | |||
25 | export default apiBase; | ||
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js index 81fd6b65d..b8893363f 100644 --- a/src/features/workspaces/api.js +++ b/src/features/workspaces/api.js | |||
@@ -2,7 +2,7 @@ import { pick } from 'lodash'; | |||
2 | import { sendAuthRequest } from '../../api/utils/auth'; | 2 | import { sendAuthRequest } from '../../api/utils/auth'; |
3 | import Request from '../../stores/lib/Request'; | 3 | import Request from '../../stores/lib/Request'; |
4 | import Workspace from './models/Workspace'; | 4 | import Workspace from './models/Workspace'; |
5 | import apiBase from '../apiBase'; | 5 | import apiBase from '../../api/apiBase'; |
6 | 6 | ||
7 | const debug = require('debug')('Franz:feature:workspaces:api'); | 7 | const debug = require('debug')('Franz:feature:workspaces:api'); |
8 | 8 | ||