feedback

Author: msukkari

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed issue with external source code links being broken for paths with spaces. [#364](https://github.com/sourcebot-dev/sourcebot/pull/364)
+- Revamped onboarding experience. [#370](https://github.com/sourcebot-dev/sourcebot/pull/376)
 
 ## [4.5.0] - 2025-06-21
 

docs/docs/configuration/auth/inviting-members.mdx

@@ -7,7 +7,7 @@ There are various ways to configure how members can join a Sourcebot deployment.
 
 ## Member Approval 
 
-**By default, Sourcebot requires new members to be approved by the owner of the deploymen**. This section explains how approvals work and how
+**By default, Sourcebot requires new members to be approved by the owner of the deployment**. This section explains how approvals work and how
 to configure this behavior.
 
 ### Configuration

packages/web/src/app/api/(server)/onboarded/route.ts

@@ -2,12 +2,14 @@
 
 import { withAuth } from "@/actions";
 import { isServiceError } from "@/lib/utils";
-import { orgNotFound } from "@/lib/serviceError";
+import { orgNotFound, ServiceError } from "@/lib/serviceError";
 import { sew } from "@/actions";
 import { addUserToOrganization } from "@/lib/authUtils";
 import { prisma } from "@/prisma";
+import { StatusCodes } from "http-status-codes";
+import { ErrorCode } from "@/lib/errorCodes";
 
-export const joinOrganization = (orgId: number) => sew(async () =>
+export const joinOrganization = (orgId: number, inviteLinkId: string) => sew(async () =>
     withAuth(async (userId) => {
         const org = await prisma.org.findUnique({
             where: {
@@ -19,6 +21,22 @@ export const joinOrganization = (orgId: number) => sew(async () =>
             return orgNotFound();
         }
 
+        if (!org.inviteLinkEnabled) {
+            return {
+                statusCode: StatusCodes.BAD_REQUEST,
+                errorCode: ErrorCode.INVITE_LINK_NOT_ENABLED,
+                message: "Invite link is not enabled.",
+            } satisfies ServiceError;
+        }
+
+        if (org.inviteLinkId !== inviteLinkId) {
+            return {
+                statusCode: StatusCodes.BAD_REQUEST,
+                errorCode: ErrorCode.INVALID_INVITE_LINK,
+                message: "Invalid invite link.",
+            } satisfies ServiceError;
+        }
+
         const addUserToOrgRes = await addUserToOrganization(userId, org.id);
         if (isServiceError(addUserToOrgRes)) {
             return addUserToOrgRes;

packages/web/src/app/invite/actions.ts

@@ -9,7 +9,7 @@ import { joinOrganization } from "../actions";
 import { isServiceError } from "@/lib/utils";
 import { SINGLE_TENANT_ORG_DOMAIN, SINGLE_TENANT_ORG_ID } from "@/lib/constants";
 
-export function JoinOrganizationButton() {
+export function JoinOrganizationButton({ inviteLinkId }: { inviteLinkId: string }) {
     const [isLoading, setIsLoading] = useState(false);
     const router = useRouter();
     const { toast } = useToast();
@@ -18,7 +18,7 @@ export function JoinOrganizationButton() {
         setIsLoading(true);
 
         try {
-            const result = await joinOrganization(SINGLE_TENANT_ORG_ID);
+            const result = await joinOrganization(SINGLE_TENANT_ORG_ID, inviteLinkId);
 
             if (isServiceError(result)) {
                 toast({

packages/web/src/app/invite/components/joinOrganizationButton.tsx

@@ -52,7 +52,7 @@ export default async function InvitePage({ searchParams }: InvitePageProps) {
     return (
         <div className="min-h-screen flex items-center justify-center p-6">
             <LogoutEscapeHatch className="absolute top-0 right-0 p-6" />
-            <JoinInvitationCard />
+            <JoinInvitationCard inviteLinkId={inviteLinkId} />
         </div>
     );
 }
@@ -86,7 +86,7 @@ function WelcomeCard({ inviteLinkId, providers }: { inviteLinkId: string; provid
     );
 }
 
-function JoinInvitationCard() {
+function JoinInvitationCard({ inviteLinkId }: { inviteLinkId: string }) {
     return (
         <div className="min-h-screen bg-gradient-to-br from-[var(--background)] to-[var(--accent)]/30 flex items-center justify-center p-6">
             <Card className="w-full max-w-md">
@@ -99,7 +99,7 @@ function JoinInvitationCard() {
                             Welcome to Sourcebot! Click the button below to join this organization.
                         </p>
                     </div>
-                    <JoinOrganizationButton />
+                    <JoinOrganizationButton inviteLinkId={inviteLinkId} />
                 </CardContent>
             </Card>
         </div>

packages/web/src/app/invite/page.tsx

@@ -18,6 +18,8 @@ export enum ErrorCode {
     CONNECTION_ALREADY_EXISTS = 'CONNECTION_ALREADY_EXISTS',
     OWNER_CANNOT_LEAVE_ORG = 'OWNER_CANNOT_LEAVE_ORG',
     INVALID_INVITE = 'INVALID_INVITE',
+    INVALID_INVITE_LINK = 'INVALID_INVITE_LINK',
+    INVITE_LINK_NOT_ENABLED = 'INVITE_LINK_NOT_ENABLED',
     STRIPE_CHECKOUT_ERROR = 'STRIPE_CHECKOUT_ERROR',
     SECRET_ALREADY_EXISTS = 'SECRET_ALREADY_EXISTS',
     SUBSCRIPTION_ALREADY_EXISTS = 'SUBSCRIPTION_ALREADY_EXISTS',