Skip to content

armgit / umami

Public Imported from GitHub
0

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.

add types back to event / pageview. fix non-redis auth

Francis Caoc9cacbb0e2fe
diff --git a/lib/middleware.ts b/lib/middleware.ts
index 5cd469c3d..013891149 100644
--- a/lib/middleware.ts
+++ b/lib/middleware.ts
@@ -36,7 +36,13 @@ export const useAuth = createMiddleware(async (req, res, next) => {
const shareToken = await parseShareToken(req);
let user = null;
- const { userId, authKey } = payload || {};
+ let userId = null;
+
+ const { authKey } = payload || {};
+
+ if (typeof payload === 'string') {
+ userId = payload;
+ }
if (validate(userId)) {
user = await getUser({ id: userId });
diff --git a/queries/analytics/event/saveEvent.ts b/queries/analytics/event/saveEvent.ts
index 6b7b7a038..60f5348f8 100644
--- a/queries/analytics/event/saveEvent.ts
+++ b/queries/analytics/event/saveEvent.ts
@@ -53,7 +53,24 @@ async function relationalQuery(data: {
});
}
-async function clickhouseQuery(data) {
+async function clickhouseQuery(data: {
+ id: string;
+ websiteId: string;
+ url: string;
+ referrer?: string;
+ pageTitle?: string;
+ eventName?: string;
+ hostname?: string;
+ browser?: string;
+ os?: string;
+ device?: string;
+ screen?: string;
+ language?: string;
+ country?: string;
+ subdivision1?: string;
+ subdivision2?: string;
+ city?: string;
+}) {
const {
websiteId,
id: sessionId,
diff --git a/queries/analytics/pageview/savePageView.ts b/queries/analytics/pageview/savePageView.ts
index c0e31f7c4..24f45b5ed 100644
--- a/queries/analytics/pageview/savePageView.ts
+++ b/queries/analytics/pageview/savePageView.ts
@@ -50,7 +50,23 @@ async function relationalQuery(data: {
});
}
-async function clickhouseQuery(data) {
+async function clickhouseQuery(data: {
+ id: string;
+ websiteId: string;
+ url: string;
+ referrer?: string;
+ pageTitle?: string;
+ hostname?: string;
+ browser?: string;
+ os?: string;
+ device?: string;
+ screen?: string;
+ language?: string;
+ country?: string;
+ subdivision1?: string;
+ subdivision2?: string;
+ city?: string;
+}) {
const {
websiteId,
id: sessionId,