From 6a8de2aeec05e10526e190cccb34c7dd5c2eb61a Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 25 Jan 2022 21:23:40 -0800 Subject: [PATCH] Added option to remove trailing slash from urls. --- pages/api/collect.js | 13 ++++++++----- tracker/index.js | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pages/api/collect.js b/pages/api/collect.js index 41c9cabb..2f001758 100644 --- a/pages/api/collect.js +++ b/pages/api/collect.js @@ -5,6 +5,7 @@ import { useCors, useSession } from 'lib/middleware'; import { getIpAddress } from 'lib/request'; import { ok, badRequest } from 'lib/response'; import { createToken } from 'lib/crypto'; +import { removeTrailingSlash } from 'lib/url'; export default async (req, res) => { await useCors(req, res); @@ -37,18 +38,20 @@ export default async (req, res) => { await useSession(req, res); - const { type, payload } = req.body; const { + body: { type, payload }, session: { website_id, session_id }, } = req; - if (type === 'pageview') { - const { url, referrer } = payload; + let { url, referrer, event_type, event_value } = payload; + if (process.env.REMOVE_TRAILING_SLASH) { + url = removeTrailingSlash(url); + } + + if (type === 'pageview') { await savePageView(website_id, session_id, url, referrer); } else if (type === 'event') { - const { url, event_type, event_value } = payload; - await saveEvent(website_id, session_id, url, event_type, event_value); } else { return badRequest(res); diff --git a/tracker/index.js b/tracker/index.js index 97976ec0..38475a56 100644 --- a/tracker/index.js +++ b/tracker/index.js @@ -1,5 +1,5 @@ -import { doNotTrack, hook } from '../lib/web'; -import { removeTrailingSlash } from '../lib/url'; +import { doNotTrack, hook } from 'lib/web'; +import { removeTrailingSlash } from 'lib/url'; (window => { const {