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
Fixed missing docker middleware.
Mike Cao68ffa823f8a2
diff --git a/Dockerfile b/Dockerfileindex bdc678dac..e0c7e8c37 100644--- a/Dockerfile+++ b/Dockerfile@@ -12,8 +12,8 @@ RUN yarn install --frozen-lockfileFROM node:18-alpine AS builderWORKDIR /appCOPY --from=deps /app/node_modules ./node_modules-COPY docker/middleware.js .COPY . .+COPY docker/middleware.js ./srcARG DATABASE_TYPEARG BASE_PATHdiff --git a/src/pages/api/send.ts b/src/pages/api/send.tsindex e220711c8..00d721046 100644--- a/src/pages/api/send.ts+++ b/src/pages/api/send.ts@@ -7,7 +7,7 @@ import { getIpAddress } from 'lib/detect';import { useCors, useSession, useValidate } from 'lib/middleware';import { CollectionType, YupRequest } from 'lib/types';import { NextApiRequest, NextApiResponse } from 'next';-import { badRequest, createToken, forbidden, ok, send } from 'next-basics';+import { badRequest, createToken, forbidden, methodNotAllowed, ok, send } from 'next-basics';import { saveEvent, saveSessionData } from 'queries';import * as yup from 'yup';@@ -73,75 +73,75 @@ const schema = {export default async (req: NextApiRequestCollect, res: NextApiResponse) => {await useCors(req, res);- if (isbot(req.headers['user-agent']) && !process.env.DISABLE_BOT_CHECK) {- return ok(res);- }+ if (req.method === 'POST') {+ if (isbot(req.headers['user-agent']) && !process.env.DISABLE_BOT_CHECK) {+ return ok(res);+ }- const { type, payload } = req.body;+ const { type, payload } = req.body;- if (!type || !payload) {- return badRequest(res);- }+ req.yup = schema;+ await useValidate(req, res);- req.yup = schema;- await useValidate(req, res);+ if (await hasBlockedIp(req)) {+ return forbidden(res);+ }- if (await hasBlockedIp(req)) {- return forbidden(res);- }+ const { url, referrer, name: eventName, data: eventData, title: pageTitle } = payload;- const { url, referrer, name: eventName, data: eventData, title: pageTitle } = payload;+ await useSession(req, res);- await useSession(req, res);+ const session = req.session;- const session = req.session;+ if (type === COLLECTION_TYPE.event) {+ // eslint-disable-next-line prefer-const+ let [urlPath, urlQuery] = url?.split('?') || [];+ let [referrerPath, referrerQuery] = referrer?.split('?') || [];+ let referrerDomain;- if (type === COLLECTION_TYPE.event) {- // eslint-disable-next-line prefer-const- let [urlPath, urlQuery] = url?.split('?') || [];- let [referrerPath, referrerQuery] = referrer?.split('?') || [];- let referrerDomain;+ if (!urlPath) {+ urlPath = '/';+ }- if (!urlPath) {- urlPath = '/';- }+ if (referrerPath?.startsWith('http')) {+ const refUrl = new URL(referrer);+ referrerPath = refUrl.pathname;+ referrerQuery = refUrl.search.substring(1);+ referrerDomain = refUrl.hostname.replace(/www\./, '');+ }- if (referrerPath?.startsWith('http')) {- const refUrl = new URL(referrer);- referrerPath = refUrl.pathname;- referrerQuery = refUrl.search.substring(1);- referrerDomain = refUrl.hostname.replace(/www\./, '');- }+ if (process.env.REMOVE_TRAILING_SLASH) {+ urlPath = urlPath.replace(/.+\/$/, '');+ }- if (process.env.REMOVE_TRAILING_SLASH) {- urlPath = urlPath.replace(/.+\/$/, '');+ await saveEvent({+ urlPath,+ urlQuery,+ referrerPath,+ referrerQuery,+ referrerDomain,+ pageTitle,+ eventName,+ eventData,+ ...session,+ sessionId: session.id,+ });}- await saveEvent({- urlPath,- urlQuery,- referrerPath,- referrerQuery,- referrerDomain,- pageTitle,- eventName,- eventData,- ...session,- sessionId: session.id,- });- }+ if (type === COLLECTION_TYPE.identify) {+ if (!eventData) {+ return badRequest(res, 'Data required.');+ }- if (type === COLLECTION_TYPE.identify) {- if (!eventData) {- return badRequest(res, 'Data required.');+ await saveSessionData({ ...session, sessionData: eventData, sessionId: session.id });}- await saveSessionData({ ...session, sessionData: eventData, sessionId: session.id });- }+ const token = createToken(session, secret());- const token = createToken(session, secret());+ return send(res, token);+ }- return send(res, token);+ return methodNotAllowed(res);};async function hasBlockedIp(req: NextApiRequestCollect) {