Skip to content

Open-source status page, incident response and uptime monitoring

🥅 (#316)

Thibault Le Ouayc177d8e17bb2
diff --git a/apps/web/src/app/api/analytics/route.ts b/apps/web/src/app/api/analytics/route.ts
index 0cce8bc7b..9e1809200 100644
--- a/apps/web/src/app/api/analytics/route.ts
+++ b/apps/web/src/app/api/analytics/route.ts
@@ -1,6 +1,8 @@
import { auth } from "@clerk/nextjs";
import { analytics, trackAnalytics } from "@openstatus/analytics";
+import { db, eq } from "@openstatus/db";
+import { user } from "@openstatus/db/src/schema";
/**
* Simple Jitsu Event
@@ -8,8 +10,15 @@ import { analytics, trackAnalytics } from "@openstatus/analytics";
export async function GET() {
const { userId } = auth();
- await analytics.identify(userId, {
- userId: userId,
+ const data = await db
+ .select()
+ .from(user)
+ .where(eq(user.tenantId, String(userId)))
+ .get();
+
+ await analytics.identify(data?.id, {
+ userId: data?.id,
+ email: data?.email,
});
await trackAnalytics({
event: "User Vercel Beta",
diff --git a/packages/api/src/router/clerk/webhook.ts b/packages/api/src/router/clerk/webhook.ts
index d278f81a8..d9cc8e118 100644
--- a/packages/api/src/router/clerk/webhook.ts
+++ b/packages/api/src/router/clerk/webhook.ts
@@ -92,7 +92,7 @@ export const webhookRouter = createTRPCRouter({
userSignedIn: webhookProcedure.mutation(async (opts) => {
if (opts.input.data.type === "session.created") {
const currentUser = await opts.ctx.db
- .select({ id: user.id })
+ .select({ id: user.id, email: user.email })
.from(user)
.where(eq(user.tenantId, opts.input.data.data.user_id))
.get();
@@ -101,6 +101,7 @@ export const webhookRouter = createTRPCRouter({
await analytics.identify(String(currentUser.id), {
userId: currentUser.id,
+ email: currentUser.email,
});
await trackAnalytics({ event: "User Signed In" });
}
diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.ts
index cda63ff9c..ca49bce5b 100644
--- a/packages/api/src/router/monitor.ts
+++ b/packages/api/src/router/monitor.ts
@@ -71,6 +71,7 @@ export const monitorRouter = createTRPCRouter({
// TODO: check, do we have to await for the two calls? Will slow down user response for our analytics
await analytics.identify(result.user.id, {
userId: result.user.id,
+ email: result.user.email,
});
await trackAnalytics({
event: "Monitor Created",
diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.ts
index 9e3f9ea67..9e37a0777 100644
--- a/packages/api/src/router/page.ts
+++ b/packages/api/src/router/page.ts
@@ -71,6 +71,7 @@ export const pageRouter = createTRPCRouter({
// TODO: check, do we have to await for the two calls? Will slow down user response for our analytics
await analytics.identify(data.user.id, {
userId: data.user.id,
+ email: data.user.email,
});
await trackAnalytics({
event: "Page Created",