From ff6b24876193675295fb0406e8b9a8f33ae1f230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EA=B4=91=EC=98=A4?= Date: Mon, 31 Jul 2023 20:08:47 +0900 Subject: [PATCH] chore: refine removal of redundant tusEndpoint in URL --- frontend/src/api/files.js | 7 +++++-- frontend/src/api/utils.js | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/src/api/files.js b/frontend/src/api/files.js index fbe15a73..972d79d8 100644 --- a/frontend/src/api/files.js +++ b/frontend/src/api/files.js @@ -1,7 +1,8 @@ -import { createURL, fetchURL, removePrefix } from "./utils"; +import { createURL, fetchURL, removePrefix, removeTusEndpoint } from "./utils"; import { baseURL } from "@/utils/constants"; import store from "@/store"; import { upload as postTus, useTus } from "./tus"; +import {tusEndpoint} from "../utils/constants"; export async function fetch(url) { url = removePrefix(url); @@ -88,7 +89,9 @@ export async function post(url, content = "", overwrite = false, onupload) { !["http:", "https:"].includes(window.location.protocol)) || // Tus is disabled / not applicable !(await useTus(content)); - + if (!useResourcesApi) { + url = removeTusEndpoint(tusEndpoint, url) + } return useResourcesApi ? postResources(url, content, overwrite, onupload) : postTus(url, content, overwrite, onupload); diff --git a/frontend/src/api/utils.js b/frontend/src/api/utils.js index a71a2b0b..b6636516 100644 --- a/frontend/src/api/utils.js +++ b/frontend/src/api/utils.js @@ -83,3 +83,10 @@ export function createURL(endpoint, params = {}, auth = true) { return url.toString(); } + +export function removeTusEndpoint(tusEndpoint, url) { + if (url.startsWith(tusEndpoint)) { + return url.substring(tusEndpoint.length); + } + return url; +} \ No newline at end of file