feedback

Author: msukkari

docs/docs/configuration/auth/overview.mdx

@@ -10,7 +10,7 @@ Sourcebot's built-in authentication system gates your deployment, and allows adm
     <Card horizontal title="Authentication providers" icon="lock" href="/docs/configuration/auth/providers">
         Configure additional authentication providers for your deployment.
     </Card>
-    <Card horizontal title="Inviting members" icon="user" href="/docs/configuration/auth/providers">
+    <Card horizontal title="Inviting members" icon="user" href="/docs/configuration/auth/inviting-members">
         Learn how to configure how members join your deployment.
     </Card>
     <Card horizontal title="Roles and permissions" icon="shield" href="/docs/configuration/auth/roles-and-permissions">

packages/web/src/actions.ts

@@ -1142,19 +1142,11 @@ export const cancelInvite = async (inviteId: string, domain: string): Promise<{
     ));
 
 export const getOrgInviteId = async (domain: string) => sew(() =>
-    withAuth(async () => {
-        const org = await prisma.org.findUnique({
-            where: {
-                domain: domain,
-            },
-        });
-
-        if (!org) {
-            return notFound();
-        }
-
-        return org.inviteLinkId;
-    }));
+    withAuth(async (userId) =>
+        withOrgMembership(userId, domain, async ({ org }) => {
+            return org.inviteLinkId;
+        }, /* minRequiredRole = */ OrgRole.OWNER)
+    ));
 
 export const getMe = async () => sew(() =>
     withAuth(async (userId) => {
@@ -1443,19 +1435,6 @@ export const removeMemberFromOrg = async (memberId: string, domain: string): Pro
                     }
                 });
 
-                // TODO: The fact that pendingApproval is set in the user is a bit weird here, since it will prevent approval from working in the multi-tenant case.
-                // We need to set pendingApproval to be true here though so that if the user tries to sign into the deployment again it will send another request. Without
-                // this, the user will never be able to request to join the org again.
-                // TODO(multitenant): Handle this better
-                await tx.user.update({
-                    where: {
-                        id: memberId,
-                    },
-                    data: {
-                        pendingApproval: true,
-                    }
-                });
-
                 if (IS_BILLING_ENABLED) {
                     const result = await decrementOrgSeatCount(org.id, tx);
                     if (isServiceError(result)) {
@@ -1601,14 +1580,6 @@ export const createAccountRequest = async (userId: string, domain: string) => se
         return notFound("User not found");
     }
 
-    if (user.pendingApproval == false) {
-        logger.warn(`User ${userId} isn't pending approval. Skipping account request creation.`);
-        return {
-            success: true,
-            existingRequest: false,
-        }
-    }
-
     const org = await prisma.org.findUnique({
         where: {
             domain,

packages/web/src/app/[domain]/components/resubmitAccountRequestButton.tsx

@@ -43,8 +43,8 @@ export function SubmitAccountRequestButton({ domain, userId }: SubmitButtonProps
                 description: `There was an error submitting your request. Reason: ${result.message}`,
                 variant: "destructive",
             })
-            setIsSubmitting(false)
         }
+        setIsSubmitting(false)
     }
 
     return (

packages/web/src/app/[domain]/components/submitAccountRequestButton.tsx

@@ -8,7 +8,7 @@ import { LoadingButton } from "@/components/ui/loading-button";
 interface ProviderButtonProps {
     name: string;
     logo: { src: string, className?: string } | null;
-    onClick: () => void;
+    onClick: () => void | Promise<void>;
     className?: string;
     context: "login" | "signup";
 }
@@ -22,12 +22,18 @@ export const ProviderButton = ({
 }: ProviderButtonProps) => {
     const [isLoading, setIsLoading] = useState(false);
 
+    const handleClick = async () => {
+        setIsLoading(true);
+        try {
+            await onClick();
+        } finally {
+            setIsLoading(false);
+        }
+    };
+
     return (
         <LoadingButton
-            onClick={() => {
-                setIsLoading(true);
-                onClick();
-            }}
+            onClick={handleClick}
             className={cn("w-full", className)}
             variant="outline"
             loading={isLoading}

packages/web/src/app/components/providerButton.tsx

@@ -57,37 +57,6 @@ export default async function InvitePage({ searchParams }: InvitePageProps) {
     );
 }
 
-function InvalidInviteCard({ message }: { message: 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">
-                <CardHeader className="text-center">
-                    <SourcebotLogo className="h-12 mb-4 mx-auto" size="large" />
-                    <CardTitle className="text-xl font-semibold text-[var(--destructive)]">
-                        Invalid Invitation
-                    </CardTitle>
-                </CardHeader>
-                <CardContent className="text-center space-y-4">
-                    <p className="text-[var(--muted-foreground)]">
-                        {message}
-                    </p>
-                    <div className="p-4 rounded-lg bg-[var(--destructive)]/10 border border-[var(--destructive)]/20">
-                        <p className="text-sm text-[var(--destructive)] flex items-center gap-2">
-                            <svg className="w-4 h-4 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L3.732 16c-.77.833.192 2.5 1.732 2.5z" />
-                            </svg>
-                            Please contact your administrator for a valid invitation link.
-                        </p>
-                    </div>
-                    <Button asChild className="w-full">
-                        <a href="/login">Return to Login</a>
-                    </Button>
-                </CardContent>
-            </Card>
-        </div>
-    );
-}
-
 function WelcomeCard({ inviteLinkId, providers }: { inviteLinkId: string; providers: import("@/lib/authProviders").AuthProvider[] }) {
     return (    
         <div className="min-h-screen bg-gradient-to-br from-[var(--background)] to-[var(--accent)]/30 flex items-center justify-center p-6">

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

@@ -9,9 +9,7 @@ import { isServiceError } from "@/lib/utils"
 import { useToast } from "@/components/hooks/use-toast"
 import { InviteLinkToggle } from "@/app/components/inviteLinkToggle"
 
-interface MemberApprovalRequiredToggleProps {}
-
-export function MemberApprovalRequiredToggle({}: MemberApprovalRequiredToggleProps) {
+export function MemberApprovalRequiredToggle() {
     const [enabled, setEnabled] = useState(false)
     const [isLoading, setIsLoading] = useState(false)
     const [isInitializing, setIsInitializing] = useState(true)