From bd2464bd4708c534f178a63b873570c509a4c414 Mon Sep 17 00:00:00 2001 From: Kieran Date: Sat, 26 Feb 2022 12:44:29 +0000 Subject: [PATCH] Add API_HOST to upload/download --- VoidCat/spa/src/Api.js | 4 +--- VoidCat/spa/src/Const.js | 4 ++++ VoidCat/spa/src/FilePreview.js | 5 +++-- VoidCat/spa/src/FileUpload.js | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/VoidCat/spa/src/Api.js b/VoidCat/spa/src/Api.js index 5cfeb6a..554ee7f 100644 --- a/VoidCat/spa/src/Api.js +++ b/VoidCat/spa/src/Api.js @@ -1,7 +1,5 @@ import {useSelector} from "react-redux"; -import preval from "preval.macro"; - -const ApiHost = preval`module.exports = process.env.API_HOST || '';`; +import {ApiHost} from "./Const"; export function useApi() { const auth = useSelector(state => state.login.jwt); diff --git a/VoidCat/spa/src/Const.js b/VoidCat/spa/src/Const.js index d53248b..3004055 100644 --- a/VoidCat/spa/src/Const.js +++ b/VoidCat/spa/src/Const.js @@ -1,3 +1,7 @@ +import preval from "preval.macro"; + +export const ApiHost = preval`module.exports = process.env.API_HOST || '';`; + /** * @constant {number} - Size of 1 kiB */ diff --git a/VoidCat/spa/src/FilePreview.js b/VoidCat/spa/src/FilePreview.js index 678c893..bff5e0d 100644 --- a/VoidCat/spa/src/FilePreview.js +++ b/VoidCat/spa/src/FilePreview.js @@ -8,6 +8,7 @@ import {FilePaywall} from "./FilePaywall"; import {useApi} from "./Api"; import {Helmet} from "react-helmet"; import {FormatBytes} from "./Util"; +import {ApiHost} from "./Const"; export function FilePreview() { const {Api} = useApi(); @@ -92,9 +93,9 @@ export function FilePreview() { if (order) { let orderObj = JSON.parse(order); setOrder(orderObj); - setLink(`/d/${info.id}?orderId=${orderObj.id}`); + setLink(`${ApiHost}/d/${info.id}?orderId=${orderObj.id}`); } else { - setLink(`/d/${info.id}`); + setLink(`${ApiHost}/d/${info.id}`); } } }, [info]); diff --git a/VoidCat/spa/src/FileUpload.js b/VoidCat/spa/src/FileUpload.js index 8b1e2be..00c1102 100644 --- a/VoidCat/spa/src/FileUpload.js +++ b/VoidCat/spa/src/FileUpload.js @@ -120,6 +120,7 @@ export function FileUpload(props) { if (typeof (editSecret) === "string") { req.setRequestHeader("V-EditSecret", editSecret); } + req.withCredentials = true; req.send(segment); } catch (e) { reject(e);