fix: 🐛 Fix pages using the wrong base URLs for API endpoints

versia-pub · Apr 15, 2024 · 65ad29e · 65ad29e
1 parent 7accd4c
commit 65ad29e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/pages/[username]/[uuid].vue b/pages/[username]/[uuid].vue
@@ -23,10 +23,8 @@ if (!config) {
 
 const route = useRoute();
 
-const url = process.client ? config.http.base_url : config.http.url;
-
 const data = await fetch(
-    new URL(`/api/v1/statuses/${route.params.uuid}`, url),
+    new URL(`/api/v1/statuses/${route.params.uuid}`, config.http.base_url),
     {
         headers: {
             Accept: "application/json",

diff --git a/pages/[username]/index.vue b/pages/[username]/index.vue
@@ -23,11 +23,9 @@ if (!config) {
 
 const route = useRoute();
 
-const url = process.client ? config.http.base_url : config.http.url;
-
 const username = (route.params.username as string).replace("@", "");
 
-const id = await fetch(new URL(`/api/v1/accounts/search?q=${username}`, url), {
+const id = await fetch(new URL(`/api/v1/accounts/search?q=${username}`, config.http.base_url), {
     headers: {
         Accept: "application/json",
     },
@@ -38,7 +36,7 @@ const id = await fetch(new URL(`/api/v1/accounts/search?q=${username}`, url), {
 let data = null;
 
 if (id && id.length > 0) {
-    data = await fetch(new URL(`/api/v1/accounts/${id[0].id}`, url), {
+    data = await fetch(new URL(`/api/v1/accounts/${id[0].id}`, config.http.base_url), {
         headers: {
             Accept: "application/json",
         },

diff --git a/pages/register/index.vue b/pages/register/index.vue
@@ -102,7 +102,6 @@
 </template>
 
 <script setup lang="ts">
-import type { APIInstance } from "../../../../types/entities/instance";
 import LoginInput from "../../components/LoginInput.vue";
 
 const config = await useConfig();
@@ -111,13 +110,9 @@ if (!config) {
     throw new Error("Config not found");
 }
 
-const url = process.client ? config.http.base_url : config.http.url;
-
-const instanceInfo = (await fetch(new URL("/api/v1/instance", url)).then(
+const instanceInfo = (await fetch(new URL("/api/v1/instance", config.http.base_url)).then(
     (data) => data.json(),
-)) as APIInstance & {
-    tos_url: string;
-};
+));
 
 const errors = ref<{
     [key: string]: {