feat: add organisations (#1820)

apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx

@@ -156,8 +156,8 @@ export default function SignatureDisclosure() {
 
       <div className="mt-8">
         <Button asChild>
-          <Link to="/documents">
-            <Trans>Back to Documents</Trans>
+          <Link to="/">
+            <Trans>Back home</Trans>
           </Link>
         </Button>
       </div>

apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx

@@ -0,0 +1,100 @@
+import { Trans } from '@lingui/react/macro';
+import { OrganisationMemberInviteStatus } from '@prisma/client';
+import { Link } from 'react-router';
+
+import { prisma } from '@documenso/prisma';
+import { Button } from '@documenso/ui/primitives/button';
+
+import type { Route } from './+types/organisation.decline.$token';
+
+export async function loader({ params }: Route.LoaderArgs) {
+  const { token } = params;
+
+  if (!token) {
+    return {
+      state: 'InvalidLink',
+    } as const;
+  }
+
+  const organisationMemberInvite = await prisma.organisationMemberInvite.findUnique({
+    where: {
+      token,
+    },
+    include: {
+      organisation: {
+        select: {
+          name: true,
+        },
+      },
+    },
+  });
+
+  if (!organisationMemberInvite) {
+    return {
+      state: 'InvalidLink',
+    } as const;
+  }
+
+  if (organisationMemberInvite.status !== OrganisationMemberInviteStatus.DECLINED) {
+    await prisma.organisationMemberInvite.update({
+      where: {
+        id: organisationMemberInvite.id,
+      },
+      data: {
+        status: OrganisationMemberInviteStatus.DECLINED,
+      },
+    });
+  }
+
+  return {
+    state: 'Success',
+    organisationName: organisationMemberInvite.organisation.name,
+  } as const;
+}
+
+export default function DeclineInvitationPage({ loaderData }: Route.ComponentProps) {
+  const data = loaderData;
+
+  if (data.state === 'InvalidLink') {
+    return (
+      <div className="w-screen max-w-lg px-4">
+        <div className="w-full">
+          <h1 className="text-4xl font-semibold">
+            <Trans>Invalid token</Trans>
+          </h1>
+
+          <p className="text-muted-foreground mb-4 mt-2 text-sm">
+            <Trans>This token is invalid or has expired. No action is needed.</Trans>
+          </p>
+
+          <Button asChild>
+            <Link to="/">
+              <Trans>Return</Trans>
+            </Link>
+          </Button>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="w-screen max-w-lg px-4">
+      <h1 className="text-4xl font-semibold">
+        <Trans>Invitation declined</Trans>
+      </h1>
+
+      <p className="text-muted-foreground mb-4 mt-2 text-sm">
+        <Trans>
+          You have declined the invitation from <strong>{data.organisationName}</strong> to join
+          their organisation.
+        </Trans>
+      </p>
+
+      <Button asChild>
+        <Link to="/">
+          <Trans>Return to Home</Trans>
+        </Link>
+      </Button>
+    </div>
+  );
+}

apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx

@@ -1,16 +1,12 @@
 import { Trans } from '@lingui/react/macro';
-import { TeamMemberInviteStatus } from '@prisma/client';
-import { DateTime } from 'luxon';
 import { Link } from 'react-router';
 
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { encryptSecondaryData } from '@documenso/lib/server-only/crypto/encrypt';
-import { acceptTeamInvitation } from '@documenso/lib/server-only/team/accept-team-invitation';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
+import { acceptOrganisationInvitation } from '@documenso/lib/server-only/organisation/accept-organisation-invitation';
 import { prisma } from '@documenso/prisma';
 import { Button } from '@documenso/ui/primitives/button';
 
-import type { Route } from './+types/team.invite.$token';
+import type { Route } from './+types/organisation.invite.$token';
 
 export async function loader({ params, request }: Route.LoaderArgs) {
   const session = await getOptionalSession(request);
@@ -23,24 +19,29 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     } as const;
   }
 
-  const teamMemberInvite = await prisma.teamMemberInvite.findUnique({
+  const organisationMemberInvite = await prisma.organisationMemberInvite.findUnique({
     where: {
       token,
     },
+    include: {
+      organisation: {
+        select: {
+          name: true,
+        },
+      },
+    },
   });
 
-  if (!teamMemberInvite) {
+  if (!organisationMemberInvite) {
     return {
       state: 'InvalidLink',
     } as const;
   }
 
-  const team = await getTeamById({ teamId: teamMemberInvite.teamId });
-
   const user = await prisma.user.findFirst({
     where: {
       email: {
-        equals: teamMemberInvite.email,
+        equals: organisationMemberInvite.email,
         mode: 'insensitive',
       },
     },
@@ -48,32 +49,14 @@ export async function loader({ params, request }: Route.LoaderArgs) {
 
   // Directly convert the team member invite to a team member if they already have an account.
   if (user) {
-    await acceptTeamInvitation({ userId: user.id, teamId: team.id });
+    await acceptOrganisationInvitation({ token: organisationMemberInvite.token });
   }
 
-  // For users who do not exist yet, set the team invite status to accepted, which is checked during
-  // user creation to determine if we should add the user to the team at that time.
-  if (!user && teamMemberInvite.status !== TeamMemberInviteStatus.ACCEPTED) {
-    await prisma.teamMemberInvite.update({
-      where: {
-        id: teamMemberInvite.id,
-      },
-      data: {
-        status: TeamMemberInviteStatus.ACCEPTED,
-      },
-    });
-  }
-
-  const email = encryptSecondaryData({
-    data: teamMemberInvite.email,
-    expiresAt: DateTime.now().plus({ days: 1 }).toMillis(),
-  });
-
   if (!user) {
     return {
       state: 'LoginRequired',
-      email,
-      teamName: team.name,
+      email: organisationMemberInvite.email,
+      organisationName: organisationMemberInvite.organisation.name,
     } as const;
   }
 
@@ -81,8 +64,8 @@ export async function loader({ params, request }: Route.LoaderArgs) {
 
   return {
     state: 'Success',
-    email,
-    teamName: team.name,
+    email: organisationMemberInvite.email,
+    organisationName: organisationMemberInvite.organisation.name,
     isSessionUserTheInvitedUser,
   } as const;
 }
@@ -118,12 +101,13 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
     return (
       <div>
         <h1 className="text-4xl font-semibold">
-          <Trans>Team invitation</Trans>
+          <Trans>Organisation invitation</Trans>
         </h1>
 
         <p className="text-muted-foreground mt-2 text-sm">
           <Trans>
-            You have been invited by <strong>{data.teamName}</strong> to join their team.
+            You have been invited by <strong>{data.organisationName}</strong> to join their
+            organisation.
           </Trans>
         </p>
 
@@ -132,7 +116,7 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
         </p>
 
         <Button asChild>
-          <Link to={`/signup?email=${encodeURIComponent(data.email)}`}>
+          <Link to={`/signup#email=${encodeURIComponent(data.email)}`}>
             <Trans>Create account</Trans>
           </Link>
         </Button>
@@ -148,7 +132,8 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
 
       <p className="text-muted-foreground mb-4 mt-2 text-sm">
         <Trans>
-          You have accepted an invitation from <strong>{data.teamName}</strong> to join their team.
+          You have accepted an invitation from <strong>{data.organisationName}</strong> to join
+          their organisation.
         </Trans>
       </p>
 
@@ -160,7 +145,7 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
         </Button>
       ) : (
         <Button asChild>
-          <Link to={`/signin?email=${encodeURIComponent(data.email)}`}>
+          <Link to={`/signin#email=${encodeURIComponent(data.email)}`}>
             <Trans>Continue to login</Trans>
           </Link>
         </Button>

apps/remix/app/routes/_unauthenticated+/signin.tsx

@@ -27,7 +27,7 @@ export async function loader({ request }: Route.LoaderArgs) {
   const oidcProviderLabel = OIDC_PROVIDER_LABEL;
 
   if (isAuthenticated) {
-    throw redirect('/documents');
+    throw redirect('/');
   }
 
   return {

apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx

@@ -1,165 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { TeamMemberInviteStatus } from '@prisma/client';
-import { DateTime } from 'luxon';
-import { Link } from 'react-router';
-
-import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { encryptSecondaryData } from '@documenso/lib/server-only/crypto/encrypt';
-import { declineTeamInvitation } from '@documenso/lib/server-only/team/decline-team-invitation';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
-import { prisma } from '@documenso/prisma';
-import { Button } from '@documenso/ui/primitives/button';
-
-import type { Route } from './+types/team.decline.$token';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const session = await getOptionalSession(request);
-
-  const { token } = params;
-
-  if (!token) {
-    return {
-      state: 'InvalidLink',
-    } as const;
-  }
-
-  const teamMemberInvite = await prisma.teamMemberInvite.findUnique({
-    where: {
-      token,
-    },
-  });
-
-  if (!teamMemberInvite) {
-    return {
-      state: 'InvalidLink',
-    } as const;
-  }
-
-  const team = await getTeamById({ teamId: teamMemberInvite.teamId });
-
-  const user = await prisma.user.findFirst({
-    where: {
-      email: {
-        equals: teamMemberInvite.email,
-        mode: 'insensitive',
-      },
-    },
-  });
-
-  if (user) {
-    await declineTeamInvitation({ userId: user.id, teamId: team.id });
-  }
-
-  if (!user && teamMemberInvite.status !== TeamMemberInviteStatus.DECLINED) {
-    await prisma.teamMemberInvite.update({
-      where: {
-        id: teamMemberInvite.id,
-      },
-      data: {
-        status: TeamMemberInviteStatus.DECLINED,
-      },
-    });
-  }
-
-  const email = encryptSecondaryData({
-    data: teamMemberInvite.email,
-    expiresAt: DateTime.now().plus({ days: 1 }).toMillis(),
-  });
-
-  if (!user) {
-    return {
-      state: 'LoginRequired',
-      email,
-      teamName: team.name,
-    } as const;
-  }
-
-  const isSessionUserTheInvitedUser = user.id === session?.user?.id;
-
-  return {
-    state: 'Success',
-    email,
-    teamName: team.name,
-    isSessionUserTheInvitedUser,
-  } as const;
-}
-
-export default function DeclineInvitationPage({ loaderData }: Route.ComponentProps) {
-  const data = loaderData;
-
-  if (data.state === 'InvalidLink') {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="text-4xl font-semibold">
-            <Trans>Invalid token</Trans>
-          </h1>
-
-          <p className="text-muted-foreground mb-4 mt-2 text-sm">
-            <Trans>This token is invalid or has expired. No action is needed.</Trans>
-          </p>
-
-          <Button asChild>
-            <Link to="/">
-              <Trans>Return</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  if (data.state === 'LoginRequired') {
-    return (
-      <div>
-        <h1 className="text-4xl font-semibold">
-          <Trans>Team invitation</Trans>
-        </h1>
-
-        <p className="text-muted-foreground mt-2 text-sm">
-          <Trans>
-            You have been invited by <strong>{data.teamName}</strong> to join their team.
-          </Trans>
-        </p>
-
-        <p className="text-muted-foreground mb-4 mt-1 text-sm">
-          <Trans>To decline this invitation you must create an account.</Trans>
-        </p>
-
-        <Button asChild>
-          <Link to={`/signup?email=${encodeURIComponent(data.email)}`}>
-            <Trans>Create account</Trans>
-          </Link>
-        </Button>
-      </div>
-    );
-  }
-
-  return (
-    <div className="w-screen max-w-lg px-4">
-      <h1 className="text-4xl font-semibold">
-        <Trans>Invitation declined</Trans>
-      </h1>
-
-      <p className="text-muted-foreground mb-4 mt-2 text-sm">
-        <Trans>
-          You have declined the invitation from <strong>{data.teamName}</strong> to join their team.
-        </Trans>
-      </p>
-
-      {data.isSessionUserTheInvitedUser ? (
-        <Button asChild>
-          <Link to="/">
-            <Trans>Return to Dashboard</Trans>
-          </Link>
-        </Button>
-      ) : (
-        <Button asChild>
-          <Link to="/">
-            <Trans>Return to Home</Trans>
-          </Link>
-        </Button>
-      )}
-    </div>
-  );
-}

apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx

@@ -1,154 +1,28 @@
 import { Trans } from '@lingui/react/macro';
 import { Link } from 'react-router';
 
-import { transferTeamOwnership } from '@documenso/lib/server-only/team/transfer-team-ownership';
-import { isTokenExpired } from '@documenso/lib/utils/token-verification';
-import { prisma } from '@documenso/prisma';
 import { Button } from '@documenso/ui/primitives/button';
 
 import type { Route } from './+types/team.verify.transfer.$token';
 
-export async function loader({ params }: Route.LoaderArgs) {
-  const { token } = params;
-
-  if (!token) {
-    return {
-      state: 'InvalidLink',
-    } as const;
-  }
-
-  const teamTransferVerification = await prisma.teamTransferVerification.findUnique({
-    where: {
-      token,
-    },
-    include: {
-      team: true,
-    },
-  });
-
-  if (!teamTransferVerification || isTokenExpired(teamTransferVerification.expiresAt)) {
-    return {
-      state: 'InvalidLink',
-    } as const;
-  }
-
-  if (teamTransferVerification.completed) {
-    return {
-      state: 'AlreadyCompleted',
-      teamName: teamTransferVerification.team.name,
-    } as const;
-  }
-
-  const { team } = teamTransferVerification;
-
-  let isTransferError = false;
-
-  try {
-    await transferTeamOwnership({ token });
-  } catch (e) {
-    console.error(e);
-    isTransferError = true;
-  }
-
-  if (isTransferError) {
-    return {
-      state: 'TransferError',
-      teamName: team.name,
-    } as const;
-  }
-
-  return {
-    state: 'Success',
-    teamName: team.name,
-    teamUrl: team.url,
-  } as const;
-}
-
 export default function VerifyTeamTransferPage({ loaderData }: Route.ComponentProps) {
-  const data = loaderData;
-
-  if (data.state === 'InvalidLink') {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="text-4xl font-semibold">
-            <Trans>Invalid link</Trans>
-          </h1>
-
-          <p className="text-muted-foreground mb-4 mt-2 text-sm">
-            <Trans>
-              This link is invalid or has expired. Please contact your team to resend a transfer
-              request.
-            </Trans>
-          </p>
-
-          <Button asChild>
-            <Link to="/">
-              <Trans>Return</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  if (data.state === 'AlreadyCompleted') {
-    return (
-      <div>
+  return (
+    <div className="w-screen max-w-lg px-4">
+      <div className="w-full">
         <h1 className="text-4xl font-semibold">
-          <Trans>Team ownership transfer already completed!</Trans>
+          <Trans>Invalid link</Trans>
         </h1>
 
         <p className="text-muted-foreground mb-4 mt-2 text-sm">
-          <Trans>
-            You have already completed the ownership transfer for <strong>{data.teamName}</strong>.
-          </Trans>
+          <Trans>This link is invalid or has expired.</Trans>
         </p>
 
         <Button asChild>
           <Link to="/">
-            <Trans>Continue</Trans>
+            <Trans>Return</Trans>
           </Link>
         </Button>
       </div>
-    );
-  }
-
-  if (data.state === 'TransferError') {
-    return (
-      <div>
-        <h1 className="text-4xl font-semibold">
-          <Trans>Team ownership transfer</Trans>
-        </h1>
-
-        <p className="text-muted-foreground mt-2 text-sm">
-          <Trans>
-            Something went wrong while attempting to transfer the ownership of team{' '}
-            <strong>{data.teamName}</strong> to your. Please try again later or contact support.
-          </Trans>
-        </p>
-      </div>
-    );
-  }
-
-  return (
-    <div>
-      <h1 className="text-4xl font-semibold">
-        <Trans>Team ownership transferred!</Trans>
-      </h1>
-
-      <p className="text-muted-foreground mb-4 mt-2 text-sm">
-        <Trans>
-          The ownership of team <strong>{data.teamName}</strong> has been successfully transferred
-          to you.
-        </Trans>
-      </p>
-
-      <Button asChild>
-        <Link to={`/t/${data.teamUrl}/settings`}>
-          <Trans>Continue</Trans>
-        </Link>
-      </Button>
     </div>
   );
 }