From c9cacbb0e2fe35d339597d9e46d56536bc42500e Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 2 Mar 2023 12:56:38 -0800
Subject: [PATCH] add types back to event / pageview. fix non-redis auth

---
 lib/middleware.ts                          |  8 +++++++-
 queries/analytics/event/saveEvent.ts       | 19 ++++++++++++++++++-
 queries/analytics/pageview/savePageView.ts | 18 +++++++++++++++++-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/lib/middleware.ts b/lib/middleware.ts
index 5cd469c3..01389114 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 6b7b7a03..60f5348f 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 c0e31f7c..24f45b5e 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,