selfhostyourtech/reflector
2
0
Fork 0
mirror of https://github.com/Monadical-SAS/reflector.git synced 2025-12-20 20:29:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor getConfig calls

Browse Source
This commit is contained in:
Sergey Mankovsky
2024-09-02 12:16:06 +02:00
parent e01a4dbd9a
commit b84efd1c61
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/app/(app)/layout.tsx
View File

@@ -11,8 +11,7 @@ export default async function AppLayout({
}: { }: {
children: React.ReactNode; children: React.ReactNode;
}) { }) {
const hostname = new URL(process.env.NEXT_PUBLIC_SITE_URL!).hostname; const config = await getConfig();
const config = await getConfig(hostname);
const { requireLogin, privacy, browse, rooms } = config.features; const { requireLogin, privacy, browse, rooms } = config.features;
return ( return (
<Container <Container

3
www/app/layout.tsx
View File

@@ -66,8 +66,7 @@ export default async function RootLayout({
}: { }: {
children: React.ReactNode; children: React.ReactNode;
}) { }) {
const hostname = new URL(process.env.NEXT_PUBLIC_SITE_URL!).hostname; const config = await getConfig();
const config = await getConfig(hostname);
const hasAuthCookie = !!cookies().get(SESSION_COOKIE_NAME); const hasAuthCookie = !!cookies().get(SESSION_COOKIE_NAME);
return ( return (

4
www/app/lib/edgeConfig.ts
View File

@@ -29,7 +29,9 @@ export function edgeDomainToKey(domain: string) {
} }
// get edge config server-side (prefer DomainContext when available), domain is the hostname // get edge config server-side (prefer DomainContext when available), domain is the hostname
export async function getConfig(domain: string) { export async function getConfig() {
const domain = new URL(process.env.NEXT_PUBLIC_SITE_URL!).hostname;
if (process.env.NEXT_PUBLIC_ENV === "development") { if (process.env.NEXT_PUBLIC_ENV === "development") {
return require("../../config").localConfig; return require("../../config").localConfig;
} }

2
www/app/lib/fief.ts
View File

@@ -44,7 +44,7 @@ export const getFiefAuth = async (url: URL) => {
if (FIEF_AUTHS[url.hostname]) { if (FIEF_AUTHS[url.hostname]) {
return FIEF_AUTHS[url.hostname]; return FIEF_AUTHS[url.hostname];
} else { } else {
const config = url && (await getConfig(url.hostname)); const config = url && (await getConfig());
if (config) { if (config) {
FIEF_AUTHS[url.hostname] = new FiefAuth({ FIEF_AUTHS[url.hostname] = new FiefAuth({
client: fiefClient, client: fiefClient,

3
www/middleware.ts
View File

@@ -4,8 +4,7 @@ import { getFiefAuthMiddleware } from "./app/lib/fief";
import { getConfig } from "./app/lib/edgeConfig"; import { getConfig } from "./app/lib/edgeConfig";
export async function middleware(request: NextRequest) { export async function middleware(request: NextRequest) {
const hostname = new URL(process.env.NEXT_PUBLIC_SITE_URL!).hostname; const config = await getConfig();
const config = await getConfig(hostname);
if ( if (
request.nextUrl.pathname.match( request.nextUrl.pathname.match(

5
www/pages/api/send-zulip-message.ts
View File

@@ -3,9 +3,8 @@ import { URLSearchParams } from "url";
import { getConfig } from "../../app/lib/edgeConfig"; import { getConfig } from "../../app/lib/edgeConfig";
export default async function handler(req, res) { export default async function handler(req, res) {
const domainName = req.headers.host; const config = await getConfig();
const config = await getConfig(domainName); const { sendToZulip } = config.features;
const { requireLogin, privacy, browse, sendToZulip } = config.features;
if (req.method === "POST") { if (req.method === "POST") {
const { stream, topic, message } = req.body; const { stream, topic, message } = req.body;