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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Added COUNTRY_IP_HEADER environment variable. Closes #814.
Mike Caob1ced5f32ce1
diff --git a/components/pages/TestConsole.js b/components/pages/TestConsole.jsindex b715b4a8e..412aaf29b 100644--- a/components/pages/TestConsole.js+++ b/components/pages/TestConsole.js@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux';import classNames from 'classnames';import Head from 'next/head';import Link from 'next/link';+import { useRouter } from 'next/router';import Page from '../layout/Page';import PageHeader from '../layout/PageHeader';import useFetch from '../../hooks/useFetch';@@ -16,6 +17,7 @@ import EmptyPlaceholder from '../common/EmptyPlaceholder';export default function TestConsole() {const user = useSelector(state => state.user);const [website, setWebsite] = useState();+ const { basePath } = useRouter();const { data } = useFetch('/api/websites');if (!data || !user?.is_admin) {@@ -39,7 +41,7 @@ export default function TestConsole() {<Page><Head>{typeof window !== 'undefined' && website && (- <script async defer data-website-id={website.website_uuid} src="/umami.js" />+ <script async defer data-website-id={website.website_uuid} src={`${basePath}/umami.js`} />)}</Head><PageHeader>diff --git a/lib/request.js b/lib/request.jsindex e5527f7de..4f8fa8a7c 100644--- a/lib/request.js+++ b/lib/request.js@@ -52,6 +52,11 @@ export function getDevice(screen, browser, os) {}export async function getCountry(req, ip) {+ // Custom header+ if (req.headers[process.env.COUNTRY_IP_HEADER]) {+ return req.headers[process.env.COUNTRY_IP_HEADER];+ }+// Cloudflareif (req.headers['cf-ipcountry']) {return req.headers['cf-ipcountry'];