IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #408 from ONLYOFFICE/feature/login-nextjs

Browse Source 
Fix internal requests
This commit is contained in:
Alexey Safronov 2024-05-17 11:27:42 +04:00 committed by GitHub
commit 3891662031
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/login/src/app/(root)/layout.tsx
View File

@ -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 (
<html lang="en" translate="no">
<head>
@ -137,7 +129,6 @@ export default async function RootLayout({
}}
timers={timers}
api_host={api_host}
internalRequestJson={internalRequestJson}
redirectURL={redirectUrl}
>
<SimpleNav systemTheme={systemTheme?.value as ThemeKeys} />

6
packages/login/src/providers/index.tsx
View File

@ -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("/");

8
packages/shared/utils/next-ssr-helper.ts
View File

@ -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}`);