watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse source
This commit is contained in:
Mike Cao 2022-10-11 23:48:05 -07:00
commit c33729e185
12 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pages/api/collect.js
View file

@ -59,7 +59,7 @@ export default async (req, res) => {
await useSession(req, res);
const {
session: { websiteId, session },
session: { website, session },
} = req;
const { type, payload } = getJsonBody(req);
@ -73,9 +73,9 @@ export default async (req, res) => {
const eventUuid = uuid();
if (type === 'pageview') {
await savePageView(websiteId, { session, url, referrer });
await savePageView(website, { session, url, referrer });
} else if (type === 'event') {
await saveEvent(websiteId, {
await saveEvent(website, {
session,
eventUuid,
url,
@ -87,7 +87,11 @@ export default async (req, res) => {
}
const token = createToken(
{ websiteId, sessionId: session.sessionId, sessionUuid: session.sessionUuid },
{
websiteId: website.websiteUuid,
sessionId: session.sessionId,
sessionUuid: session.sessionUuid,
},
secret(),
);

2
pages/api/realtime/init.js
View file

@ -11,7 +11,7 @@ export default async (req, res) => {
const { userId } = req.auth;
const websites = await getUserWebsites(userId);
const ids = websites.map(({ id }) => id);
const ids = websites.map(({ websiteUuid }) => websiteUuid);
const token = createToken({ websites: ids }, secret());
const data = await getRealtimeData(ids, subMinutes(new Date(), 30));