diff --git a/src/utils.ts b/src/utils.ts index 191b8f55bc0..cce7c134a64 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -222,8 +222,7 @@ export function executeIf(condition: boolean, promiseFunc: () => Promise): export const sessionIdKey = 'pokerogue_sessionId'; export const isLocal = window.location.hostname === 'localhost' || window.location.hostname === ''; export const serverUrl = isLocal ? 'http://localhost:8001' : ''; -export const apiUrl = isLocal ? serverUrl : 'https://api.pokerogue.net'; -export const fallbackApiUrl = isLocal ? serverUrl : 'api'; +export const apiUrl = isLocal ? serverUrl : 'api'; export function setCookie(cName: string, cValue: string): void { const expiration = new Date(); @@ -244,7 +243,7 @@ export function getCookie(cName: string): string { return ''; } -export function apiFetch(path: string, authed: boolean = false, fallback: boolean = false): Promise { +export function apiFetch(path: string, authed: boolean = false): Promise { return new Promise((resolve, reject) => { const request = {}; if (authed) { @@ -252,22 +251,13 @@ export function apiFetch(path: string, authed: boolean = false, fallback: boolea if (sId) request['headers'] = { 'Authorization': sId }; } - fetch(`${!fallback ? apiUrl : fallbackApiUrl}/${path}`, request) - .then(response => { - if (!response.ok && response.status === 404 && !fallback) - return apiFetch(path, authed, true).then(res => resolve(res)); - resolve(response); - }) - .catch(err => { - if (fallback) - reject(err); - else - apiFetch(path, authed, true).then(res => resolve(res)); - }); + fetch(`${apiUrl}/${path}`, request) + .then(response => resolve(response)) + .catch(err => reject(err)); }); } -export function apiPost(path: string, data?: any, contentType: string = 'application/json', authed: boolean = false, fallback: boolean = false): Promise { +export function apiPost(path: string, data?: any, contentType: string = 'application/json', authed: boolean = false): Promise { return new Promise((resolve, reject) => { const headers = { 'Accept': contentType, @@ -278,14 +268,9 @@ export function apiPost(path: string, data?: any, contentType: string = 'applica if (sId) headers['Authorization'] = sId; } - fetch(`${!fallback ? apiUrl : fallbackApiUrl}/${path}`, { method: 'POST', headers: headers, body: data }) + fetch(`${apiUrl}/${path}`, { method: 'POST', headers: headers, body: data }) .then(response => resolve(response)) - .catch(err => { - if (fallback) - reject(err); - else - apiPost(path, data, contentType, authed, true).then(res => resolve(res)); - }); + .catch(err => reject(err)); }); }