From 18228144417a458d02cf798a86e263ff44ac9d86 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Fri, 18 Mar 2022 16:45:01 +0100 Subject: [PATCH] do not use PORTAL_DOMAIN for api requests --- packages/dashboard/src/services/accountsApi.js | 4 +--- packages/dashboard/src/services/useAccountsApi.js | 4 +--- packages/dashboard/src/services/useAnonRoute.js | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/dashboard/src/services/accountsApi.js b/packages/dashboard/src/services/accountsApi.js index e09626b1..37244e5f 100644 --- a/packages/dashboard/src/services/accountsApi.js +++ b/packages/dashboard/src/services/accountsApi.js @@ -1,5 +1,3 @@ import ky from "ky"; -const prefix = process.env.NEXT_PUBLIC_PORTAL_DOMAIN ? `https://account.${process.env.NEXT_PUBLIC_PORTAL_DOMAIN}` : ""; - -export default ky.create({ prefixUrl: `${prefix}/api` }); +export default ky.create({ prefixUrl: "/api" }); diff --git a/packages/dashboard/src/services/useAccountsApi.js b/packages/dashboard/src/services/useAccountsApi.js index 4d522764..b98d8b92 100644 --- a/packages/dashboard/src/services/useAccountsApi.js +++ b/packages/dashboard/src/services/useAccountsApi.js @@ -2,8 +2,6 @@ import useSWR from "swr"; import { useRouter } from "next/router"; import { StatusCodes } from "http-status-codes"; -const prefix = process.env.NEXT_PUBLIC_PORTAL_DOMAIN ? `https://account.${process.env.NEXT_PUBLIC_PORTAL_DOMAIN}` : ""; - const fetcher = (url, router) => { return fetch(url).then((res) => { if (res.status === StatusCodes.UNAUTHORIZED) { @@ -17,5 +15,5 @@ const fetcher = (url, router) => { export default function useAccountsApi(key, config) { const router = useRouter(); - return useSWR(`${prefix}/api/${key}`, (url) => fetcher(url, router), config); + return useSWR(`/api/${key}`, (url) => fetcher(url, router), config); } diff --git a/packages/dashboard/src/services/useAnonRoute.js b/packages/dashboard/src/services/useAnonRoute.js index b516011d..5bb65338 100644 --- a/packages/dashboard/src/services/useAnonRoute.js +++ b/packages/dashboard/src/services/useAnonRoute.js @@ -2,8 +2,6 @@ import useSWR from "swr"; import { useRouter } from "next/router"; import { StatusCodes } from "http-status-codes"; -const prefix = process.env.NEXT_PUBLIC_PORTAL_DOMAIN ? `https://account.${process.env.NEXT_PUBLIC_PORTAL_DOMAIN}` : ""; - const fetcher = (url, router) => { return fetch(url).then((res) => { if (res.status === StatusCodes.OK) router.push("/"); @@ -13,5 +11,5 @@ const fetcher = (url, router) => { export default function useAnonRoute() { const router = useRouter(); - return useSWR(`${prefix}/api/user`, (url) => fetcher(url, router)); + return useSWR("/api/user", (url) => fetcher(url, router)); }