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
Move environment variables to middleware. Closes #972.
Mike Cao7270d9524004
diff --git a/Dockerfile b/Dockerfileindex ee931167a..16dd9872c 100644--- a/Dockerfile+++ b/Dockerfile@@ -2,12 +2,11 @@FROM node:12.22-alpine AS buildARG BASE_PATHARG DATABASE_TYPE-ARG TRACKER_SCRIPT_NAMEENV BASE_PATH=$BASE_PATHENV DATABASE_URL "postgresql://umami:umami@db:5432/umami"ENV DATABASE_TYPE=$DATABASE_TYPE-ENV TRACKER_SCRIPT_NAME=$TRACKER_SCRIPT_NAME+WORKDIR /buildRUN yarn config set --home enableTelemetry 0diff --git a/components/forms/TrackingCodeForm.js b/components/forms/TrackingCodeForm.jsindex bfc6940d2..fd679ab2e 100644--- a/components/forms/TrackingCodeForm.js+++ b/components/forms/TrackingCodeForm.js@@ -5,8 +5,6 @@ import Button from 'components/common/Button';import FormLayout, { FormButtons, FormRow } from 'components/layout/FormLayout';import CopyButton from 'components/common/CopyButton';-const scriptName = process.env.TRACKER_SCRIPT_NAME || 'umami';-export default function TrackingCodeForm({ values, onClose }) {const ref = useRef();const { basePath } = useRouter();@@ -26,7 +24,7 @@ export default function TrackingCodeForm({ values, onClose }) {rows={3}cols={60}spellCheck={false}- defaultValue={`<script async defer data-website-id="${values.website_uuid}" src="${document.location.origin}${basePath}/${scriptName}.js"></script>`}+ defaultValue={`<script async defer data-website-id="${values.website_uuid}" src="${document.location.origin}${basePath}/umami.js"></script>`}readOnly/></FormRow>diff --git a/hooks/useForceSSL.js b/hooks/useForceSSL.jsdeleted file mode 100644index b9d95e190..000000000--- a/hooks/useForceSSL.js+++ /dev/null@@ -1,14 +0,0 @@-import { useEffect } from 'react';-import { useRouter } from 'next/router';--export default function useForceSSL(enabled) {- const router = useRouter();-- useEffect(() => {- if (enabled && typeof window !== 'undefined' && /^http:\/\//.test(location.href)) {- router.push(location.href.replace(/^http:\/\//, 'https://'));- }- }, [enabled]);-- return null;-}diff --git a/next.config.js b/next.config.jsindex 71cb9b20c..3ee8e6990 100644--- a/next.config.js+++ b/next.config.js@@ -1,14 +1,9 @@require('dotenv').config();const pkg = require('./package.json');-const scriptName = process.env.TRACKER_SCRIPT_NAME;-module.exports = {env: {VERSION: pkg.version,- FORCE_SSL: Boolean(process.env.FORCE_SSL),- DISABLE_LOGIN: Boolean(process.env.DISABLE_LOGIN),- TRACKER_SCRIPT_NAME: scriptName,},basePath: process.env.BASE_PATH,eslint: {@@ -23,13 +18,10 @@ module.exports = {return config;},- async rewrites() {- return scriptName ? [{ source: `/${scriptName}.js`, destination: '/umami.js' }] : [];- },async headers() {return [{- source: `/${scriptName || 'umami'}.js`,+ source: `/umami.js`,headers: [{key: 'Cache-Control',diff --git a/pages/_app.js b/pages/_app.jsindex a4c4776c5..723647867 100644--- a/pages/_app.js+++ b/pages/_app.js@@ -5,7 +5,6 @@ import { IntlProvider } from 'react-intl';import { Provider } from 'react-redux';import { useStore } from 'redux/store';import useLocale from 'hooks/useLocale';-import useForceSSL from 'hooks/useForceSSL';import 'styles/variables.css';import 'styles/bootstrap-grid.css';import 'styles/index.css';@@ -25,7 +24,6 @@ const Intl = ({ children }) => {};export default function App({ Component, pageProps }) {- useForceSSL(process.env.FORCE_SSL);const store = useStore();const { basePath } = useRouter();diff --git a/pages/_middleware.js b/pages/_middleware.jsnew file mode 100644index 000000000..94d88360e--- /dev/null+++ b/pages/_middleware.js@@ -0,0 +1,44 @@+import { NextResponse } from 'next/server';++function redirectHTTPS(req) {+ if (+ process.env.FORCE_SSL &&+ !req.headers.get('host').includes('localhost') &&+ req.nextUrl.protocol !== 'https'+ ) {+ return NextResponse.redirect(`https://${req.headers.get('host')}${req.nextUrl.pathname}`, 301);+ }+}++function customScriptName(req) {+ const scriptName = process.env.TRACKER_SCRIPT_NAME;++ if (scriptName) {+ const url = req.nextUrl.clone();+ const { pathname } = url;++ if (pathname.endsWith(`/${scriptName}.js`)) {+ url.pathname = '/umami.js';+ return NextResponse.rewrite(url);+ }+ }+}++function disableLogin(req) {+ if (process.env.DISABLE_LOGIN && req.nextUrl.pathname.endsWith('/login')) {+ return new Response('403 Forbidden', { status: 403 });+ }+}++export function middleware(req) {+ const fns = [redirectHTTPS, customScriptName, disableLogin];++ for (const fn of fns) {+ const res = fn(req);+ if (res) {+ return res;+ }+ }++ return NextResponse.next();+}