Reused commonly defined method for 'apiBase'

4 files changed, 10 insertions, 8 deletions

diff --git a/src/api/apiBase.js b/src/api/apiBase.js
index 85dd0f3df..842c85e56 100644
--- a/src/api/apiBase.js
+++ b/src/api/apiBase.js
@@ -18,7 +18,8 @@ const apiBase = (withVersion = true) => {
     || !window.ferdi.stores.settings.all.app.server) {
     // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
     return SERVER_NOT_LOADED;
-  } if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
+  }
+  if (window.ferdi.stores.settings.all.app.server === LOCAL_SERVER) {
     // Use URL for local server
     url = `http://127.0.0.1:${window.ferdi.stores.requests.localServerPort}`;
   } else {
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 5fd5268ce..5365f9dbe 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -457,7 +457,7 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `https://api.getferdi.com/v1/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
+    const url = `${apiBase(true)}/news?platform=${os.platform()}&arch=${os.arch()}&version=${app.getVersion()}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
@@ -467,7 +467,7 @@ export default class ServerApi {
   }
 
   async hideNews(id) {
-    const request = await sendAuthRequest(`https://api.getferdi.com/v1/news/${id}/read`);
+    const request = await sendAuthRequest(`${apiBase(true)}/news/${id}/read`);
     if (!request.ok) throw request;
     debug('ServerApi::hideNews resolves', id);
   }
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index 2ab5a15b2..2c4d11d05 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,5 +1,6 @@
 import { app } from '@electron/remote';
 import Request from '../../stores/lib/Request';
+import apiBase from '../../api/apiBase';
 
 const debug = require('debug')('Ferdi:feature:announcements:api');
 
@@ -10,8 +11,8 @@ export const announcementsApi = {
   },
 
   async getChangelog(version) {
-    debug('fetching release changelog from Github');
     const url = `https://api.github.com/repos/getferdi/ferdi/releases/tags/v${version}`;
+    debug(`fetching release changelog from Github url: ${url}`);
     const request = await window.fetch(url, { method: 'GET' });
     if (!request.ok) return null;
     const data = await request.json();
@@ -19,8 +20,8 @@ export const announcementsApi = {
   },
 
   async getAnnouncement(version) {
-    debug('fetching release announcement from api');
-    const url = `https://api.getferdi.com/v1/announcements/${version}`;
+    const url = `${apiBase(true)}/announcements/${version}`;
+    debug(`fetching release announcement from api url: ${url}`);
     const response = await window.fetch(url, { method: 'GET' });
     if (!response.ok) return null;
     return response.json();
diff --git a/src/features/planSelection/api.js b/src/features/planSelection/api.js
index 65e6c2e82..16bf9ff2d 100644
--- a/src/features/planSelection/api.js
+++ b/src/features/planSelection/api.js
@@ -1,12 +1,12 @@
 import { sendAuthRequest } from '../../api/utils/auth';
-import { API, API_VERSION } from '../../environment';
 import Request from '../../stores/lib/Request';
+import apiBase from '../../api/apiBase';
 
 const debug = require('debug')('Ferdi:feature:planSelection:api');
 
 export const planSelectionApi = {
   downgrade: async () => {
-    const url = `${API}/${API_VERSION}/payment/downgrade`;
+    const url = `${apiBase()}/payment/downgrade`;
     const options = {
       method: 'PUT',
     };