Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix httpBase

Browse source
This commit is contained in:
Dessalines 2021-04-26 15:32:59 -04:00
parent 1119fff4d3
commit a136d064ae
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server/index.tsx
View file

@ -16,7 +16,7 @@ import { GetSite, GetSiteResponse, LemmyHttp } from "lemmy-js-client";
import process from "process"; import process from "process";
import { Helmet } from "inferno-helmet"; import { Helmet } from "inferno-helmet";
import { initializeSite } from "../shared/initialize"; import { initializeSite } from "../shared/initialize";
import { httpBase } from "../shared/env"; import { httpBaseInternal } from "../shared/env";
import { IncomingHttpHeaders } from "http"; import { IncomingHttpHeaders } from "http";
import { setOptionalAuth } from "../shared/utils"; import { setOptionalAuth } from "../shared/utils";
@ -44,7 +44,7 @@ server.get("/*", async (req, res) => {
let headers = setForwardedHeaders(req.headers); let headers = setForwardedHeaders(req.headers);
let initialFetchReq: InitialFetchRequest = { let initialFetchReq: InitialFetchRequest = {
client: new LemmyHttp(httpBase, headers), client: new LemmyHttp(httpBaseInternal, headers),
auth, auth,
path: req.path, path: req.path,
}; };

5
src/shared/env.ts
View file

@ -33,9 +33,10 @@ if (isBrowser()) {
secure = process.env.LEMMY_HTTPS == "true" ? "s" : ""; secure = process.env.LEMMY_HTTPS == "true" ? "s" : "";
} }
export const httpBase = `http://${host}`; // Don't use secure here export const httpBaseInternal = `http://${host}`; // Don't use secure here
export const httpBase = `http${secure}://${host}`;
export const wsUri = `ws${secure}://${wsHost}/api/v3/ws`; export const wsUri = `ws${secure}://${wsHost}/api/v3/ws`;
export const pictrsUri = `http${secure}://${host}/pictrs/image`; export const pictrsUri = `${httpBase}/pictrs/image`;
console.log(`httpbase: ${httpBase}`); console.log(`httpbase: ${httpBase}`);
console.log(`wsUri: ${wsUri}`); console.log(`wsUri: ${wsUri}`);