Merge pull request #405 from RBND-studio/dev

Merge dev

apps/app/package.json

@@ -23,7 +23,7 @@
     "@radix-ui/react-slot": "^1.0.2",
     "@rbnd/react-dark-mode": "^2.0.1",
     "@supabase/ssr": "^0.3.0",
-    "@supabase/supabase-js": "^2.43.4",
+    "@supabase/supabase-js": "^2.43.5",
     "@visx/axis": "^3.10.1",
     "@visx/event": "^3.3.0",
     "@visx/group": "^3.3.0",
@@ -35,10 +35,10 @@
     "icons": "workspace:*",
     "monaco-editor": "^0.49.0",
     "next": "14.2.3",
-    "posthog-js": "^1.137.0",
+    "posthog-js": "^1.139.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-hook-form": "^7.51.5",
+    "react-hook-form": "^7.52.0",
     "shared": "workspace:*",
     "sharp": "^0.33.4",
     "swr": "^2.2.5",
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@next/eslint-plugin-next": "14.2.3",
     "@pandacss/dev": "0.39.2",
-    "@types/node": "^20.12.12",
+    "@types/node": "^20.14.5",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "eslint-config-custom": "workspace:*",

apps/app/src/app/(dashboard)/accept-invite/[inviteId]/page.tsx

@@ -0,0 +1,25 @@
+import { DashboardError } from "components/ui/dashboard-error";
+import { api } from "lib/api";
+import { load } from "lib/load";
+import { redirect } from "next/navigation";
+import { routes } from "routes";
+
+type Props = {
+  params: { inviteId: string };
+};
+
+export default async function AcceptInvitePage({
+  params: { inviteId },
+}: Props): Promise<JSX.Element> {
+  try {
+    const res = await load(api["POST /invites/:inviteId/accept"](inviteId));
+    redirect(routes.organization({ organizationId: res.organization_id }));
+  } catch (err) {
+    return (
+      <DashboardError
+        title="Error accepting invite"
+        errorMessage={err instanceof Error ? err.message : "Something went wrong"}
+      />
+    );
+  }
+}

apps/app/src/app/(dashboard)/org/[organizationId]/(detail)/settings/invite-resend.tsx

@@ -2,6 +2,7 @@
 
 import { useSend } from "hooks/use-send";
 import { api } from "lib/api";
+import { useRouter } from "next/navigation";
 import type { FC } from "react";
 import { t } from "translations";
 import { Button, toast } from "ui";
@@ -12,6 +13,7 @@ type Props = {
 };
 
 export const InviteResend: FC<Props> = ({ email, organizationId }) => {
+  const router = useRouter();
   const { send, loading } = useSend();
   const handleResend = async (): Promise<void> => {
     const res = await send(
@@ -20,6 +22,7 @@ export const InviteResend: FC<Props> = ({ email, organizationId }) => {
     );
     if (res.error) return;
     toast.success(t.toasts.inviteSent);
+    router.refresh();
   };
 
   return (

apps/app/src/app/(dashboard)/org/[organizationId]/(detail)/settings/organization-members.tsx

@@ -54,14 +54,21 @@ export const OrganizationMembers: FC<Props> = ({ users, org }) => {
           </Text>
           {/* TODO: @opesicka make this nicer */}
           <Flex direction="column" gap="space12" mb="space16">
-            {pending_invites.map((invite) => (
-              <Flex alignItems="center" gap="space8" key={invite.id}>
-                <Text>{invite.email}</Text>
-                <Text>Expires {timeFromNow(invite.expires_at)}</Text>
-                <InviteResend email={invite.email} organizationId={org.id} />
-                <InviteDelete inviteId={invite.id} />
-              </Flex>
-            ))}
+            {pending_invites.map((invite) => {
+              const expired = new Date(invite.expires_at) < new Date();
+              return (
+                <Flex alignItems="center" gap="space8" key={invite.id}>
+                  <Text>{invite.email}</Text>
+                  {expired ? (
+                    <Text color="danger">Expired</Text>
+                  ) : (
+                    <Text>Expires {timeFromNow(invite.expires_at)}</Text>
+                  )}
+                  <InviteResend email={invite.email} organizationId={org.id} />
+                  <InviteDelete inviteId={invite.id} />
+                </Flex>
+              );
+            })}
           </Flex>
         </>
       ) : null}

apps/app/src/components/ui/dashboard-error.tsx

@@ -0,0 +1,26 @@
+import { Flex } from "@flows/styled-system/jsx";
+import Link from "next/link";
+import { type FC } from "react";
+import { routes } from "routes";
+import { Button, Text } from "ui";
+
+type Props = {
+  title: string;
+  errorMessage: string;
+};
+
+export const DashboardError: FC<Props> = ({ errorMessage, title }) => {
+  return (
+    <Flex align="center" justifyContent="center" direction="column" height="100vh">
+      <Text mb="space8" variant="titleL">
+        {title}
+      </Text>
+      <Text color="muted" mb="space24">
+        {errorMessage}
+      </Text>
+      <Button asChild>
+        <Link href={routes.home}>Go back</Link>
+      </Button>
+    </Flex>
+  );
+};

apps/app/src/components/ui/page-error.tsx

@@ -23,7 +23,7 @@ export const PageError: FC<Props> = ({ error, reset, title }) => {
     });
 
   return (
-    <Flex align="center" direction="column">
+    <Flex align="center" justifyContent="center" direction="column" height="100vh">
       <Text className={css({ mb: "space16" })} variant="titleL">
         {title}
       </Text>

apps/backend/package.json

@@ -54,7 +54,7 @@
     "@types/cors": "^2.8.17",
     "@types/jest": "^29.5.12",
     "@types/jsonwebtoken": "^9.0.6",
-    "@types/node": "^20.12.12",
+    "@types/node": "^20.14.5",
     "@types/supertest": "^6.0.2",
     "concurrently": "^8.2.2",
     "dotenv": "^16.4.5",

apps/backend/src/app.module.ts

@@ -23,13 +23,7 @@ import { ProjectsModule } from "./projects/projects.module";
 import { SdkModule } from "./sdk/sdk.module";
 import { UsersModule } from "./users/users.module";
 
-const publicRoutes: string[] = [
-  "/sdk/flows",
-  "/sdk/events",
-  "/sdk/events/:eventId",
-  "/sdk/flows/:flowId",
-  "/sdk/flows/:flowId/draft",
-];
+const publicRoutes: string[] = ["/v(.)/sdk/(.*)", "/sdk/(.*)"];
 
 const isTest = process.env.NODE_ENV === "test";
 

apps/backend/src/email/email.service.ts

@@ -11,14 +11,16 @@ export class EmailService {
 
   async sendInvite({
     organizationName,
+    inviteId,
     email,
   }: {
+    inviteId: string;
     organizationName: string;
     email: string;
   }): Promise<ReturnType<LoopsClient["sendTransactionalEmail"]>> {
     return this.loops.sendTransactionalEmail("clpxmw7h70012jo0pp0pe0hb5", email, {
       orgName: organizationName,
-      acceptUrl: process.env.BACKEND_APP_URL,
+      acceptUrl: `${process.env.BACKEND_APP_URL}/accept-invite/${inviteId}`,
     });
   }
 

apps/backend/src/lib/origin.ts

@@ -1,4 +1,8 @@
-export const isLocalhost = (origin: string): boolean =>
-  ["http://localhost", "https://localhost", "http://127.0.0.1", "https://127.0.0.1"].some((o) =>
-    origin.startsWith(o),
+export const isLocalhost = (origin: string): boolean => {
+  const url = new URL(origin);
+  const originWithoutPort = `${url.protocol}//${url.hostname}`;
+
+  return ["http://localhost", "https://localhost", "http://127.0.0.1", "https://127.0.0.1"].some(
+    (o) => o === originWithoutPort,
   );
+};

apps/backend/src/lib/too-many-requests-exception.ts

@@ -0,0 +1,7 @@
+import { HttpException, HttpStatus } from "@nestjs/common";
+
+export class TooManyRequestsException extends HttpException {
+  constructor(message?: string) {
+    super(message ?? "Too Many Requests", HttpStatus.TOO_MANY_REQUESTS);
+  }
+}

apps/backend/src/main.ts

@@ -1,4 +1,4 @@
-import { ValidationPipe } from "@nestjs/common";
+import { ValidationPipe, VersioningType } from "@nestjs/common";
 import { NestFactory } from "@nestjs/core";
 import type { NestFastifyApplication } from "@nestjs/platform-fastify";
 import { FastifyAdapter } from "@nestjs/platform-fastify";
@@ -11,6 +11,9 @@ async function bootstrap(): Promise<void> {
   const app = await NestFactory.create<NestFastifyApplication>(AppModule, new FastifyAdapter(), {
     rawBody: true,
   });
+  app.enableVersioning({
+    type: VersioningType.URI,
+  });
 
   app.useGlobalPipes(
     new ValidationPipe({

apps/backend/src/organizations/organizations.controller.spec.ts

@@ -240,16 +240,6 @@ describe("Invite user", () => {
       organizationsController.inviteUser({ userId: "userId" }, "org1", { email: "email" }),
     ).rejects.toThrow("User already in organization");
   });
-  it("should throw with user already invited", async () => {
-    db.query.userInvite.findFirst.mockResolvedValue({ id: "inviteId" });
-    await expect(
-      organizationsController.inviteUser({ userId: "userId" }, "org1", { email: "email" }),
-    ).resolves.toBeUndefined();
-    expect(emailService.sendInvite).toHaveBeenCalledWith({
-      email: "email",
-      organizationName: "org",
-    });
-  });
   it("should create invite and send email", async () => {
     await expect(
       organizationsController.inviteUser({ userId: "userId" }, "org1", { email: "email" }),
@@ -258,6 +248,7 @@ describe("Invite user", () => {
     expect(emailService.sendInvite).toHaveBeenCalledWith({
       email: "email",
       organizationName: "org",
+      inviteId: "inviteId",
     });
   });
 });

apps/backend/src/organizations/organizations.service.ts

@@ -13,7 +13,7 @@ import {
   subscriptions,
   userInvite,
 } from "db";
-import { and, desc, eq, exists, gt, inArray, sql } from "drizzle-orm";
+import { and, desc, eq, exists, inArray, sql } from "drizzle-orm";
 import { alias } from "drizzle-orm/pg-core";
 
 import type { Auth } from "../auth";
@@ -271,23 +271,29 @@ export class OrganizationsService {
     );
     if (userAlreadyInOrg) throw new ConflictException("User already in organization");
 
-    const existingInvite = await this.databaseService.db.query.userInvite.findFirst({
-      where: and(
-        eq(userInvite.organization_id, organizationId),
-        eq(userInvite.email, email),
-        gt(userInvite.expires_at, sql`now()`),
-      ),
+    let invite = await this.databaseService.db.query.userInvite.findFirst({
+      columns: { id: true },
+      where: and(eq(userInvite.organization_id, organizationId), eq(userInvite.email, email)),
     });
 
-    if (!existingInvite) {
-      await this.databaseService.db.insert(userInvite).values({
-        email,
-        organization_id: organizationId,
-        expires_at: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7), // 7 days
-      });
+    const expires_at = new Date(Date.now() + 1000 * 60 * 60 * 24 * 7); // 7 days
+
+    if (invite) {
+      await this.databaseService.db
+        .update(userInvite)
+        .set({ expires_at })
+        .where(eq(userInvite.id, invite.id));
+    } else {
+      const newInvites = await this.databaseService.db
+        .insert(userInvite)
+        .values({ email, organization_id: organizationId, expires_at })
+        .returning({ id: userInvite.id });
+      const newInvite = newInvites.at(0);
+      if (!newInvite) throw new InternalServerErrorException();
+      invite = newInvite;
     }
 
-    await this.emailService.sendInvite({ email, organizationName: org.name });
+    await this.emailService.sendInvite({ email, organizationName: org.name, inviteId: invite.id });
   }
 
   async leaveOrganization({
@@ -377,10 +383,7 @@ export class OrganizationsService {
         columns: {},
       }),
       this.databaseService.db.query.userInvite.findMany({
-        where: and(
-          eq(userInvite.organization_id, organizationId),
-          gt(userInvite.expires_at, sql`now()`),
-        ),
+        where: eq(userInvite.organization_id, organizationId),
         columns: {
           email: true,
           id: true,