Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Replaced server action with api route.

Mike Cao2a559aa6617e
diff --git a/src/app/actions/getConfig.ts b/src/app/api/config/route.ts
similarity index 55%
rename from src/app/actions/getConfig.ts
rename to src/app/api/config/route.ts
index 534c008e5..7fa9ce8e2 100644
--- a/src/app/actions/getConfig.ts
+++ b/src/app/api/config/route.ts
@@ -1,19 +1,14 @@
-'use server';
+import { parseRequest } from '@/lib/request';
+import { json } from '@/lib/response';
-export type Config = {
- cloudMode: boolean;
- cloudUrl?: string;
- faviconUrl?: string;
- linksUrl?: string;
- pixelsUrl?: string;
- privateMode: boolean;
- telemetryDisabled: boolean;
- trackerScriptName?: string;
- updatesDisabled: boolean;
-};
+export async function GET(request: Request) {
+ const { error } = await parseRequest(request, null, { skipAuth: true });
-export async function getConfig(): Promise<Config> {
- return {
+ if (error) {
+ return error();
+ }
+
+ return json({
cloudMode: !!process.env.CLOUD_URL,
cloudUrl: process.env.CLOUD_URL,
faviconUrl: process.env.FAVICON_URL,
@@ -23,5 +18,5 @@ export async function getConfig(): Promise<Config> {
telemetryDisabled: !!process.env.DISABLE_TELEMETRY,
trackerScriptName: process.env.TRACKER_SCRIPT_NAME,
updatesDisabled: !!process.env.DISABLE_UPDATES,
- };
+ });
}
diff --git a/src/components/hooks/useConfig.ts b/src/components/hooks/useConfig.ts
index 46c815d64..3fff832ff 100644
--- a/src/components/hooks/useConfig.ts
+++ b/src/components/hooks/useConfig.ts
@@ -1,12 +1,27 @@
import { useEffect } from 'react';
import { useApp, setConfig } from '@/store/app';
-import { getConfig, Config } from '@/app/actions/getConfig';
+import { useApi } from '@/components/hooks/useApi';
+
+export type Config = {
+ cloudMode: boolean;
+ cloudUrl?: string;
+ faviconUrl?: string;
+ linksUrl?: string;
+ pixelsUrl?: string;
+ privateMode: boolean;
+ telemetryDisabled: boolean;
+ trackerScriptName?: string;
+ updatesDisabled: boolean;
+};
export function useConfig(): Config {
const { config } = useApp();
+ const { get } = useApi();
async function loadConfig() {
- setConfig(await getConfig());
+ const { data } = await get(`/config`);
+
+ setConfig(data);
}
useEffect(() => {