Skip to content

Open-source status page, incident response and uptime monitoring

Improve backend code (#182)

Thibault Le Ouay5dcb1b2d5328
diff --git a/apps/web/package.json b/apps/web/package.json
index be487a614..6cbfb4703 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -39,10 +39,10 @@
"@t3-oss/env-nextjs": "0.4.1",
"@tailwindcss/typography": "0.5.9",
"@tanstack/react-table": "8.9.3",
- "@trpc/client": "10.35.0",
- "@trpc/next": "10.35.0",
- "@trpc/react-query": "10.35.0",
- "@trpc/server": "10.35.0",
+ "@trpc/client": "10.37.1",
+ "@trpc/next": "10.37.1",
+ "@trpc/react-query": "10.37.1",
+ "@trpc/server": "10.37.1",
"@upstash/qstash": "0.3.6",
"@upstash/redis": "1.21.0",
"@vercel/analytics": "1.0.1",
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx
index 37cc27606..62f6de927 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/monitors/page.tsx
@@ -13,8 +13,6 @@ import { api } from "@/trpc/server";
import { ActionButton } from "./_components/action-button";
import { EmptyState } from "./_components/empty-state";
-const limit = allPlans.free.limits.monitors;
-
export default async function MonitorPage({
params,
}: {
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx
index 4b9c296b9..14284fbc7 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceSlug]/status-pages/page.tsx
@@ -75,7 +75,7 @@ export default async function Page({
<dt>Monitors</dt>
<dd className="flex flex-wrap justify-end gap-2">
{page.monitorsToPages.map(
- ({ monitor: { id, name, active } }, i) => (
+ ({ monitor: { id, name, active } }) => (
<Badge key={id} variant={active ? "default" : "outline"}>
{name}
<span
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 29d770dbf..350d0ed37 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -89,11 +89,13 @@ export default authMiddleware({
.from(workspace)
.where(eq(workspace.id, result[0].users_to_workspaces.workspaceId))
.get();
- const orgSelection = new URL(
- `/app/${currentWorkspace.slug}/monitors`,
- req.url,
- );
- return NextResponse.redirect(orgSelection);
+ if (currentWorkspace) {
+ const orgSelection = new URL(
+ `/app/${currentWorkspace.slug}/monitors`,
+ req.url,
+ );
+ return NextResponse.redirect(orgSelection);
+ }
} else {
// return NextResponse.redirect(new URL("/app/onboarding", req.url));
// probably redirect to onboarding
diff --git a/apps/web/src/trpc/shared.ts b/apps/web/src/trpc/shared.ts
index b37ad30fc..53abadf6a 100644
--- a/apps/web/src/trpc/shared.ts
+++ b/apps/web/src/trpc/shared.ts
@@ -1,4 +1,4 @@
-import type { HttpBatchLinkOptions, HTTPHeaders, TRPCLink } from "@trpc/client";
+import type { HTTPBatchLinkOptions, HTTPHeaders, TRPCLink } from "@trpc/client";
import { httpBatchLink } from "@trpc/client";
import type { AppRouter } from "@openstatus/api";
@@ -16,7 +16,7 @@ export const endingLink = (opts?: { headers?: HTTPHeaders }) =>
((runtime) => {
const sharedOpts = {
headers: opts?.headers,
- } satisfies Partial<HttpBatchLinkOptions>;
+ } satisfies Partial<HTTPBatchLinkOptions>;
const edgeLink = httpBatchLink({
...sharedOpts,
diff --git a/packages/api/package.json b/packages/api/package.json
index 4e9dd7dd9..6759b990c 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -13,8 +13,8 @@
"@openstatus/emails": "workspace:^",
"@openstatus/plans": "workspace:^",
"@t3-oss/env-core": "0.6.0",
- "@trpc/client": "10.35.0",
- "@trpc/server": "10.35.0",
+ "@trpc/client": "10.37.1",
+ "@trpc/server": "10.37.1",
"random-word-slugs": "0.1.7",
"stripe": "12.17.0",
"superjson": "1.13.1",
diff --git a/packages/api/src/router/incident.ts b/packages/api/src/router/incident.ts
index c9cc90716..e740744f8 100644
--- a/packages/api/src/router/incident.ts
+++ b/packages/api/src/router/incident.ts
@@ -18,36 +18,25 @@ import {
} from "@openstatus/db/src/schema";
import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { hasUserAccessToWorkspace } from "./utils";
export const incidentRouter = createTRPCRouter({
createIncident: protectedProcedure
.input(insertIncidentSchema)
.mutation(async (opts) => {
- const currentWorkspace = await opts.ctx.db
- .select()
- .from(workspace)
- .where(eq(workspace.slug, opts.input.workspaceSlug))
- .get();
- const currentUser = opts.ctx.db
- .select()
- .from(user)
- .where(eq(user.tenantId, opts.ctx.auth.userId))
- .as("currentUser");
- const result = await opts.ctx.db
- .select()
- .from(usersToWorkspaces)
- .where(eq(usersToWorkspaces.workspaceId, currentWorkspace.id))
- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
- .get();
-
+ const result = await hasUserAccessToWorkspace({
+ workspaceSlug: opts.input.workspaceSlug,
+ ctx: opts.ctx,
+ });
if (!result) return;
+
const { id, workspaceSlug, monitors, date, ...incidentInput } =
opts.input;
const newIncident = await opts.ctx.db
.insert(incident)
.values({
- workspaceId: currentWorkspace.id,
+ workspaceId: result.workspace.id,
...incidentInput,
})
.returning()
@@ -82,24 +71,12 @@ export const incidentRouter = createTRPCRouter({
createIncidentUpdate: protectedProcedure
.input(insertIncidentUpdateSchema)
.mutation(async (opts) => {
- const currentWorkspace = await opts.ctx.db
- .select()
- .from(workspace)
- .where(eq(workspace.slug, opts.input.workspaceSlug))
- .get();
- const currentUser = opts.ctx.db
- .select()
- .from(user)
- .where(eq(user.tenantId, opts.ctx.auth.userId))
- .as("currentUser");
- const result = await opts.ctx.db
- .select()
- .from(usersToWorkspaces)
- .where(eq(usersToWorkspaces.workspaceId, currentWorkspace.id))
- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
- .get();
-
- if (!result) return;
+ // Check if user has access to workspace
+ const data = await hasUserAccessToWorkspace({
+ workspaceSlug: opts.input.workspaceSlug,
+ ctx: opts.ctx,
+ });
+ if (!data) return;
// update parent incident with latest status
await opts.ctx.db
@@ -120,28 +97,13 @@ export const incidentRouter = createTRPCRouter({
updateIncident: protectedProcedure
.input(insertIncidentSchemaWithMonitors)
.mutation(async (opts) => {
- const currentWorkspace = await opts.ctx.db
- .select()
- .from(workspace)
- .where(eq(workspace.slug, opts.input.workspaceSlug))
- .get();
- const currentUser = opts.ctx.db
- .select()
- .from(user)
- .where(eq(user.tenantId, opts.ctx.auth.userId))
- .as("currentUser");
- const result = await opts.ctx.db
- .select()
- .from(usersToWorkspaces)
- .where(eq(usersToWorkspaces.workspaceId, currentWorkspace.id))
- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
- .get();
-
- if (!result) return;
+ const data = await hasUserAccessToWorkspace({
+ workspaceSlug: opts.input.workspaceSlug,
+ ctx: opts.ctx,
+ });
+ if (!data) return;
- console.log(opts.input);
const { monitors, workspaceSlug, ...incidentInput } = opts.input;
- console.log(incidentInput);
if (!incidentInput.id) return;
@@ -204,6 +166,7 @@ export const incidentRouter = createTRPCRouter({
.from(workspace)
.where(eq(workspace.slug, opts.input.workspaceSlug))
.get();
+ if (!currentWorkspace) return;
const currentUser = opts.ctx.db
.select()
.from(user)
@@ -241,7 +204,7 @@ export const incidentRouter = createTRPCRouter({
.from(user)
.where(eq(user.tenantId, opts.ctx.auth.userId))
.get();
-
+ if (!currentUser) return;
const result = await opts.ctx.db
.select()
.from(usersToWorkspaces)
@@ -276,7 +239,7 @@ export const incidentRouter = createTRPCRouter({
.from(user)
.where(eq(user.tenantId, opts.ctx.auth.userId))
.get();
-
+ if (!currentUser) return;
const result = await opts.ctx.db
.select()
.from(usersToWorkspaces)
@@ -340,26 +303,11 @@ export const incidentRouter = createTRPCRouter({
getIncidentByWorkspace: protectedProcedure
.input(z.object({ workspaceSlug: z.string() }))
.query(async (opts) => {
- const currentWorkspace = await opts.ctx.db
- .select()
- .from(workspace)
- .where(eq(workspace.slug, opts.input.workspaceSlug))
- .get();
-
- const currentUser = opts.ctx.db
- .select()
- .from(user)
- .where(eq(user.tenantId, opts.ctx.auth.userId))
- .as("currentUser");
-
- const result = await opts.ctx.db
- .select()
- .from(usersToWorkspaces)
- .where(eq(usersToWorkspaces.workspaceId, currentWorkspace.id))
- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
- .get();
-
- if (!result) return;
+ const data = await hasUserAccessToWorkspace({
+ workspaceSlug: opts.input.workspaceSlug,
+ ctx: opts.ctx,
+ });
+ if (!data) return;
const selectIncidentSchemaWithRelation = selectIncidentSchema.extend({
status: StatusEnum.default("investigating"), // TODO: remove!
@@ -375,8 +323,8 @@ export const incidentRouter = createTRPCRouter({
incidentUpdates: z.array(selectIncidentUpdateSchema),
});
- const data = await opts.ctx.db.query.incident.findMany({
- where: eq(incident.workspaceId, currentWorkspace.id),
+ const result = await opts.ctx.db.query.incident.findMany({
+ where: eq(incident.workspaceId, data.workspace.id),
with: {
monitorsToIncidents: { with: { monitor: true } },
incidentUpdates: {
@@ -388,6 +336,6 @@ export const incidentRouter = createTRPCRouter({
orderBy: (incident, { desc }) => [desc(incident.createdAt)],
});
- return z.array(selectIncidentSchemaWithRelation).parse(data);
+ return z.array(selectIncidentSchemaWithRelation).parse(result);
}),
});
diff --git a/packages/api/src/router/monitor.ts b/packages/api/src/router/monitor.ts
index a5ebf866b..21557c977 100644
--- a/packages/api/src/router/monitor.ts
+++ b/packages/api/src/router/monitor.ts
@@ -10,11 +10,11 @@ import {
selectMonitorSchema,
user,
usersToWorkspaces,
- workspace,
} from "@openstatus/db/src/schema";
import { allPlans } from "@openstatus/plans";
import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { hasUserAccessToWorkspace } from "./utils";
const monitorLimit = allPlans.free.limits.monitors;
const periodicityLimit = allPlans.free.limits.periodicity;
@@ -23,29 +23,15 @@ export const monitorRouter = createTRPCRouter({
createMonitor: protectedProcedure
.input(z.object({ data: insertMonitorSchema, workspaceSlug: z.string() }))
.mutation(async (opts) => {
- const currentWorkspace = await opts.ctx.db
- .select()
- .from(workspace)
- .where(eq(workspace.slug, opts.input.workspaceSlug))
- .get();
- const currentUser = opts.ctx.db
- .select()
- .from(user)
- .where(eq(user.tenantId, opts.ctx.auth.userId))
- .as("currentUser");
- const result = await opts.ctx.db
- .select()
- .from(usersToWorkspaces)
- .where(eq(usersToWorkspaces.workspaceId, currentWorkspace.id))
- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
- .get();
-
- // the user don't have access to this workspace
- if (!result || !result.users_to_workspaces) return;
+ const result = await hasUserAccessToWorkspace({
+ workspaceSlug: opts.input.workspaceSlug,
+ ctx: opts.ctx,
+ });
+ if (!result) return;
const monitorNumbers = (
await opts.ctx.db.query.monitor.findMany({
- where: eq(monitor.workspaceId, currentWorkspace.id),
+ where: eq(monitor.workspaceId, result.workspace.id),
})
).length;
@@ -73,14 +59,14 @@ export const monitorRouter = createTRPCRouter({
.insert(monitor)
.values({
...data,
- workspaceId: currentWorkspace.id,
+ workspaceId: result.workspace.id,
regions: regions?.join(","),
})
.returning()
.get();
- await analytics.identify(result.users_to_workspaces.userId, {
- userId: result.users_to_workspaces.userId,
+ await analytics.identify(result.user.id, {
+ userId: result.user.id,
});
await trackAnalytics({
event: "Monitor Created",
@@ -223,7 +209,7 @@ export const monitorRouter = createTRPCRouter({
.innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
.get();
- if (!result.users_to_workspaces) return;
+ if (!result?.users_to_workspaces) return;
await opts.ctx.db
.update(monitor)
@@ -267,30 +253,17 @@ export const monitorRouter = createTRPCRouter({
getMonitorsByWorkspace: protectedProcedure
.input(z.object({ workspaceSlug: z.string() }))
.query(async (opts) => {
- const currentUser = opts.ctx.db
- .select()
- .from(user)
- .where(eq(user.tenantId, opts.ctx.auth.userId))
- .as("currentUser");
-
- const currentWorkspace = await opts.ctx.db
- .select()
- .from(workspace)
- .where(eq(workspace.slug, opts.input.workspaceSlug))
- .get();
- const result = await opts.ctx.db
- .select()
- .from(usersToWorkspaces)
- .where(eq(usersToWorkspaces.workspaceId, currentWorkspace.id))
- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
- .get();
- // the user don't have access to this workspace
- if (!result || !result.users_to_workspaces) return;
+ // Check if user has access to workspace
+ const data = await hasUserAccessToWorkspace({
+ workspaceSlug: opts.input.workspaceSlug,
+ ctx: opts.ctx,
+ });
+ if (!data) return;
const monitors = await opts.ctx.db
.select()
.from(monitor)
- .where(eq(monitor.workspaceId, currentWorkspace.id))
+ .where(eq(monitor.workspaceId, data.workspace.id))
.all();
// const selectMonitorsArray = selectMonitorSchema.array();
diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.ts
index 2aa4f8719..5aecde4fa 100644
--- a/packages/api/src/router/page.ts
+++ b/packages/api/src/router/page.ts
@@ -5,16 +5,11 @@ import { analytics, trackAnalytics } from "@openstatus/analytics";
import { and, eq, inArray, not, sql } from "@openstatus/db";
import {
incident,
- incidentUpdate,
insertPageSchemaWithMonitors,
monitor,
monitorsToIncidents,
monitorsToPages,
page,
- selectIncidentSchema,
- selectIncidentUpdateSchema,
- selectMonitorSchema,
- selectPageSchema,
selectPageSchemaWithRelation,
user,
usersToWorkspaces,
@@ -23,6 +18,7 @@ import {
import { allPlans } from "@openstatus/plans";
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
+import { hasUserAccessToWorkspace } from "./utils";
const limit = allPlans.free.limits["status-pages"];
@@ -32,30 +28,18 @@ export const pageRouter = createTRPCRouter({
.input(insertPageSchemaWithMonitors)
.mutation(async (opts) => {
if (!opts.input.workspaceSlug) return;
- const currentWorkspace = await opts.ctx.db
- .select()
- .from(workspace)
- .where(eq(workspace.slug, opts.input.workspaceSlug))
- .get();
- const currentUser = opts.ctx.db
- .select()
- .from(user)
- .where(eq(user.tenantId, opts.ctx.auth.userId))
- .as("currentUser");
- const result = await opts.ctx.db
- .select()
- .from(usersToWorkspaces)
- .where(eq(usersToWorkspaces.workspaceId, currentWorkspace.id))
- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
- .get();
+ const data = await hasUserAccessToWorkspace({
+ workspaceSlug: opts.input.workspaceSlug,
+ ctx: opts.ctx,
+ });
+ if (!data) return;
- if (!result) return;
const { monitors, workspaceId, workspaceSlug, id, ...pageInput } =
opts.input;
const pageNumbers = (
await opts.ctx.db.query.page.findMany({
- where: eq(page.workspaceId, currentWorkspace.id),
+ where: eq(page.workspaceId, data.workspace.id),
})
).length;
@@ -69,7 +53,7 @@ export const pageRouter = createTRPCRouter({
const newPage = await opts.ctx.db
.insert(page)
- .values({ workspaceId: currentWorkspace.id, ...pageInput })
+ .values({ workspaceId: data.workspace.id, ...pageInput })
.returning()
.get();
if (monitors && monitors.length > 0) {
@@ -84,8 +68,8 @@ export const pageRouter = createTRPCRouter({
await opts.ctx.db.insert(monitorsToPages).values(values).run();
}
- await analytics.identify(result.users_to_workspaces.userId, {
- userId: result.users_to_workspaces.userId,
+ await analytics.identify(data.user.id, {
+ userId: data.user.id,
});
await trackAnalytics({
event: "Page Created",
@@ -101,7 +85,7 @@ export const pageRouter = createTRPCRouter({
.from(user)
.where(eq(user.tenantId, opts.ctx.auth.userId))
.get();
-
+ if (!currentUser) return;
const result = await opts.ctx.db
.select()
.from(usersToWorkspaces)
@@ -130,7 +114,7 @@ export const pageRouter = createTRPCRouter({
.from(user)
.where(eq(user.tenantId, opts.ctx.auth.userId))
.get();
-
+ if (!currentUser) return;
const result = await opts.ctx.db
.select()
.from(usersToWorkspaces)
@@ -208,7 +192,7 @@ export const pageRouter = createTRPCRouter({
.from(user)
.where(eq(user.tenantId, opts.ctx.auth.userId))
.get();
-
+ if (!currentUser) return;
const result = await opts.ctx.db
.select()
.from(usersToWorkspaces)
@@ -239,12 +223,13 @@ export const pageRouter = createTRPCRouter({
.from(user)
.where(eq(user.tenantId, opts.ctx.auth.userId))
.get();
-
+ if (!currentUser) return;
const currentWorkspace = await opts.ctx.db
.select()
.from(workspace)
.where(eq(workspace.slug, opts.input.workspaceSlug))
.get();
+ if (!currentWorkspace) return;
const result = await opts.ctx.db
.select()
.from(usersToWorkspaces)
@@ -271,7 +256,6 @@ export const pageRouter = createTRPCRouter({
.query(async (opts) => {
const result = await opts.ctx.db.query.page.findFirst({
where: sql`lower(${page.slug}) = ${opts.input.slug}`,
- // with: { incidents: true },
});
if (!result) {
diff --git a/packages/api/src/router/stripe/index.ts b/packages/api/src/router/stripe/index.ts
index 030ee282d..58cb4c5a4 100644
--- a/packages/api/src/router/stripe/index.ts
+++ b/packages/api/src/router/stripe/index.ts
@@ -109,7 +109,7 @@ export const stripeRouter = createTRPCRouter({
metadata: {
workspaceId: String(workspace.id),
},
- email: currentUser.email || "",
+ email: currentUser?.email || "",
};
const stripeUser = await stripe.customers.create(customerData);
diff --git a/packages/api/src/router/stripe/webhook.ts b/packages/api/src/router/stripe/webhook.ts
index 22f9da4e0..38223dc24 100644
--- a/packages/api/src/router/stripe/webhook.ts
+++ b/packages/api/src/router/stripe/webhook.ts
@@ -1,6 +1,6 @@
import { TRPCError } from "@trpc/server";
import type Stripe from "stripe";
-import { custom, z } from "zod";
+import { z } from "zod";
import { analytics, trackAnalytics } from "@openstatus/analytics";
import { eq } from "@openstatus/db";
@@ -68,6 +68,8 @@ export const webhookRouter = createTRPCRouter({
.from(user)
.where(eq(user.email, customer.email))
.get();
+ if (!userResult) return;
+
await analytics.identify(String(userResult.id), {
email: customer.email,
userId: userResult.id,
diff --git a/packages/api/src/router/utils.ts b/packages/api/src/router/utils.ts
new file mode 100644
index 000000000..9325a4ce3
--- /dev/null
+++ b/packages/api/src/router/utils.ts
@@ -0,0 +1,43 @@
+import { eq } from "@openstatus/db";
+import { user, usersToWorkspaces, workspace } from "@openstatus/db/src/schema";
+
+import { Context } from "../trpc";
+
+/**
+ * Check if the user has access to the workspace, and return the workspace and user otherwise undefined
+ * @param workspaceSlug
+ * @param tenantId
+ * @param ctx - trpc context
+ * @returns {Promise<{ workspaceId: string; userId: string }> | undefined} - workspaceId and userId
+ */
+export const hasUserAccessToWorkspace = async ({
+ workspaceSlug,
+ ctx,
+}: {
+ workspaceSlug: string;
+ ctx: Context;
+}) => {
+ if (!ctx.auth?.userId) return;
+ const currentUser = ctx.db
+ .select()
+ .from(user)
+ .where(eq(user.tenantId, ctx.auth?.userId))
+ .as("currentUser");
+
+ const currentWorkspace = await ctx.db
+ .select()
+ .from(workspace)
+ .where(eq(workspace.slug, workspaceSlug))
+ .get();
+ if (!currentWorkspace) return;
+ const result = await ctx.db
+ .select()
+ .from(usersToWorkspaces)
+ .where(eq(usersToWorkspaces.workspaceId, currentWorkspace.id))
+ .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
+ .get();
+ // the user doesn't have access to this workspace
+ if (!result || !result.users_to_workspaces) return;
+
+ return { workspace: currentWorkspace, user: result.currentUser };
+};
diff --git a/packages/api/src/router/workspace.ts b/packages/api/src/router/workspace.ts
index a6f745ce6..d86c54337 100644
--- a/packages/api/src/router/workspace.ts
+++ b/packages/api/src/router/workspace.ts
@@ -3,14 +3,13 @@ import { z } from "zod";
import { eq } from "@openstatus/db";
import {
- selectPageSchema,
selectWorkspaceSchema,
user,
- usersToWorkspaces,
workspace,
} from "@openstatus/db/src/schema";
import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { hasUserAccessToWorkspace } from "./utils";
export const workspaceRouter = createTRPCRouter({
getUserWithWorkspace: protectedProcedure.query(async (opts) => {
@@ -25,33 +24,21 @@ export const workspaceRouter = createTRPCRouter({
where: eq(user.tenantId, opts.ctx.auth.userId),
});
}),
+
getWorkspace: protectedProcedure
.input(z.object({ slug: z.string() }))
.query(async (opts) => {
- const currentUser = opts.ctx.db
- .select()
- .from(user)
- .where(eq(user.tenantId, opts.ctx.auth.userId))
- .as("currentUser");
- const currentWorkspace = await opts.ctx.db
- .select()
- .from(workspace)
- .where(eq(workspace.slug, opts.input.slug))
- .get();
- const result = await opts.ctx.db
- .select()
- .from(usersToWorkspaces)
- .where(eq(usersToWorkspaces.workspaceId, currentWorkspace.id))
- .innerJoin(currentUser, eq(usersToWorkspaces.userId, currentUser.id))
- .get();
-
- if (!result.users_to_workspaces) return;
+ const data = await hasUserAccessToWorkspace({
+ workspaceSlug: opts.input.slug,
+ ctx: opts.ctx,
+ });
+ if (!data) return;
- const data = await opts.ctx.db.query.workspace.findFirst({
- where: eq(workspace.id, currentWorkspace.id),
+ const result = await opts.ctx.db.query.workspace.findFirst({
+ where: eq(workspace.id, data.workspace.id),
});
- return selectWorkspaceSchema.parse(data);
+ return selectWorkspaceSchema.parse(result);
}),
createWorkspace: protectedProcedure
diff --git a/packages/api/src/trpc.ts b/packages/api/src/trpc.ts
index 86a1d034c..5c83aea58 100644
--- a/packages/api/src/trpc.ts
+++ b/packages/api/src/trpc.ts
@@ -5,7 +5,7 @@ import type {
SignedOutAuthObject,
} from "@clerk/nextjs/api";
import { getAuth } from "@clerk/nextjs/server";
-import { initTRPC, TRPCError } from "@trpc/server";
+import { inferAsyncReturnType, initTRPC, TRPCError } from "@trpc/server";
import superjson from "superjson";
import { ZodError } from "zod";
@@ -55,6 +55,8 @@ export const createTRPCContext = (opts: { req: NextRequest }) => {
});
};
+export type Context = inferAsyncReturnType<typeof createTRPCContext>;
+
/**
* 2. INITIALIZATION
*
diff --git a/packages/db/package.json b/packages/db/package.json
index b3e89a7c7..f86725f46 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -13,13 +13,13 @@
"@libsql/client": "0.3.1",
"@t3-oss/env-core": "0.6.0",
"dotenv": "16.3.1",
- "drizzle-orm": "0.27.2",
- "drizzle-zod": "0.4.4",
+ "drizzle-orm": "0.28.2",
+ "drizzle-zod": "0.5.0",
"zod": "3.21.4"
},
"devDependencies": {
"@types/node": "20.3.1",
- "drizzle-kit": "0.19.10",
+ "drizzle-kit": "0.19.12",
"tsconfig": "workspace:^",
"typescript": "5.1.6",
"bufferutil": "4.0.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a15a3d874..ee50b6ae0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -163,17 +163,17 @@ importers:
specifier: 8.9.3
'@trpc/client':
- specifier: 10.35.0
- version: 10.35.0(@trpc/[email protected])
+ specifier: 10.37.1
+ version: 10.37.1(@trpc/[email protected])
'@trpc/next':
- specifier: 10.35.0
+ specifier: 10.37.1
'@trpc/react-query':
- specifier: 10.35.0
+ specifier: 10.37.1
'@trpc/server':
- specifier: 10.35.0
- version: 10.35.0
+ specifier: 10.37.1
+ version: 10.37.1
'@upstash/qstash':
specifier: 0.3.6
version: 0.3.6
@@ -360,11 +360,11 @@ importers:
specifier: 0.6.0
'@trpc/client':
- specifier: 10.35.0
- version: 10.35.0(@trpc/[email protected])
+ specifier: 10.37.1
+ version: 10.37.1(@trpc/[email protected])
'@trpc/server':
- specifier: 10.35.0
- version: 10.35.0
+ specifier: 10.37.1
+ version: 10.37.1
random-word-slugs:
specifier: 0.1.7
version: 0.1.7
@@ -431,11 +431,11 @@ importers:
specifier: 16.3.1
version: 16.3.1
drizzle-orm:
- specifier: 0.27.2
- version: 0.27.2(@libsql/[email protected])
+ specifier: 0.28.2
+ version: 0.28.2(@libsql/[email protected])
drizzle-zod:
- specifier: 0.4.4
+ specifier: 0.5.0
zod:
specifier: 3.21.4
version: 3.21.4
@@ -447,8 +447,8 @@ importers:
specifier: 4.0.7
version: 4.0.7
drizzle-kit:
- specifier: 0.19.10
- version: 0.19.10
+ specifier: 0.19.12
+ version: 0.19.12
encoding:
specifier: 0.1.13
version: 0.1.13
@@ -5054,53 +5054,53 @@ packages:
engines: {node: '>= 10'}
dev: false
- resolution: {integrity: sha512-FyVNQGLLsNourpYq7bojvvvpM63woCPL9c+lJo9x1Yheop5fng2GEyiVcVjCmBNk5tVARHjG9bTG1UeNF5t8OQ==}
+ resolution: {integrity: sha512-OSblNfeI0Z9ERn3usgLV2x63CwwPoNOHf1FQK85cOT7F8MNaWyEHoEv7tHUwNGJwyzKXmpU+ockZ0movzX3D0g==}
peerDependencies:
- '@trpc/server': 10.35.0
+ '@trpc/server': 10.37.1
dependencies:
- '@trpc/server': 10.35.0
+ '@trpc/server': 10.37.1
dev: false
- resolution: {integrity: sha512-mUp7OrsF/vwxPOjZ6lP4X0XVxXA8N7PaWys6NgigUaKsGZ9pht5QyQNfprVpIv7PnSknLuICY/fKEBL9+zfH3A==}
+ resolution: {integrity: sha512-0KEgr09mBfao56lkj7ZBfVOY86d3+bDH1o0zJkDHSH60Dp/hIJ7wLCnZJIhePlZxEwknCQjVeLsTy4Pqlu8NyQ==}
peerDependencies:
'@tanstack/react-query': ^4.18.0
- '@trpc/client': 10.35.0
- '@trpc/react-query': 10.35.0
- '@trpc/server': 10.35.0
+ '@trpc/client': 10.37.1
+ '@trpc/react-query': 10.37.1
+ '@trpc/server': 10.37.1
next: '*'
react: '>=16.8.0'
react-dom: '>=16.8.0'
dependencies:
'@tanstack/react-query': 4.32.1([email protected])([email protected])
- '@trpc/client': 10.35.0(@trpc/[email protected])
- '@trpc/react-query': 10.35.0(@tanstack/[email protected])(@trpc/[email protected])(@trpc/[email protected])([email protected])([email protected])
- '@trpc/server': 10.35.0
+ '@trpc/client': 10.37.1(@trpc/[email protected])
+ '@trpc/react-query': 10.37.1(@tanstack/[email protected])(@trpc/[email protected])(@trpc/[email protected])([email protected])([email protected])
+ '@trpc/server': 10.37.1
react: 18.2.0
react-dom: 18.2.0([email protected])
react-ssr-prepass: 1.5.0([email protected])
dev: false
- resolution: {integrity: sha512-tPC14UAIlrMlPZgN5TGOzcgqI4dEBUaJSmc+PjLmLfP+7vcNwOweCSdvq9gsDBCZf9aYq3Bf6KFi90ej+0ZUjQ==}
+ resolution: {integrity: sha512-TbOOPp0fZVaKfaeEyDoV8QeTHW1vgPTbfOs0uSQ4AzBXqXPu+9v1B44z8GGRJSdUxuOX9pG/6Ap5Kx8PQ3eF+Q==}
peerDependencies:
'@tanstack/react-query': ^4.18.0
- '@trpc/client': 10.35.0
- '@trpc/server': 10.35.0
+ '@trpc/client': 10.37.1
+ '@trpc/server': 10.37.1
react: '>=16.8.0'
react-dom: '>=16.8.0'
dependencies:
'@tanstack/react-query': 4.32.1([email protected])([email protected])
- '@trpc/client': 10.35.0(@trpc/[email protected])
- '@trpc/server': 10.35.0
+ '@trpc/client': 10.37.1(@trpc/[email protected])
+ '@trpc/server': 10.37.1
react: 18.2.0
react-dom: 18.2.0([email protected])
dev: false
- resolution: {integrity: sha512-UntbE9gG+kB2nEwuJ0hw7AmQuRWw67voKaVBPBA7Ow6+aGZc00gva7015Ey5BT7Qf1wq7xJMLUdgw4QiVU+VpQ==}
+ resolution: {integrity: sha512-r3VeA319/braYMBIzj+XLgLKQ9lJSVglvPvP9HUv4kr5w6Y5grQMxMcExhTiZWltE9bnSJHKtBBzHafOo7KC8A==}
dev: false
/@tsconfig/[email protected]:
@@ -7244,8 +7244,8 @@ packages:
wordwrap: 1.0.0
dev: true
- resolution: {integrity: sha512-v7bd+7YUO3NJJTY7hwt9k+DPJVw+31iejG/ztkvNS0hK8zWjJvA6NAECYZVswKQ+efCjzLgPCx+I9X105Zqt6Q==}
+ resolution: {integrity: sha512-rcsmh5gUIkvuD0WrbEc+aLpqY2q2J8ltynRcJiJo2l01hhsYvPnX0sgxWlFXlfAIa5ZXNw2nJZhYlslI6tG3MA==}
hasBin: true
dependencies:
'@drizzle-team/studio': 0.0.5
@@ -7264,8 +7264,8 @@ packages:
- supports-color
dev: true
- resolution: {integrity: sha512-ZvBvceff+JlgP7FxHKe0zOU9CkZ4RcOtibumIrqfYzDGuOeF0YUY0F9iMqYpRM7pxnLRfC+oO7rWOUH3T5oFQA==}
+ resolution: {integrity: sha512-QRyuzvpJr7GE6LpvZ/sg2nAKNg2if1uGGkgFTiXn4auuYId//vVJe6HBsDTktfKfcaDGzIYos+/f+PS5EkBmrg==}
peerDependencies:
'@aws-sdk/client-rds-data': '>=3'
'@cloudflare/workers-types': '>=3'
@@ -7329,13 +7329,13 @@ packages:
dev: false
- resolution: {integrity: sha512-XNn0mjQ306Hvg+CuyKV98wnsWBWeTqv+kgE/N79Zj0EdCvjD2kaoN5sFDGFkMVqPQuP7IB1IPs0lEcOij1RvBA==}
+ resolution: {integrity: sha512-gIOXclphhaleYFEGZFxSyJBoiPRyksGyIPgmgWz6a+j5JeaOrOf1QOPjf1p5AHYA+1O3Q01ondGOZfgObxBTsg==}
peerDependencies:
drizzle-orm: '>=0.23.13'
zod: '*'
dependencies:
- drizzle-orm: 0.27.2(@libsql/[email protected])
+ drizzle-orm: 0.28.2(@libsql/[email protected])
zod: 3.21.4
dev: false