From bdab93673aa157c82581172970883d55a6da577c Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Fri, 17 May 2024 10:21:34 +0300 Subject: [PATCH 1/2] Shared:Utils: fix origin header for internal requests --- packages/shared/utils/next-ssr-helper.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/shared/utils/next-ssr-helper.ts b/packages/shared/utils/next-ssr-helper.ts index ce363646cb..1ca89f5571 100644 --- a/packages/shared/utils/next-ssr-helper.ts +++ b/packages/shared/utils/next-ssr-helper.ts @@ -40,9 +40,9 @@ export const getBaseUrl = () => { }; export const getAPIUrl = () => { - // const baseUrl = process.env.API_HOST?.trim() ?? getBaseUrl(); + const baseUrl = process.env.API_HOST?.trim() ?? getBaseUrl(); - const baseUrl = getBaseUrl(); + // const baseUrl = getBaseUrl(); const baseAPIUrl = `${baseUrl}/${API_PREFIX}`; @@ -63,9 +63,9 @@ export const createRequest = ( if (hdr[0]) hdrs.set(hdr[0], hdr[1]); }); - const host = hdrs.get("x-forwarded-host"); + const baseURL = getBaseUrl(); - if (host && process.env.API_HOST?.trim()) hdrs.set("origin", host); + if (baseURL && process.env.API_HOST?.trim()) hdrs.set("origin", baseURL); const urls = paths.map((path) => `${apiURL}${path}`); From e60eb8ca0dff291662644591d4724b2d9d7ffbe1 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Fri, 17 May 2024 10:22:20 +0300 Subject: [PATCH 2/2] Login: delete useless --- packages/login/src/app/(root)/layout.tsx | 9 --------- packages/login/src/providers/index.tsx | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/login/src/app/(root)/layout.tsx b/packages/login/src/app/(root)/layout.tsx index 347ac12c9c..2a339f9889 100644 --- a/packages/login/src/app/(root)/layout.tsx +++ b/packages/login/src/app/(root)/layout.tsx @@ -107,14 +107,6 @@ export default async function RootLayout({ redirectUrl = `unavailable`; } - const internalRequest = api_host - ? await fetch(`${api_host}/api/2.0/settings?withPassword=true`) - : undefined; - - let internalRequestJson = undefined; - - if (internalRequest?.ok) internalRequestJson = await internalRequest.json(); - return ( @@ -137,7 +129,6 @@ export default async function RootLayout({ }} timers={timers} api_host={api_host} - internalRequestJson={internalRequestJson} redirectURL={redirectUrl} > diff --git a/packages/login/src/providers/index.tsx b/packages/login/src/providers/index.tsx index 83ab70a8cc..65c0738fc3 100644 --- a/packages/login/src/providers/index.tsx +++ b/packages/login/src/providers/index.tsx @@ -50,8 +50,6 @@ export const Providers = ({ timers, api_host, redirectURL, - internalRequest, - internalRequestJson, }: { children: React.ReactNode; value: TDataContext; @@ -64,9 +62,7 @@ export const Providers = ({ React.useEffect(() => { console.log("Layout API requests timings:", { ...timers }); console.log("API_HOST: ", api_host); - console.log("internal request", internalRequest); - console.log("JSON internal request", internalRequestJson); - }, [api_host, timers, internalRequest, internalRequestJson]); + }, [api_host, timers]); React.useEffect(() => { if (redirectURL) window.location.replace("/");