chore: used AI to deslop AI

.env.example

@@ -180,20 +180,6 @@ NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP=
 NEXT_PUBLIC_DISABLE_OIDC_SIGNUP=
 # OPTIONAL: Comma-separated list of email domains allowed to sign up (e.g., example.com,acme.org).
 NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS=
-# OPTIONAL: Set to "true" to disable all signin methods (email, Google, Microsoft, OIDC).
-NEXT_PUBLIC_DISABLE_SIGNIN=
-# OPTIONAL: Set to "true" to disable email/password signin only. Also closes /forgot-password and /reset-password.
-NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN=
-# OPTIONAL: Set to "true" to hide the Google signin button.
-NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN=
-# OPTIONAL: Set to "true" to hide the Microsoft signin button.
-NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN=
-# OPTIONAL: Set to "true" to hide the OIDC signin button.
-NEXT_PUBLIC_DISABLE_OIDC_SIGNIN=
-# OPTIONAL: When OIDC is the only enabled signin transport, /signin auto-redirects
-# to the OIDC provider (rendering only a spinner). Set to "true" to disable this
-# and keep showing the signin page.
-NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT=
 # OPTIONAL: Set to true to use internal webapp url in browserless requests.
 NEXT_PUBLIC_USE_INTERNAL_URL_BROWSERLESS=false
 

apps/docs/content/docs/self-hosting/configuration/environment.mdx

@@ -272,12 +272,6 @@ For detailed certificate setup, see [Signing Certificate](/docs/self-hosting/con
 | `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP`       | Block new accounts via Microsoft. Existing linked users can still sign in           | `false` |
 | `NEXT_PUBLIC_DISABLE_OIDC_SIGNUP`            | Block new accounts via OIDC, including the organisation portal                      | `false` |
 | `NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS`        | Comma-separated list of email domains allowed to sign up (e.g., `example.com,acme.org`) |         |
-| `NEXT_PUBLIC_DISABLE_SIGNIN`                 | Master switch. Disable all signin methods application-wide                          | `false` |
-| `NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN`  | Disable email/password signin. Also closes `/forgot-password` and `/reset-password` | `false` |
-| `NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN`          | Hide the Google signin button                                                       | `false` |
-| `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN`       | Hide the Microsoft signin button                                                    | `false` |
-| `NEXT_PUBLIC_DISABLE_OIDC_SIGNIN`            | Hide the OIDC signin button                                                         | `false` |
-| `NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT`     | Disable the automatic `/signin` redirect when OIDC is the only enabled transport    | `false` |
 | `NEXT_PUBLIC_POSTHOG_KEY`             | PostHog API key for analytics and feature flags                                     |         |
 | `NEXT_PUBLIC_FEATURE_BILLING_ENABLED` | Enable billing features                                                             | `false` |
 
@@ -309,44 +303,6 @@ NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP="true"
 NEXT_PUBLIC_DISABLE_SIGNUP="true"
 ```
 
-### Sign-in Restrictions
-
-You can control which methods are available for users to sign in with the following environment variables:
-
-- **`NEXT_PUBLIC_DISABLE_SIGNIN`** (master switch): Set to `true` to block all signin methods (email/password, Google, Microsoft, OIDC). Hides every signin entry point on `/signin` and rejects email/password signin server-side with a `SIGNIN_DISABLED` error.
-- **`NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN`**: Set to `true` to disable email/password signin only. The email/password form is hidden, the `/forgot-password` and `/reset-password` pages redirect to `/signin`, and the corresponding server endpoints reject requests. SSO signin is unaffected.
-- **`NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN`**, **`NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN`**, **`NEXT_PUBLIC_DISABLE_OIDC_SIGNIN`**: Set to `true` to hide the matching SSO button on the signin page. Useful when an SSO provider is kept configured for account linking but not advertised as a signin entry point.
-
-These flags are opt-in: when none are set, signin behaviour is unchanged from a stock Documenso instance.
-
-```bash
-# Allow only OIDC signin (e.g. enterprise SSO-only)
-NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN="true"
-NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN="true"
-NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN="true"
-
-# Or disable signin entirely
-NEXT_PUBLIC_DISABLE_SIGNIN="true"
-```
-
-### OIDC Auto-redirect
-
-When OIDC is the only enabled signin transport on your instance, `/signin` automatically redirects users straight to the OIDC provider instead of showing the signin form. The page renders a spinner while the redirect happens. No extra configuration is required — disabling every other signin method is enough to trigger it.
-
-- **`NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT`**: Set to `true` to opt out of the automatic redirect and keep rendering the signin page even when OIDC is the only enabled transport.
-
-The redirect only triggers when OIDC is configured and email/password, Google, and Microsoft signin are all disabled. If any other transport remains enabled, the signin form is shown as normal.
-
-```bash
-# OIDC-only signin: disabling all other methods auto-redirects to the provider
-NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN="true"
-NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN="true"
-NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN="true"
-
-# Opt out of the auto-redirect while still OIDC-only
-# NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT="true"
-```
-
 ---
 
 ## AI Features
@@ -490,16 +446,6 @@ NEXT_PRIVATE_SIGNING_PASSPHRASE="your-certificate-password"
 # NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP="true"
 # NEXT_PUBLIC_DISABLE_OIDC_SIGNUP="true"
 # NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS="example.com,acme.org"
-
-# Sign-in restrictions (optional)
-# NEXT_PUBLIC_DISABLE_SIGNIN="true"
-# NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN="true"
-# NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN="true"
-# NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN="true"
-# NEXT_PUBLIC_DISABLE_OIDC_SIGNIN="true"
-
-# Opt out of the automatic OIDC redirect when OIDC is the only enabled transport (optional)
-# NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT="true"
 ```
 
 ---

apps/docs/content/docs/self-hosting/deployment/docker-compose.mdx

@@ -163,19 +163,6 @@ NEXT_PUBLIC_DISABLE_SIGNUP=false
 # NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP=true
 # NEXT_PUBLIC_DISABLE_OIDC_SIGNUP=true
 # NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS=example.com,acme.org
-
-# Signin restrictions (optional)
-# Master switch — disables every signin method
-# NEXT_PUBLIC_DISABLE_SIGNIN=true
-# Per-method switches (optional). Each disables that signin path.
-# NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN=true
-# NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN=true
-# NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN=true
-# NEXT_PUBLIC_DISABLE_OIDC_SIGNIN=true
-
-# When OIDC is the only enabled transport, /signin auto-redirects to the provider.
-# Set this to opt out and keep showing the signin page (optional).
-# NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT=true
 ```
 
 <Callout type="info">Generate secure secrets using: `openssl rand -base64 32`</Callout>

apps/docs/content/docs/self-hosting/deployment/docker.mdx

@@ -112,12 +112,6 @@ See [Email Configuration](/docs/self-hosting/configuration/email) for other tran
 | `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP`      | Block new accounts via Microsoft OAuth                         | `false`                   |
 | `NEXT_PUBLIC_DISABLE_OIDC_SIGNUP`           | Block new accounts via OIDC (incl. organisation portal)        | `false`                   |
 | `NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS`       | Comma-separated list of allowed signup email domains           |                           |
-| `NEXT_PUBLIC_DISABLE_SIGNIN`                | Master switch — disable all signin methods                     | `false`                   |
-| `NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN` | Disable email/password signin only                             | `false`                   |
-| `NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN`         | Hide the Google signin button                                  | `false`                   |
-| `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN`      | Hide the Microsoft signin button                               | `false`                   |
-| `NEXT_PUBLIC_DISABLE_OIDC_SIGNIN`           | Hide the OIDC signin button                                    | `false`                   |
-| `NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT`    | Disable auto-redirect to OIDC when it is the only transport     | `false`                   |
 
 For the complete list, see [Environment Variables](/docs/self-hosting/configuration/environment).
 

apps/docs/content/docs/self-hosting/deployment/railway.mdx

@@ -159,12 +159,6 @@ NEXT_PRIVATE_SMTP_FROM_ADDRESS=noreply@yourdomain.com
 | `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP`| Block new accounts via Microsoft OAuth                 | `false` |
 | `NEXT_PUBLIC_DISABLE_OIDC_SIGNUP`     | Block new accounts via OIDC (incl. organisation portal)| `false` |
 | `NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS` | Comma-separated list of allowed signup email domains   |         |
-| `NEXT_PUBLIC_DISABLE_SIGNIN`          | Master switch — disable all signin methods             | `false` |
-| `NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN` | Disable email/password signin only                     | `false` |
-| `NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN`   | Hide the Google signin button                          | `false` |
-| `NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN`| Hide the Microsoft signin button                       | `false` |
-| `NEXT_PUBLIC_DISABLE_OIDC_SIGNIN`     | Hide the OIDC signin button                            | `false` |
-| `NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT` | Disable auto-redirect to OIDC when it is the only transport | `false` |
 | `NEXT_PRIVATE_SIGNING_PASSPHRASE`     | Passphrase for signing certificate                     | -       |
 | `DOCUMENSO_DISABLE_TELEMETRY`     | Disable anonymous telemetry        | `false` |
 

apps/remix/app/components/forms/signin.tsx

@@ -58,7 +58,6 @@ export type TSignInFormSchema = z.infer<typeof ZSignInFormSchema>;
 export type SignInFormProps = {
   className?: string;
   initialEmail?: string;
-  isEmailPasswordSigninEnabled?: boolean;
   isGoogleSSOEnabled?: boolean;
   isMicrosoftSSOEnabled?: boolean;
   isOIDCSSOEnabled?: boolean;
@@ -69,7 +68,6 @@ export type SignInFormProps = {
 export const SignInForm = ({
   className,
   initialEmail,
-  isEmailPasswordSigninEnabled = true,
   isGoogleSSOEnabled,
   isMicrosoftSSOEnabled,
   isOIDCSSOEnabled,
@@ -326,78 +324,66 @@ export const SignInForm = ({
     <Form {...form}>
       <form className={cn('flex w-full flex-col gap-y-4', className)} onSubmit={form.handleSubmit(onFormSubmit)}>
         <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting || isPasskeyLoading}>
-          {isEmailPasswordSigninEnabled && (
-            <>
-              <FormField
-                control={form.control}
-                name="email"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>
-                      <Trans>Email</Trans>
-                    </FormLabel>
+          <FormField
+            control={form.control}
+            name="email"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <Trans>Email</Trans>
+                </FormLabel>
 
-                    <FormControl>
-                      <Input type="email" {...field} />
-                    </FormControl>
+                <FormControl>
+                  <Input type="email" {...field} />
+                </FormControl>
 
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
+                <FormMessage />
+              </FormItem>
+            )}
+          />
 
-              <FormField
-                control={form.control}
-                name="password"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>
-                      <Trans>Password</Trans>
-                    </FormLabel>
+          <FormField
+            control={form.control}
+            name="password"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <Trans>Password</Trans>
+                </FormLabel>
 
-                    <FormControl>
-                      <PasswordInput {...field} />
-                    </FormControl>
+                <FormControl>
+                  <PasswordInput {...field} />
+                </FormControl>
 
-                    <FormMessage />
+                <FormMessage />
 
-                    <p className="mt-2 text-right">
-                      <Link
-                        to="/forgot-password"
-                        className="text-muted-foreground text-sm duration-200 hover:opacity-70"
-                      >
-                        <Trans>Forgot your password?</Trans>
-                      </Link>
-                    </p>
-                  </FormItem>
-                )}
-              />
+                <p className="mt-2 text-right">
+                  <Link to="/forgot-password" className="text-muted-foreground text-sm duration-200 hover:opacity-70">
+                    <Trans>Forgot your password?</Trans>
+                  </Link>
+                </p>
+              </FormItem>
+            )}
+          />
 
-              {turnstileSiteKey && !isTwoFactorAuthenticationDialogOpen && (
-                <Turnstile
-                  ref={turnstileRef}
-                  siteKey={turnstileSiteKey}
-                  options={{
-                    size: 'flexible',
-                    appearance: 'always',
-                  }}
-                />
-              )}
-
-              <Button
-                type="submit"
-                size="lg"
-                loading={isSubmitting}
-                className="dark:bg-documenso dark:hover:opacity-90"
-              >
-                {isSubmitting ? <Trans>Signing in...</Trans> : <Trans>Sign In</Trans>}
-              </Button>
-            </>
+          {turnstileSiteKey && !isTwoFactorAuthenticationDialogOpen && (
+            <Turnstile
+              ref={turnstileRef}
+              siteKey={turnstileSiteKey}
+              options={{
+                size: 'flexible',
+                appearance: 'always',
+              }}
+            />
           )}
 
+          <Button type="submit" size="lg" loading={isSubmitting} className="dark:bg-documenso dark:hover:opacity-90">
+            {isSubmitting ? <Trans>Signing in...</Trans> : <Trans>Sign In</Trans>}
+          </Button>
+
           {!isEmbeddedRedirect && (
             <>
-              {isEmailPasswordSigninEnabled && hasSocialAuthEnabled && (
+              {hasSocialAuthEnabled && (
                 <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
                   <div className="h-px flex-1 bg-border" />
                   <span className="bg-transparent text-muted-foreground">

apps/remix/app/routes/_unauthenticated+/forgot-password.tsx

@@ -1,7 +1,6 @@
-import { isSigninEnabledForProvider } from '@documenso/lib/constants/auth';
 import { msg } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
-import { Link, redirect } from 'react-router';
+import { Link } from 'react-router';
 
 import { ForgotPasswordForm } from '~/components/forms/forgot-password';
 import { appMetaTags } from '~/utils/meta';
@@ -10,14 +9,6 @@ export function meta() {
   return appMetaTags(msg`Forgot Password`);
 }
 
-export async function loader() {
-  if (!isSigninEnabledForProvider('email')) {
-    throw redirect('/signin');
-  }
-
-  return null;
-}
-
 export default function ForgotPasswordPage() {
   return (
     <div className="w-screen max-w-lg px-4">

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

@@ -1,15 +1,98 @@
-import { redirect } from 'react-router';
+import { prisma } from '@documenso/prisma';
+import { Button } from '@documenso/ui/primitives/button';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationMemberInviteStatus } from '@prisma/client';
+import { Link } from 'react-router';
 
 import type { Route } from './+types/organisation.decline.$token';
 
-export function loader({ params }: Route.LoaderArgs) {
+export async function loader({ params }: Route.LoaderArgs) {
   const { token } = params;
 
   if (!token) {
-    throw redirect('/');
+    return {
+      state: 'InvalidLink',
+    } as const;
   }
 
-  // Declining now happens on the invite page via tRPC. Redirect there with the
-  // `action=decline` flag so it renders the decline-only view (no accept).
-  throw redirect(`/organisation/invite/${token}?action=decline`);
+  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="font-semibold text-4xl">
+            <Trans>Invalid token</Trans>
+          </h1>
+
+          <p className="mt-2 mb-4 text-muted-foreground 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="font-semibold text-4xl">
+        <Trans>Invitation declined</Trans>
+      </h1>
+
+      <p className="mt-2 mb-4 text-muted-foreground 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,15 +1,9 @@
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { acceptOrganisationInvitation } from '@documenso/lib/server-only/organisation/accept-organisation-invitation';
 import { prisma } from '@documenso/prisma';
-import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import { Trans, useLingui } from '@lingui/react/macro';
-import { OrganisationMemberInviteStatus } from '@prisma/client';
-import { useState } from 'react';
-import { Link, useSearchParams } from 'react-router';
-import { match } from 'ts-pattern';
+import { Trans } from '@lingui/react/macro';
+import { Link } from 'react-router';
 
 import type { Route } from './+types/organisation.invite.$token';
 
@@ -43,22 +37,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     } as const;
   }
 
-  const organisationName = organisationMemberInvite.organisation.name;
-
-  if (organisationMemberInvite.status === OrganisationMemberInviteStatus.ACCEPTED) {
-    return {
-      state: 'AlreadyAccepted',
-      organisationName,
-    } as const;
-  }
-
-  if (organisationMemberInvite.status === OrganisationMemberInviteStatus.DECLINED) {
-    return {
-      state: 'AlreadyDeclined',
-      organisationName,
-    } as const;
-  }
-
   const user = await prisma.user.findFirst({
     where: {
       email: {
@@ -71,13 +49,26 @@ 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 acceptOrganisationInvitation({ token: organisationMemberInvite.token });
+  }
+
+  if (!user) {
+    return {
+      state: 'LoginRequired',
+      email: organisationMemberInvite.email,
+      organisationName: organisationMemberInvite.organisation.name,
+    } as const;
+  }
+
+  const isSessionUserTheInvitedUser = user.id === session.user?.id;
+
   return {
-    state: 'Pending',
-    token: organisationMemberInvite.token,
+    state: 'Success',
     email: organisationMemberInvite.email,
-    organisationName,
-    userExists: user !== null,
-    isSessionUserTheInvitedUser: user !== null && user.id === session.user?.id,
+    organisationName: organisationMemberInvite.organisation.name,
+    isSessionUserTheInvitedUser,
   } as const;
 }
 
@@ -106,253 +97,57 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
     );
   }
 
-  if (data.state === 'AlreadyAccepted') {
+  if (data.state === 'LoginRequired') {
     return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="font-semibold text-4xl">
-            <Trans>Invitation already accepted</Trans>
-          </h1>
-
-          <p className="mt-2 mb-4 text-muted-foreground text-sm">
-            <Trans>
-              You are already a member of <strong>{data.organisationName}</strong>.
-            </Trans>
-          </p>
-
-          <Button asChild>
-            <Link to="/">
-              <Trans>Continue</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  if (data.state === 'AlreadyDeclined') {
-    return <InvitationDeclined organisationName={data.organisationName} />;
-  }
-
-  return (
-    <PendingInvitation
-      token={data.token}
-      email={data.email}
-      organisationName={data.organisationName}
-      userExists={data.userExists}
-      isSessionUserTheInvitedUser={data.isSessionUserTheInvitedUser}
-    />
-  );
-}
-
-type PendingInvitationProps = {
-  token: string;
-  email: string;
-  organisationName: string;
-  userExists: boolean;
-  isSessionUserTheInvitedUser: boolean;
-};
-
-type InvitationResult = 'idle' | 'accepted' | 'declined';
-
-type AcceptFailureReason = 'CapExceeded' | 'SubscriptionInactive' | 'Unknown';
-
-const PendingInvitation = ({
-  token,
-  email,
-  organisationName,
-  userExists,
-  isSessionUserTheInvitedUser,
-}: PendingInvitationProps) => {
-  const { t } = useLingui();
-  const { toast } = useToast();
-  const { refreshSession } = useOptionalSession();
-
-  const [searchParams] = useSearchParams();
-  const actionIsDecline = searchParams.get('action') === 'decline';
-
-  const [result, setResult] = useState<InvitationResult>('idle');
-  const [acceptFailureReason, setAcceptFailureReason] = useState<AcceptFailureReason | null>(null);
-
-  const acceptInvitation = trpc.organisation.member.invite.accept.useMutation({
-    onSuccess: async () => {
-      await refreshSession();
-
-      setResult('accepted');
-    },
-    onError: (err) => {
-      const error = AppError.parseError(err);
-
-      const failureReason = match(error.code)
-        .with(AppErrorCode.LIMIT_EXCEEDED, () => 'CapExceeded' as const)
-        .with('SUBSCRIPTION_INACTIVE', () => 'SubscriptionInactive' as const)
-        .otherwise(() => 'Unknown' as const);
-
-      setAcceptFailureReason(failureReason);
-    },
-  });
-
-  const declineInvitation = trpc.organisation.member.invite.decline.useMutation({
-    onSuccess: async () => {
-      await refreshSession();
-
-      setResult('declined');
-    },
-    onError: () => {
-      toast({
-        title: t`Something went wrong`,
-        description: t`Unable to decline this invitation at this time.`,
-        variant: 'destructive',
-        duration: 10000,
-      });
-    },
-  });
-
-  if (result === 'accepted') {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="font-semibold text-4xl">
-            <Trans>Invitation accepted!</Trans>
-          </h1>
-
-          <p className="mt-2 mb-4 text-muted-foreground text-sm">
-            <Trans>
-              You have accepted an invitation from <strong>{organisationName}</strong> to join their organisation.
-            </Trans>
-          </p>
-
-          {isSessionUserTheInvitedUser ? (
-            <Button asChild>
-              <Link to="/">
-                <Trans>Continue</Trans>
-              </Link>
-            </Button>
-          ) : (
-            <Button asChild>
-              <Link to={`/signin#email=${encodeURIComponent(email)}`}>
-                <Trans>Continue to login</Trans>
-              </Link>
-            </Button>
-          )}
-        </div>
-      </div>
-    );
-  }
-
-  if (result === 'declined') {
-    return <InvitationDeclined organisationName={organisationName} />;
-  }
-
-  // Accepting requires an account (acceptance keys off the invited email).
-  // Declining does not, so we only gate account creation on the accept flow.
-  if (!actionIsDecline && !userExists) {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="font-semibold text-4xl">
-            <Trans>Organisation invitation</Trans>
-          </h1>
-
-          <p className="mt-2 text-muted-foreground text-sm">
-            <Trans>
-              You have been invited by <strong>{organisationName}</strong> to join their organisation.
-            </Trans>
-          </p>
-
-          <p className="mt-1 mb-4 text-muted-foreground text-sm">
-            <Trans>To accept this invitation you must create an account.</Trans>
-          </p>
-
-          <Button asChild>
-            <Link to={`/signup#email=${encodeURIComponent(email)}`}>
-              <Trans>Create account</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  const isPending = acceptInvitation.isPending || declineInvitation.isPending;
-
-  return (
-    <div className="w-screen max-w-lg px-4">
-      <div className="w-full">
+      <div>
         <h1 className="font-semibold text-4xl">
           <Trans>Organisation invitation</Trans>
         </h1>
 
-        <p className="mt-2 mb-4 text-muted-foreground text-sm">
+        <p className="mt-2 text-muted-foreground text-sm">
           <Trans>
-            You have been invited to join <strong>{organisationName}</strong> on Documenso.
+            You have been invited by <strong>{data.organisationName}</strong> to join their organisation.
           </Trans>
         </p>
 
-        {acceptFailureReason && (
-          <p className="mt-2 mb-4 text-destructive text-sm">
-            {match(acceptFailureReason)
-              .with('CapExceeded', () => (
-                <Trans>
-                  <strong>{organisationName}</strong> has reached its member limit. Please contact the organisation
-                  administrator to upgrade their plan before accepting this invitation.
-                </Trans>
-              ))
-              .with('SubscriptionInactive', () => (
-                <Trans>
-                  <strong>{organisationName}</strong> does not have an active subscription. Please contact the
-                  organisation administrator to renew their plan before accepting this invitation.
-                </Trans>
-              ))
-              .with('Unknown', () => (
-                <Trans>
-                  We were unable to add you to <strong>{organisationName}</strong> at this time. Please try again later,
-                  or contact the organisation administrator.
-                </Trans>
-              ))
-              .exhaustive()}
-          </p>
-        )}
+        <p className="mt-1 mb-4 text-muted-foreground text-sm">
+          <Trans>To accept this invitation you must create an account.</Trans>
+        </p>
 
-        <div className="flex items-center gap-x-4">
-          <Button
-            variant="destructive"
-            onClick={async () => declineInvitation.mutateAsync({ token })}
-            loading={declineInvitation.isPending}
-            disabled={isPending}
-          >
-            <Trans>Decline</Trans>
-          </Button>
-
-          {!actionIsDecline && (
-            <Button
-              onClick={async () => acceptInvitation.mutateAsync({ token })}
-              loading={acceptInvitation.isPending}
-              disabled={isPending}
-            >
-              <Trans>Accept</Trans>
-            </Button>
-          )}
-        </div>
+        <Button asChild>
+          <Link to={`/signup#email=${encodeURIComponent(data.email)}`}>
+            <Trans>Create account</Trans>
+          </Link>
+        </Button>
       </div>
-    </div>
-  );
-};
+    );
+  }
 
-const InvitationDeclined = ({ organisationName }: { organisationName: string }) => {
   return (
-    <div className="w-screen max-w-lg px-4">
-      <div className="w-full">
-        <h1 className="font-semibold text-4xl">
-          <Trans>Invitation declined</Trans>
-        </h1>
+    <div>
+      <h1 className="font-semibold text-4xl">
+        <Trans>Invitation accepted!</Trans>
+      </h1>
 
-        <p className="mt-2 mb-4 text-muted-foreground text-sm">
-          <Trans>
-            You have declined the invitation from <strong>{organisationName}</strong> to join their organisation.
-          </Trans>
-        </p>
-      </div>
+      <p className="mt-2 mb-4 text-muted-foreground text-sm">
+        <Trans>
+          You have accepted an invitation from <strong>{data.organisationName}</strong> to join their organisation.
+        </Trans>
+      </p>
+
+      {data.isSessionUserTheInvitedUser ? (
+        <Button asChild>
+          <Link to="/">
+            <Trans>Continue</Trans>
+          </Link>
+        </Button>
+      ) : (
+        <Button asChild>
+          <Link to={`/signin#email=${encodeURIComponent(data.email)}`}>
+            <Trans>Continue to login</Trans>
+          </Link>
+        </Button>
+      )}
     </div>
   );
-};
+}

apps/remix/app/routes/_unauthenticated+/reset-password.$token.tsx

@@ -1,4 +1,3 @@
-import { isSigninEnabledForProvider } from '@documenso/lib/constants/auth';
 import { getResetTokenValidity } from '@documenso/lib/server-only/user/get-reset-token-validity';
 import { msg } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
@@ -14,10 +13,6 @@ export function meta() {
 }
 
 export async function loader({ params }: Route.LoaderArgs) {
-  if (!isSigninEnabledForProvider('email')) {
-    throw redirect('/signin');
-  }
-
   const { token } = params;
 
   const isValid = await getResetTokenValidity({ token });

apps/remix/app/routes/_unauthenticated+/reset-password._index.tsx

@@ -1,8 +1,7 @@
-import { isSigninEnabledForProvider } from '@documenso/lib/constants/auth';
 import { Button } from '@documenso/ui/primitives/button';
 import { msg } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
-import { Link, redirect } from 'react-router';
+import { Link } from 'react-router';
 
 import { appMetaTags } from '~/utils/meta';
 
@@ -10,14 +9,6 @@ export function meta() {
   return appMetaTags(msg`Reset Password`);
 }
 
-export async function loader() {
-  if (!isSigninEnabledForProvider('email')) {
-    throw redirect('/signin');
-  }
-
-  return null;
-}
-
 export default function ResetPasswordPage() {
   return (
     <div className="w-screen max-w-lg px-4">

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

@@ -1,11 +1,8 @@
-import { authClient } from '@documenso/auth/client';
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
 import {
   IS_GOOGLE_SSO_ENABLED,
   IS_MICROSOFT_SSO_ENABLED,
-  IS_OIDC_AUTO_REDIRECT_DISABLED,
   IS_OIDC_SSO_ENABLED,
-  isSigninEnabledForProvider,
   isSignupEnabledForProvider,
   OIDC_PROVIDER_LABEL,
 } from '@documenso/lib/constants/auth';
@@ -14,7 +11,6 @@ import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { Loader2Icon } from 'lucide-react';
 import { useEffect, useState } from 'react';
 import { Link, redirect, useSearchParams } from 'react-router';
 
@@ -32,20 +28,10 @@ export async function loader({ request }: Route.LoaderArgs) {
   const { isAuthenticated } = await getOptionalSession(request);
 
   // SSR env variables.
-  const isEmailPasswordSigninEnabled = isSigninEnabledForProvider('email');
-  const isGoogleSSOEnabled = IS_GOOGLE_SSO_ENABLED && isSigninEnabledForProvider('google');
-  const isMicrosoftSSOEnabled = IS_MICROSOFT_SSO_ENABLED && isSigninEnabledForProvider('microsoft');
-  const isOIDCSSOEnabled = IS_OIDC_SSO_ENABLED && isSigninEnabledForProvider('oidc');
-
-  // Automatically redirect to OIDC when it is the only enabled signin transport,
-  // unless the redirect has been explicitly disabled via env.
-  const isOIDCOnlyTransport =
-    isOIDCSSOEnabled && !isEmailPasswordSigninEnabled && !isGoogleSSOEnabled && !isMicrosoftSSOEnabled;
-
-  const shouldAutoRedirectToOIDC = isOIDCOnlyTransport && !IS_OIDC_AUTO_REDIRECT_DISABLED;
-
+  const isGoogleSSOEnabled = IS_GOOGLE_SSO_ENABLED;
+  const isMicrosoftSSOEnabled = IS_MICROSOFT_SSO_ENABLED;
+  const isOIDCSSOEnabled = IS_OIDC_SSO_ENABLED;
   const oidcProviderLabel = OIDC_PROVIDER_LABEL;
-
   const isSignupEnabled =
     isSignupEnabledForProvider('email') ||
     (IS_GOOGLE_SSO_ENABLED && isSignupEnabledForProvider('google')) ||
@@ -61,28 +47,18 @@ export async function loader({ request }: Route.LoaderArgs) {
   }
 
   return {
-    isEmailPasswordSigninEnabled,
     isGoogleSSOEnabled,
     isMicrosoftSSOEnabled,
     isOIDCSSOEnabled,
     isSignupEnabled,
     oidcProviderLabel,
     returnTo,
-    shouldAutoRedirectToOIDC,
   };
 }
 
 export default function SignIn({ loaderData }: Route.ComponentProps) {
-  const {
-    isEmailPasswordSigninEnabled,
-    isGoogleSSOEnabled,
-    isMicrosoftSSOEnabled,
-    isOIDCSSOEnabled,
-    isSignupEnabled,
-    oidcProviderLabel,
-    returnTo,
-    shouldAutoRedirectToOIDC,
-  } = loaderData;
+  const { isGoogleSSOEnabled, isMicrosoftSSOEnabled, isOIDCSSOEnabled, isSignupEnabled, oidcProviderLabel, returnTo } =
+    loaderData;
 
   const { _ } = useLingui();
 
@@ -100,27 +76,6 @@ export default function SignIn({ loaderData }: Route.ComponentProps) {
     setIsEmbeddedRedirect(params.get('embedded') === 'true');
   }, []);
 
-  useEffect(() => {
-    if (!shouldAutoRedirectToOIDC) {
-      return;
-    }
-
-    void authClient.oidc.signIn({ redirectPath: returnTo ?? '/' });
-  }, [shouldAutoRedirectToOIDC, returnTo]);
-
-  if (shouldAutoRedirectToOIDC) {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="flex flex-col items-center justify-center gap-y-4 py-12">
-          <Loader2Icon className="h-8 w-8 animate-spin text-muted-foreground" />
-          <p className="text-muted-foreground text-sm">
-            <Trans>Redirecting to {oidcProviderLabel || 'OIDC'}...</Trans>
-          </p>
-        </div>
-      </div>
-    );
-  }
-
   return (
     <div className="w-screen max-w-lg px-4">
       <div className="z-10 rounded-xl border border-border bg-neutral-100 p-6 dark:bg-background">
@@ -140,7 +95,6 @@ export default function SignIn({ loaderData }: Route.ComponentProps) {
         <hr className="-mx-6 my-4" />
 
         <SignInForm
-          isEmailPasswordSigninEnabled={isEmailPasswordSigninEnabled}
           isGoogleSSOEnabled={isGoogleSSOEnabled}
           isMicrosoftSSOEnabled={isMicrosoftSSOEnabled}
           isOIDCSSOEnabled={isOIDCSSOEnabled}

docker/production/compose.yml

@@ -64,12 +64,6 @@ services:
       - NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP=${NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP}
       - NEXT_PUBLIC_DISABLE_OIDC_SIGNUP=${NEXT_PUBLIC_DISABLE_OIDC_SIGNUP}
       - NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS=${NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS}
-      - NEXT_PUBLIC_DISABLE_SIGNIN=${NEXT_PUBLIC_DISABLE_SIGNIN}
-      - NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN=${NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN}
-      - NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN=${NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN}
-      - NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN=${NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN}
-      - NEXT_PUBLIC_DISABLE_OIDC_SIGNIN=${NEXT_PUBLIC_DISABLE_OIDC_SIGNIN}
-      - NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT=${NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT}
       - NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH=${NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH:-/opt/documenso/cert.p12}
       - NEXT_PRIVATE_SIGNING_PASSPHRASE=${NEXT_PRIVATE_SIGNING_PASSPHRASE}
       - NEXT_PUBLIC_USE_INTERNAL_URL_BROWSERLESS=${NEXT_PUBLIC_USE_INTERNAL_URL_BROWSERLESS}

packages/app-tests/e2e/envelope-editor-v2/envelope-recipient-autosave-race.spec.ts

@@ -0,0 +1,199 @@
+import { prisma } from '@documenso/prisma';
+import { expect, type Page, test } from '@playwright/test';
+
+import {
+  clickAddSignerButton,
+  clickEnvelopeEditorStep,
+  getRecipientEmailInputs,
+  openDocumentEnvelopeEditor,
+  setRecipientEmail,
+  setRecipientName,
+  type TEnvelopeEditorSurface,
+} from '../fixtures/envelope-editor';
+
+/**
+ * Reproduction for the recipient autosave race condition.
+ *
+ * Symptom (production only, where there is real network lag):
+ *   1. The author adds a recipient and types its name/email.
+ *   2. They navigate to the "Add Fields" step.
+ *   3. The recipient selector shows the default "Recipient 1" placeholder
+ *      instead of the recipient they just typed, and the typed name/email is
+ *      silently lost.
+ *
+ * Theory (see packages/lib/client-only/hooks/use-envelope-autosave.ts):
+ *   When the author navigates, `flushAutosave()` is awaited before the Add
+ *   Fields page renders. If an *earlier* (empty) recipient save is still
+ *   in-flight at that moment, `flush()` awaits that in-flight save and returns
+ *   WITHOUT committing the newer typed data sitting in `lastArgsRef` (whose
+ *   debounce timer it just cleared). The typed data is dropped, the empty
+ *   recipient persists, and the selector renders "Recipient 1".
+ *
+ * This only happens when a save is still in-flight at navigation time, which is
+ * why it never reproduces locally (fast saves) but does on a laggy network.
+ *
+ * The test below simulates that lag by holding the first `envelope.recipient.set`
+ * request open. It asserts the CORRECT behaviour (typed recipient survives), so
+ * it is RED while the bug exists and GREEN once the autosave hook is fixed.
+ */
+
+const RECIPIENT_SET_PROCEDURE = 'envelope.recipient.set';
+
+// How long to hold the first recipient autosave "in-flight" to emulate prod lag.
+const SIMULATED_NETWORK_LAG_MS = 5000;
+
+const FIRST_RECIPIENT = {
+  name: 'Alice Author',
+  email: 'alice-autosave-race@example.com',
+};
+
+const SECOND_RECIPIENT = {
+  name: 'Bob Builder',
+  email: 'bob-autosave-race@example.com',
+};
+
+type RecipientSetLagHandle = {
+  /** Resolves the instant the first recipient.set request is in-flight on the client. */
+  firstRecipientSetInFlight: Promise<void>;
+  /** Raw request bodies of every recipient.set call we intercepted. */
+  recipientSetRequestBodies: string[];
+};
+
+/**
+ * Installs a fake "production network lag" on the recipient autosave mutation.
+ *
+ * Only the FIRST recipient.set request is held open for `lagMs` (this is the save
+ * that must still be in-flight at navigation time for the race to occur). It
+ * resolves `firstRecipientSetInFlight` the instant it is intercepted so the test
+ * can keep typing while that save is pending. Subsequent recipient.set requests
+ * (e.g. the follow-up save the fixed hook issues) are forwarded immediately so the
+ * test does not pay the lag twice.
+ */
+const installRecipientSetLag = async (page: Page, lagMs: number): Promise<RecipientSetLagHandle> => {
+  let markFirstInFlight: () => void = () => {};
+
+  const firstRecipientSetInFlight = new Promise<void>((resolve) => {
+    markFirstInFlight = resolve;
+  });
+
+  const recipientSetRequestBodies: string[] = [];
+
+  await page.route('**/api/trpc/**', async (route) => {
+    const request = route.request();
+
+    if (request.method() !== 'POST' || !request.url().includes(RECIPIENT_SET_PROCEDURE)) {
+      await route.continue();
+      return;
+    }
+
+    const callIndex = recipientSetRequestBodies.length + 1;
+    recipientSetRequestBodies.push(request.postData() ?? '');
+
+    if (callIndex === 1) {
+      // eslint-disable-next-line no-console
+      console.log(`[test] holding first ${RECIPIENT_SET_PROCEDURE} for ${lagMs}ms (simulated network lag)`);
+
+      // The empty save is now in-flight from the client's perspective.
+      markFirstInFlight();
+
+      await new Promise((resolve) => setTimeout(resolve, lagMs));
+    } else {
+      // eslint-disable-next-line no-console
+      console.log(`[test] forwarding ${RECIPIENT_SET_PROCEDURE} #${callIndex} (no lag)`);
+    }
+
+    await route.continue();
+  });
+
+  return { firstRecipientSetInFlight, recipientSetRequestBodies };
+};
+
+const assertEnvelopeRecipientsPersisted = async (surface: TEnvelopeEditorSurface) => {
+  if (!surface.envelopeId) {
+    throw new Error('Expected the document editor surface to have an envelopeId');
+  }
+
+  const envelope = await prisma.envelope.findFirstOrThrow({
+    where: { id: surface.envelopeId },
+    include: {
+      recipients: {
+        orderBy: { signingOrder: 'asc' },
+      },
+    },
+  });
+
+  const persistedEmails = envelope.recipients.map((recipient) => recipient.email).filter(Boolean);
+
+  // eslint-disable-next-line no-console
+  console.log(
+    '[test] persisted recipients:',
+    JSON.stringify(
+      envelope.recipients.map((recipient) => ({ name: recipient.name, email: recipient.email })),
+      null,
+      2,
+    ),
+  );
+
+  expect(persistedEmails).toContain(FIRST_RECIPIENT.email);
+  expect(persistedEmails).toContain(SECOND_RECIPIENT.email);
+};
+
+test.describe('envelope editor recipient autosave race (network lag)', () => {
+  test('document editor: typed recipient survives navigation to Add Fields', async ({ page }) => {
+    const surface = await openDocumentEnvelopeEditor(page);
+
+    const { firstRecipientSetInFlight, recipientSetRequestBodies } = await installRecipientSetLag(
+      page,
+      SIMULATED_NETWORK_LAG_MS,
+    );
+
+    // 1. Add a second signer row. A blank document already has one empty default
+    //    signer, so this schedules an autosave of TWO empty recipients
+    //    (name='' / email='') - this is the save that will be in-flight.
+    await clickAddSignerButton(surface.root);
+    await expect(getRecipientEmailInputs(surface.root)).toHaveCount(2);
+
+    // 2. Wait until that empty autosave is actually in-flight on the client. This
+    //    is the precondition the bug needs: a slow save holding the autosave lock.
+    await firstRecipientSetInFlight;
+
+    // 3. The author now fills in the recipients they are adding.
+    await setRecipientName(surface.root, 0, FIRST_RECIPIENT.name);
+    await setRecipientEmail(surface.root, 0, FIRST_RECIPIENT.email);
+    await setRecipientName(surface.root, 1, SECOND_RECIPIENT.name);
+    await setRecipientEmail(surface.root, 1, SECOND_RECIPIENT.email);
+
+    // 4. Immediately navigate to Add Fields (before the typed data's debounce
+    //    fires). flushAutosave() awaits the in-flight EMPTY save; with the bug
+    //    present it returns without ever committing the typed data.
+    await clickEnvelopeEditorStep(surface.root, 'addFields');
+
+    // 5. Wait for the Add Fields page to render (after the lagged flush resolves).
+    await expect(surface.root.getByText('Selected Recipient')).toBeVisible({
+      timeout: SIMULATED_NETWORK_LAG_MS + 15000,
+    });
+
+    // Diagnostics - the request bodies show what actually reached the server.
+    // Buggy: only the first (empty) save is ever sent. Fixed: a follow-up save
+    // carrying the typed recipients is sent too.
+    // eslint-disable-next-line no-console
+    console.log('\n===== AUTOSAVE RACE DIAGNOSTICS =====');
+    // eslint-disable-next-line no-console
+    console.log(`recipient.set requests sent to server: ${recipientSetRequestBodies.length}`);
+    // eslint-disable-next-line no-console
+    console.log(
+      `server ever received "${FIRST_RECIPIENT.email}": ${recipientSetRequestBodies.some((body) => body.includes(FIRST_RECIPIENT.email))}`,
+    );
+    // eslint-disable-next-line no-console
+    console.log('=====================================\n');
+
+    // 6. THE USER-VISIBLE BUG: the selected recipient must be the one we typed
+    //    (Alice), not the default "Recipient 1" placeholder.
+    const selectedRecipientSection = surface.root.locator('section').filter({ hasText: 'Selected Recipient' });
+
+    await expect(selectedRecipientSection.getByRole('combobox')).toContainText(FIRST_RECIPIENT.name);
+
+    // 7. THE DATA LOSS: the typed recipients must actually be persisted.
+    await assertEnvelopeRecipientsPersisted(surface);
+  });
+});

packages/app-tests/e2e/teams/team-groups.spec.ts

@@ -1,163 +0,0 @@
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { generateDatabaseId } from '@documenso/lib/universal/id';
-import { prisma } from '@documenso/prisma';
-import { seedTeamMember } from '@documenso/prisma/seed/teams';
-import { seedUser } from '@documenso/prisma/seed/users';
-import { expect, type Page, test } from '@playwright/test';
-import { OrganisationGroupType, OrganisationMemberRole, TeamMemberRole } from '@prisma/client';
-
-import { apiSignin } from '../fixtures/authentication';
-
-const WEBAPP_BASE_URL = NEXT_PUBLIC_WEBAPP_URL();
-
-test.describe.configure({ mode: 'parallel' });
-
-/**
- * Calls a team-group tRPC mutation directly, bypassing the UI.
- *
- * The UI only ever surfaces CUSTOM / INTERNAL_ORGANISATION groups, so these
- * authorisation rules must be enforced on the server - a crafted request can
- * target any `teamGroupId`, including the system-managed INTERNAL_TEAM groups.
- */
-const callTeamGroupMutation = (
-  page: Page,
-  procedure: 'team.group.delete' | 'team.group.update',
-  teamId: number,
-  input: Record<string, unknown>,
-) =>
-  page.context().request.post(`${WEBAPP_BASE_URL}/api/trpc/${procedure}`, {
-    headers: { 'content-type': 'application/json', 'x-team-id': teamId.toString() },
-    data: JSON.stringify({ json: input }),
-  });
-
-/**
- * Every team is created with three system-managed INTERNAL_TEAM groups
- * (admin/manager/member). They are the backbone of team-specific access and,
- * like organisation internal groups, must not be deletable - deleting them
- * silently strips team members of access while leaving the team row in place.
- */
-test('[TEAMS]: internal team groups cannot be deleted via the API', async ({ page }) => {
-  // Member inheritance OFF: membership is granted exclusively through the team's
-  // INTERNAL_TEAM groups, so removing them is what causes the access loss.
-  const { user: owner, team } = await seedUser({ inheritMembers: false });
-
-  // A direct team member whose access depends on the INTERNAL_TEAM member group.
-  const directMember = await seedTeamMember({ teamId: team.id, role: TeamMemberRole.MEMBER });
-
-  await apiSignin({ page, email: owner.email });
-
-  const internalTeamGroups = await prisma.teamGroup.findMany({
-    where: {
-      teamId: team.id,
-      organisationGroup: { type: OrganisationGroupType.INTERNAL_TEAM },
-    },
-  });
-
-  // admin + manager + member.
-  expect(internalTeamGroups).toHaveLength(3);
-
-  for (const group of internalTeamGroups) {
-    const response = await callTeamGroupMutation(page, 'team.group.delete', team.id, {
-      teamId: team.id,
-      teamGroupId: group.id,
-    });
-
-    expect(response.status(), `INTERNAL_TEAM ${group.teamRole} group must not be deletable`).not.toBe(200);
-  }
-
-  // None of the internal groups were removed.
-  const remaining = await prisma.teamGroup.count({
-    where: {
-      teamId: team.id,
-      organisationGroup: { type: OrganisationGroupType.INTERNAL_TEAM },
-    },
-  });
-
-  expect(remaining).toBe(3);
-
-  // The direct member therefore keeps their team access.
-  const memberStillHasAccess = await prisma.teamGroup.findFirst({
-    where: {
-      teamId: team.id,
-      organisationGroup: {
-        type: OrganisationGroupType.INTERNAL_TEAM,
-        organisationGroupMembers: {
-          some: { organisationMember: { userId: directMember.id } },
-        },
-      },
-    },
-  });
-
-  expect(memberStillHasAccess).not.toBeNull();
-});
-
-/**
- * Guards against over-blocking: user-created (CUSTOM) team groups are not
- * internal and must remain removable by team managers/admins.
- */
-test('[TEAMS]: custom team groups can still be deleted', async ({ page }) => {
-  const { user: owner, organisation, team } = await seedUser({ inheritMembers: false });
-
-  const customGroup = await prisma.organisationGroup.create({
-    data: {
-      id: generateDatabaseId('org_group'),
-      name: `custom-${team.url}`,
-      type: OrganisationGroupType.CUSTOM,
-      organisationRole: OrganisationMemberRole.MEMBER,
-      organisationId: organisation.id,
-      teamGroups: {
-        create: {
-          id: generateDatabaseId('team_group'),
-          teamId: team.id,
-          teamRole: TeamMemberRole.MEMBER,
-        },
-      },
-    },
-    include: { teamGroups: true },
-  });
-
-  const customTeamGroup = customGroup.teamGroups[0];
-
-  await apiSignin({ page, email: owner.email });
-
-  const response = await callTeamGroupMutation(page, 'team.group.delete', team.id, {
-    teamId: team.id,
-    teamGroupId: customTeamGroup.id,
-  });
-
-  expect(response.status()).toBe(200);
-
-  const deleted = await prisma.teamGroup.findUnique({ where: { id: customTeamGroup.id } });
-
-  expect(deleted).toBeNull();
-});
-
-/**
- * The same root cause affects updates: an INTERNAL_TEAM group's role must not be
- * editable either, otherwise a team admin could rewrite the backbone roles
- * (e.g. promote the member group to admin).
- */
-test('[TEAMS]: internal team groups cannot be updated via the API', async ({ page }) => {
-  const { user: owner, team } = await seedUser({ inheritMembers: false });
-
-  await apiSignin({ page, email: owner.email });
-
-  const internalMemberGroup = await prisma.teamGroup.findFirstOrThrow({
-    where: {
-      teamId: team.id,
-      teamRole: TeamMemberRole.MEMBER,
-      organisationGroup: { type: OrganisationGroupType.INTERNAL_TEAM },
-    },
-  });
-
-  const response = await callTeamGroupMutation(page, 'team.group.update', team.id, {
-    id: internalMemberGroup.id,
-    data: { teamRole: TeamMemberRole.ADMIN },
-  });
-
-  expect(response.status()).not.toBe(200);
-
-  const reloaded = await prisma.teamGroup.findUniqueOrThrow({ where: { id: internalMemberGroup.id } });
-
-  expect(reloaded.teamRole).toBe(TeamMemberRole.MEMBER);
-});

packages/auth/server/lib/errors/error-codes.ts

@@ -17,7 +17,6 @@ export const AuthenticationErrorCode = {
   // TwoFactorMissingSecret: 'TWO_FACTOR_MISSING_SECRET',
   // TwoFactorMissingCredentials: 'TWO_FACTOR_MISSING_CREDENTIALS',
   InvalidTwoFactorCode: 'INVALID_TWO_FACTOR_CODE',
-  SigninDisabled: 'SIGNIN_DISABLED',
   SignupDisabled: 'SIGNUP_DISABLED',
   SignupDisposableEmail: 'SIGNUP_DISPOSABLE_EMAIL',
   // IncorrectTwoFactorBackupCode: 'INCORRECT_TWO_FACTOR_BACKUP_CODE',

packages/auth/server/routes/email-password.ts

@@ -1,7 +1,6 @@
 import {
   isDisposableEmail,
   isEmailDomainAllowedForSignup,
-  isSigninEnabledForProvider,
   isSignupEnabledForProvider,
 } from '@documenso/lib/constants/auth';
 import { EMAIL_VERIFICATION_STATE } from '@documenso/lib/constants/email';
@@ -65,12 +64,6 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
   .post('/authorize', sValidator('json', ZSignInSchema), async (c) => {
     const requestMetadata = c.get('requestMetadata');
 
-    if (!isSigninEnabledForProvider('email')) {
-      throw new AppError(AuthenticationErrorCode.SigninDisabled, {
-        statusCode: 400,
-      });
-    }
-
     const { email, password, totpCode, backupCode, csrfToken, captchaToken } = c.req.valid('json');
 
     const loginLimitResult = await loginRateLimit.check({
@@ -251,12 +244,6 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
     const { password, currentPassword } = c.req.valid('json');
     const requestMetadata = c.get('requestMetadata');
 
-    if (!isSigninEnabledForProvider('email')) {
-      throw new AppError(AuthenticationErrorCode.SigninDisabled, {
-        statusCode: 400,
-      });
-    }
-
     const { session, user } = await getSession(c);
 
     await updatePassword({
@@ -359,12 +346,6 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
   .post('/forgot-password', sValidator('json', ZForgotPasswordSchema), async (c) => {
     const requestMetadata = c.get('requestMetadata');
 
-    if (!isSigninEnabledForProvider('email')) {
-      throw new AppError(AuthenticationErrorCode.SigninDisabled, {
-        statusCode: 400,
-      });
-    }
-
     const { email } = c.req.valid('json');
 
     const forgotLimitResult = await forgotPasswordRateLimit.check({
@@ -396,12 +377,6 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
   .post('/reset-password', sValidator('json', ZResetPasswordSchema), async (c) => {
     const requestMetadata = c.get('requestMetadata');
 
-    if (!isSigninEnabledForProvider('email')) {
-      throw new AppError(AuthenticationErrorCode.SigninDisabled, {
-        statusCode: 400,
-      });
-    }
-
     const { token, password } = c.req.valid('json');
 
     const resetLimitResult = await resetPasswordRateLimit.check({

packages/ee/server-only/stripe/sync-stripe-customer-subscription.ts

@@ -5,7 +5,6 @@ import { INTERNAL_CLAIM_ID } from '@documenso/lib/types/subscription';
 import { prisma } from '@documenso/prisma';
 import { OrganisationType, type Prisma, SubscriptionStatus } from '@prisma/client';
 import { match } from 'ts-pattern';
-import { reconcileSeatBasedPlans } from './update-subscription-item-quantity';
 
 const LIVE_SUBSCRIPTION_STATUSES: Stripe.Subscription.Status[] = ['active', 'trialing', 'past_due'];
 
@@ -230,19 +229,6 @@ const handleLiveSubscription = async ({
       });
     }
   });
-
-  // Detect a billing-period roll by comparing the persisted period end with
-  // the freshly-fetched one — the convergent equivalent of the old
-  // `previous_attributes.current_period_start` signal. On renewal, reconcile
-  // the seat quantity and claim down to the actual member count. The reconcile
-  // itself no-ops for non-seat/unlimited plans and inactive subscriptions.
-  const previousPeriodEnd = organisation.subscription?.periodEnd ?? null;
-
-  const hasPeriodAdvanced = previousPeriodEnd !== null && periodEnd.getTime() > previousPeriodEnd.getTime();
-
-  if (hasPeriodAdvanced && !bypassClaimUpdate) {
-    await reconcileSeatBasedPlans(organisation.id);
-  }
 };
 
 /**

packages/ee/server-only/stripe/update-subscription-item-quantity.ts

@@ -3,7 +3,6 @@ import { stripe } from '@documenso/lib/server-only/stripe';
 import { appLog } from '@documenso/lib/utils/debugger';
 import { prisma } from '@documenso/prisma';
 import type { OrganisationClaim, Subscription } from '@prisma/client';
-import { SubscriptionStatus } from '@prisma/client';
 import type Stripe from 'stripe';
 
 import { isPriceSeatsBased } from './is-price-seats-based';
@@ -12,14 +11,12 @@ export type UpdateSubscriptionItemQuantityOptions = {
   subscriptionId: string;
   quantity: number;
   priceId: string;
-  prorationBehaviour: 'always_invoice' | 'none';
 };
 
 export const updateSubscriptionItemQuantity = async ({
   subscriptionId,
   quantity,
   priceId,
-  prorationBehaviour,
 }: UpdateSubscriptionItemQuantityOptions) => {
   const subscription = await stripe.subscriptions.retrieve(subscriptionId);
 
@@ -29,6 +26,7 @@ export const updateSubscriptionItemQuantity = async ({
     throw new Error('Subscription does not contain required item');
   }
 
+  const hasYearlyItem = items.find((item) => item.price.recurring?.interval === 'year');
   const oldQuantity = items[0].quantity;
 
   if (oldQuantity === quantity) {
@@ -40,12 +38,13 @@ export const updateSubscriptionItemQuantity = async ({
       id: item.id,
       quantity,
     })),
-    proration_behavior: prorationBehaviour,
-    // Need to "off_session" updates since adding 3DS will have payments
-    // not pass through for these immediate invoices.
-    off_session: true,
   };
 
+  // Only invoice immediately when changing the quantity of yearly item.
+  if (hasYearlyItem) {
+    subscriptionUpdatePayload.proration_behavior = 'always_invoice';
+  }
+
   await stripe.subscriptions.update(subscriptionId, subscriptionUpdatePayload);
 };
 
@@ -56,19 +55,15 @@ export const updateSubscriptionItemQuantity = async ({
  * via Stripe rather than enforcing a hard cap. A `memberCount` of `0` on the
  * organisation claim represents unlimited seats.
  *
- * Organisations without a subscription (e.g. after being downgraded to the
- * free plan) can pass `null`, in which case the claim cap is enforced
- * directly without the seats-based exemption.
- *
  * Should only be called from grow paths (invite/add). Reducing operations
  * must never be gated by this check.
  *
- * @param subscription - The organisation's Stripe subscription, if any.
+ * @param subscription - The organisation's Stripe subscription.
  * @param organisationClaim - The organisation claim.
- * @param quantity - The proposed total member count.
+ * @param quantity - The proposed total member + pending invite count.
  */
 export const assertMemberCountWithinCap = async (
-  subscription: Subscription | null,
+  subscription: Subscription,
   organisationClaim: OrganisationClaim,
   quantity: number,
 ) => {
@@ -80,12 +75,10 @@ export const assertMemberCountWithinCap = async (
   }
 
   // Seats-based plans don't have a hard cap; Stripe meters the usage.
-  if (subscription) {
-    const isSeatsBased = await isPriceSeatsBased(subscription.priceId);
+  const isSeatsBased = await isPriceSeatsBased(subscription.priceId);
 
-    if (isSeatsBased) {
-      return;
-    }
+  if (isSeatsBased) {
+    return;
   }
 
   if (quantity > maximumMemberCount) {
@@ -96,134 +89,48 @@ export const assertMemberCountWithinCap = async (
 };
 
 /**
- * Syncs the Stripe subscription quantity with the organisation's member count.
+ * Syncs the organisation's member count with the Stripe subscription quantity.
  *
- * This is a Stripe <-> Database sync operation.
- *
- * Note: `organisationClaim.memberCount` is the paid seat high-water mark for the
- * current billing period — the highest count we've already billed for.
+ * No-ops for plans that are not seats-based, and for organisations with
+ * unlimited seats (`organisationClaim.memberCount === 0`). Safe to call from
+ * both grow and shrink paths.
  *
  * @param subscription - The subscription to sync the member count with.
  * @param organisationClaim - The organisation claim.
- * @param quantity - The new total member count to sync.
- * @param mode - The member-count change that triggered the sync.
+ * @param quantity - The new total member + pending invite count to sync.
  */
 export const syncMemberCountWithStripeSeatPlan = async (
   subscription: Subscription,
   organisationClaim: OrganisationClaim,
   quantity: number,
-  mode: 'grow' | 'shrink',
 ) => {
-  // Unlimited seats — nothing to meter.
+  // Infinite seats means no sync needed.
   if (organisationClaim.memberCount === 0) {
     return;
   }
 
   const isSeatsBased = await isPriceSeatsBased(subscription.priceId);
 
-  // Only seat-based plans support seat syncing.
   if (!isSeatsBased) {
     return;
   }
 
-  // Whether to immediately invoice for new seats if the quantity is greater than
-  // the high-water mark.
-  const billsForNewSeats = mode === 'grow' && quantity > organisationClaim.memberCount;
-
-  appLog('BILLING', `Syncing seat based plan (${mode}, quantity ${quantity})`);
+  appLog('BILLING', 'Updating seat based plan');
 
   await updateSubscriptionItemQuantity({
     priceId: subscription.priceId,
     subscriptionId: subscription.planId,
     quantity,
-    prorationBehaviour: billsForNewSeats ? 'always_invoice' : 'none',
-  });
-
-  // Advance the high-water mark when billing for new seats; it is reset to the
-  // actual member count when the billing period rolls over. Re-adds and shrinks
-  // deliberately leave it untouched so a seat already paid for this period is
-  // never re-charged.
-  if (billsForNewSeats) {
-    await prisma.organisationClaim.update({
-      where: {
-        id: organisationClaim.id,
-      },
-      data: {
-        memberCount: quantity,
-      },
-    });
-  }
-};
-
-/**
- * Reconciles the organisation claim seat counter, and the stripe quantity with the
- * actual member count.
- *
- * Uses the member count as the authoritative source of truth. Meaning:
- * - Update the organisation claim with the member count
- * - Update the Stripe subscription quantity to the member count
- *
- * This should only be called when the billing period rolls over.
- */
-export const reconcileSeatBasedPlans = async (organisationId: string) => {
-  const organisation = await prisma.organisation.findFirst({
-    where: {
-      id: organisationId,
-    },
-    include: {
-      organisationClaim: true,
-      subscription: true,
-    },
-  });
-
-  if (!organisation || !organisation.subscription) {
-    return;
-  }
-
-  const { subscription, organisationClaim } = organisation;
-
-  // Stripe rejects quantity updates on canceled subscriptions. PAST_DUE is
-  // still live and a no-proration sync is safe, so it's allowed through.
-  if (subscription.status === SubscriptionStatus.INACTIVE) {
-    return;
-  }
-
-  // Unlimited seats — nothing to meter.
-  if (organisationClaim.memberCount === 0) {
-    return;
-  }
-
-  const isSeatsBased = await isPriceSeatsBased(subscription.priceId);
-
-  // Only seat-based plans support seat syncing.
-  if (!isSeatsBased) {
-    return;
-  }
-
-  const memberCount = await prisma.organisationMember.count({
-    where: {
-      organisationId,
-    },
-  });
-
-  // An organisation always retains its owner; never write the unlimited sentinel.
-  if (memberCount === 0) {
-    return;
-  }
-
-  await updateSubscriptionItemQuantity({
-    priceId: subscription.priceId,
-    subscriptionId: subscription.planId,
-    quantity: memberCount,
-    prorationBehaviour: 'none',
   });
 
+  // This should be automatically updated after the Stripe webhook is fired
+  // but we just manually adjust it here as well to avoid any race conditions.
   await prisma.organisationClaim.update({
     where: {
       id: organisationClaim.id,
     },
     data: {
-      memberCount,
+      memberCount: quantity,
     },
   });
 };

packages/ee/server-only/stripe/webhook/handler.ts

@@ -2,6 +2,7 @@ import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import type { Stripe } from '@documenso/lib/server-only/stripe';
 import { stripe } from '@documenso/lib/server-only/stripe';
 import { env } from '@documenso/lib/utils/env';
+
 import { syncStripeCustomerSubscription } from '../sync-stripe-customer-subscription';
 
 type StripeWebhookResponse = {

packages/lib/client-only/hooks/use-envelope-autosave.ts

@@ -1,84 +1,100 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 
+/**
+ * Debounced autosave for the envelope editor (recipients, fields, settings).
+ *
+ * Only one save runs at a time and the latest edit always wins. If the user
+ * keeps editing while a save is on the wire, their newest changes get saved
+ * right after, never dropped.
+ */
 export function useEnvelopeAutosave<T>(saveFn: (data: T) => Promise<void>, delay = 1000) {
   const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const lastArgsRef = useRef<T | null>(null);
-  const pendingPromiseRef = useRef<Promise<void> | null>(null);
+
+  // The edit waiting to be saved. Wrapped in an object so null always means "nothing queued".
+  const pendingRef = useRef<{ value: T } | null>(null);
+
+  // The save currently running, if any. Shared so we never kick off two at once.
+  const commitPromiseRef = useRef<Promise<void> | null>(null);
+
+  // saveFn closes over editor state, so keep the latest one around without
+  // making triggerSave/flush depend on it.
+  const saveFnRef = useRef(saveFn);
+  saveFnRef.current = saveFn;
 
   const [isPending, setIsPending] = useState(false);
   const [isCommiting, setIsCommiting] = useState(false);
 
+  /**
+   * Runs saves one at a time until the queue is empty. Anything queued
+   * mid-save gets picked up on the next loop.
+   */
+  const commit = useCallback((): Promise<void> => {
+    if (commitPromiseRef.current) {
+      return commitPromiseRef.current;
+    }
+
+    if (!pendingRef.current) {
+      return Promise.resolve();
+    }
+
+    const pump = (async () => {
+      try {
+        setIsCommiting(true);
+
+        while (pendingRef.current) {
+          const { value } = pendingRef.current;
+          pendingRef.current = null;
+
+          await saveFnRef.current(value);
+        }
+      } finally {
+        // eslint-disable-next-line require-atomic-updates
+        commitPromiseRef.current = null;
+        setIsCommiting(false);
+        setIsPending(false);
+      }
+    })();
+
+    commitPromiseRef.current = pump;
+
+    return pump;
+  }, []);
+
   const triggerSave = useCallback(
     (data: T) => {
-      lastArgsRef.current = data;
+      pendingRef.current = { value: data };
 
-      // A debounce or promise means something is pending
       setIsPending(true);
 
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-misused-promises
-      timeoutRef.current = setTimeout(async () => {
-        if (!lastArgsRef.current) {
-          return;
-        }
-
-        const args = lastArgsRef.current;
-        lastArgsRef.current = null;
+      timeoutRef.current = setTimeout(() => {
         timeoutRef.current = null;
-
-        setIsCommiting(true);
-        pendingPromiseRef.current = saveFn(args);
-
-        try {
-          await pendingPromiseRef.current;
-        } finally {
-          // eslint-disable-next-line require-atomic-updates
-          pendingPromiseRef.current = null;
-          setIsCommiting(false);
-          setIsPending(false);
-        }
+        void commit();
       }, delay);
     },
-    [saveFn, delay],
+    [commit, delay],
   );
 
+  /**
+   * Skip the debounce and save now. The editor calls this when it needs
+   * everything persisted, e.g. before sending or switching steps.
+   */
   const flush = useCallback(async () => {
     if (timeoutRef.current) {
       clearTimeout(timeoutRef.current);
       timeoutRef.current = null;
     }
 
-    if (pendingPromiseRef.current) {
-      // Already running → wait for it
-      await pendingPromiseRef.current;
-      return;
-    }
-
-    if (lastArgsRef.current) {
-      const args = lastArgsRef.current;
-      lastArgsRef.current = null;
-
-      setIsCommiting(true);
-      setIsPending(true);
-
-      pendingPromiseRef.current = saveFn(args);
-      try {
-        await pendingPromiseRef.current;
-      } finally {
-        // eslint-disable-next-line require-atomic-updates
-        pendingPromiseRef.current = null;
-        setIsCommiting(false);
-        setIsPending(false);
-      }
-    }
-  }, [saveFn]);
+    await commit();
+  }, [commit]);
 
+  // Last-ditch attempt to save if the tab closes with unsaved edits.
   useEffect(() => {
     const handleBeforeUnload = () => {
-      if (timeoutRef.current || pendingPromiseRef.current) {
+      if (timeoutRef.current || pendingRef.current || commitPromiseRef.current) {
         void flush();
       }
     };

packages/lib/constants/auth.ts

@@ -41,14 +41,6 @@ export const IS_OIDC_SSO_ENABLED = Boolean(
 
 export const OIDC_PROVIDER_LABEL = env('NEXT_PRIVATE_OIDC_PROVIDER_LABEL');
 
-/**
- * Opt-out flag for the automatic OIDC redirect.
- *
- * When OIDC is the only enabled signin transport we redirect to the provider
- * automatically. Set this to "true" to keep rendering the signin page instead.
- */
-export const IS_OIDC_AUTO_REDIRECT_DISABLED = env('NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT') === 'true';
-
 export const USER_SECURITY_AUDIT_LOG_MAP: Record<string, string> = {
   ACCOUNT_SSO_LINK: 'Linked account to SSO',
   ACCOUNT_SSO_UNLINK: 'Unlinked account from SSO',
@@ -196,22 +188,3 @@ export const isSignupEnabledForProvider = (provider: 'email' | 'google' | 'micro
 
   return env(flagMap[provider]) !== 'true';
 };
-
-/**
- * Check if signin is enabled for the given provider.
- * The master switch takes precedence over the per-provider flags.
- */
-export const isSigninEnabledForProvider = (provider: 'email' | 'google' | 'microsoft' | 'oidc'): boolean => {
-  if (env('NEXT_PUBLIC_DISABLE_SIGNIN') === 'true') {
-    return false;
-  }
-
-  const flagMap = {
-    email: 'NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN',
-    google: 'NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN',
-    microsoft: 'NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN',
-    oidc: 'NEXT_PUBLIC_DISABLE_OIDC_SIGNIN',
-  } as const;
-
-  return env(flagMap[provider]) !== 'true';
-};

packages/lib/jobs/client.ts

@@ -17,7 +17,6 @@ import { SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION } from './definitions/emai
 import { SEND_SIGNING_EMAIL_JOB_DEFINITION } from './definitions/emails/send-signing-email';
 import { SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION } from './definitions/emails/send-team-deleted-email';
 import { ADMIN_DELETE_ORGANISATION_JOB_DEFINITION } from './definitions/internal/admin-delete-organisation';
-import { ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION } from './definitions/internal/alert-organisation-seat-drift';
 import { BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION } from './definitions/internal/backport-subscription-claims';
 import { BULK_SEND_TEMPLATE_JOB_DEFINITION } from './definitions/internal/bulk-send-template';
 import { CANCEL_ORGANISATION_SUBSCRIPTION_JOB_DEFINITION } from './definitions/internal/cancel-organisation-subscription';
@@ -30,7 +29,6 @@ import { SEAL_DOCUMENT_JOB_DEFINITION } from './definitions/internal/seal-docume
 import { SEAL_DOCUMENT_SWEEP_JOB_DEFINITION } from './definitions/internal/seal-document-sweep';
 import { SEND_SIGNING_REMINDERS_SWEEP_JOB_DEFINITION } from './definitions/internal/send-signing-reminders-sweep';
 import { SYNC_EMAIL_DOMAINS_JOB_DEFINITION } from './definitions/internal/sync-email-domains';
-import { SYNC_ORGANISATION_SEATS_JOB_DEFINITION } from './definitions/internal/sync-organisation-seats';
 
 /**
  * The `as const` assertion is load bearing as it provides the correct level of type inference for
@@ -66,9 +64,7 @@ export const jobsClient = new JobClient([
   CLEANUP_RATE_LIMITS_JOB_DEFINITION,
   SYNC_EMAIL_DOMAINS_JOB_DEFINITION,
   ADMIN_DELETE_ORGANISATION_JOB_DEFINITION,
-  ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION,
   CANCEL_ORGANISATION_SUBSCRIPTION_JOB_DEFINITION,
-  SYNC_ORGANISATION_SEATS_JOB_DEFINITION,
 ] as const);
 
 export const jobs = jobsClient;

packages/lib/jobs/definitions/internal/alert-organisation-seat-drift.handler.ts

@@ -1,67 +0,0 @@
-import { mailer } from '@documenso/email/mailer';
-import { prisma } from '@documenso/prisma';
-import { IS_BILLING_ENABLED, SUPPORT_EMAIL } from '../../../constants/app';
-import { DOCUMENSO_INTERNAL_EMAIL } from '../../../constants/email';
-import type { JobRunIO } from '../../client/_internal/job';
-import type { TAlertOrganisationSeatDriftJobDefinition } from './alert-organisation-seat-drift';
-
-/**
- * Daily check for organisations whose member count exceeds their paid seat
- * count (`organisationClaim.memberCount`, where `0` means unlimited).
- */
-export const run = async ({ io }: { payload: TAlertOrganisationSeatDriftJobDefinition; io: JobRunIO }) => {
-  if (!IS_BILLING_ENABLED()) {
-    return;
-  }
-
-  const organisations = await prisma.organisation.findMany({
-    where: {
-      // Exclude unlimited-seat plans (memberCount === 0).
-      organisationClaim: {
-        memberCount: {
-          not: 0,
-        },
-      },
-    },
-    select: {
-      id: true,
-      name: true,
-      organisationClaim: {
-        select: {
-          memberCount: true,
-        },
-      },
-      _count: {
-        select: {
-          members: true,
-        },
-      },
-    },
-  });
-
-  const driftedOrganisations = organisations.filter(
-    (organisation) =>
-      organisation.organisationClaim !== null &&
-      organisation._count.members > organisation.organisationClaim.memberCount,
-  );
-
-  if (driftedOrganisations.length === 0) {
-    io.logger.info('No organisations exceed their paid seat count');
-
-    return;
-  }
-
-  await mailer.sendMail({
-    to: SUPPORT_EMAIL,
-    from: DOCUMENSO_INTERNAL_EMAIL,
-    subject: `[Billing] ${driftedOrganisations.length} organisation(s) exceed their paid seat count`,
-    text: [
-      `${driftedOrganisations.length} organisation(s) have more members than their paid seat count:`,
-      '',
-      ...driftedOrganisations.map(
-        (organisation) =>
-          `- ${organisation.name} (${organisation.id}): ${organisation._count.members} members vs ${organisation.organisationClaim?.memberCount ?? 0} paid seats`,
-      ),
-    ].join('\n'),
-  });
-};

packages/lib/jobs/definitions/internal/alert-organisation-seat-drift.ts

@@ -1,30 +0,0 @@
-import { z } from 'zod';
-
-import type { JobDefinition } from '../../client/_internal/job';
-
-const ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_ID = 'internal.alert-organisation-seat-drift';
-
-const ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_SCHEMA = z.object({});
-
-export type TAlertOrganisationSeatDriftJobDefinition = z.infer<
-  typeof ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_SCHEMA
->;
-
-export const ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION = {
-  id: ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_ID,
-  name: 'Alert Organisation Seat Drift',
-  version: '1.0.0',
-  trigger: {
-    name: ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_ID,
-    schema: ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_SCHEMA,
-    cron: '0 0 * * *', // Once a day at midnight.
-  },
-  handler: async ({ payload, io }) => {
-    const handler = await import('./alert-organisation-seat-drift.handler');
-
-    await handler.run({ payload, io });
-  },
-} as const satisfies JobDefinition<
-  typeof ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_ID,
-  TAlertOrganisationSeatDriftJobDefinition
->;

packages/lib/jobs/definitions/internal/sync-organisation-seats.handler.ts

@@ -1,54 +0,0 @@
-import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
-import { prisma } from '@documenso/prisma';
-import { SubscriptionStatus } from '@prisma/client';
-import { IS_BILLING_ENABLED } from '../../../constants/app';
-import type { JobRunIO } from '../../client/_internal/job';
-import type { TSyncOrganisationSeatsJobDefinition } from './sync-organisation-seats';
-
-export const run = async ({ payload }: { payload: TSyncOrganisationSeatsJobDefinition; io: JobRunIO }) => {
-  const { organisationId } = payload;
-
-  if (!IS_BILLING_ENABLED()) {
-    return;
-  }
-
-  const organisation = await prisma.organisation.findUnique({
-    where: {
-      id: organisationId,
-    },
-    include: {
-      subscription: true,
-      organisationClaim: true,
-    },
-  });
-
-  if (!organisation || !organisation.subscription) {
-    return;
-  }
-
-  // Skip canceled/terminal subscriptions — Stripe rejects quantity updates on a
-  // canceled subscription. PAST_DUE is still live and a no-proration shrink is
-  // safe, so it's allowed through.
-  if (organisation.subscription.status === SubscriptionStatus.INACTIVE) {
-    return;
-  }
-
-  const memberCount = await prisma.organisationMember.count({
-    where: {
-      organisationId,
-    },
-  });
-
-  // An organisation always retains its owner; guarding zero avoids writing the
-  // unlimited sentinel to the claim.
-  if (memberCount === 0) {
-    return;
-  }
-
-  await syncMemberCountWithStripeSeatPlan(
-    organisation.subscription,
-    organisation.organisationClaim,
-    memberCount,
-    'shrink',
-  );
-};

packages/lib/jobs/definitions/internal/sync-organisation-seats.ts

@@ -1,29 +0,0 @@
-import { z } from 'zod';
-
-import type { JobDefinition } from '../../client/_internal/job';
-
-const SYNC_ORGANISATION_SEATS_JOB_DEFINITION_ID = 'internal.sync-organisation-seats';
-
-const SYNC_ORGANISATION_SEATS_JOB_DEFINITION_SCHEMA = z.object({
-  organisationId: z.string(),
-});
-
-export type TSyncOrganisationSeatsJobDefinition = z.infer<typeof SYNC_ORGANISATION_SEATS_JOB_DEFINITION_SCHEMA>;
-
-export const SYNC_ORGANISATION_SEATS_JOB_DEFINITION = {
-  id: SYNC_ORGANISATION_SEATS_JOB_DEFINITION_ID,
-  name: 'Sync Organisation Seats',
-  version: '1.0.0',
-  trigger: {
-    name: SYNC_ORGANISATION_SEATS_JOB_DEFINITION_ID,
-    schema: SYNC_ORGANISATION_SEATS_JOB_DEFINITION_SCHEMA,
-  },
-  handler: async ({ payload, io }) => {
-    const handler = await import('./sync-organisation-seats.handler');
-
-    await handler.run({ payload, io });
-  },
-} as const satisfies JobDefinition<
-  typeof SYNC_ORGANISATION_SEATS_JOB_DEFINITION_ID,
-  TSyncOrganisationSeatsJobDefinition
->;

packages/lib/server-only/document/delete-document.ts

@@ -83,17 +83,15 @@ export const deleteDocument = async ({ id, userId, teamId, requestMetadata }: De
 
   // Handle hard or soft deleting the actual document if user has permission.
   if (hasDeleteAccess) {
-    const updatedEnvelope = await handleDocumentOwnerDelete({
+    await handleDocumentOwnerDelete({
       envelope,
       user,
       requestMetadata,
     });
 
-    const envelopeForWebhook = { ...envelope, ...(updatedEnvelope ?? {}) };
-
     await triggerWebhook({
       event: WebhookTriggerEvents.DOCUMENT_CANCELLED,
-      data: ZWebhookDocumentSchema.parse(mapEnvelopeToWebhookDocumentPayload(envelopeForWebhook)),
+      data: ZWebhookDocumentSchema.parse(mapEnvelopeToWebhookDocumentPayload(envelope)),
       userId,
       teamId,
     });

packages/lib/server-only/envelope/create-envelope.ts

@@ -37,9 +37,9 @@ import { extractDerivedDocumentMeta } from '../../utils/document';
 import { createDocumentAuthOptions, createRecipientAuthOptions } from '../../utils/document-auth';
 import { buildTeamWhereQuery } from '../../utils/teams';
 import { incrementDocumentId, incrementTemplateId } from '../envelope/increment-id';
-import { assertOrganisationRatesAndLimits } from '../rate-limit/assert-organisation-rates-and-limits';
 import { assertCompatibleRecipientRole } from '../signature-level/assert-compatible-recipient-role';
 import { resolveSignatureLevel } from '../signature-level/resolve-signature-level';
+import { assertOrganisationRatesAndLimits } from '../rate-limit/assert-organisation-rates-and-limits';
 import { getTeamSettings } from '../team/get-team-settings';
 import { assertUserNotDisabledById } from '../user/assert-user-not-disabled';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';

packages/lib/server-only/envelope/duplicate-envelope.ts

@@ -10,8 +10,8 @@ import { nanoid, prefixedId } from '../../universal/id';
 import type { EnvelopeIdOptions } from '../../utils/envelope';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
 import { incrementDocumentId, incrementTemplateId } from '../envelope/increment-id';
-import { assertOrganisationRatesAndLimits } from '../rate-limit/assert-organisation-rates-and-limits';
 import { resolveSignatureLevel } from '../signature-level/resolve-signature-level';
+import { assertOrganisationRatesAndLimits } from '../rate-limit/assert-organisation-rates-and-limits';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 
 export interface DuplicateEnvelopeOptions {

packages/lib/server-only/organisation/accept-organisation-invitation.ts

@@ -1,12 +1,7 @@
-import {
-  assertMemberCountWithinCap,
-  syncMemberCountWithStripeSeatPlan,
-} from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import { prisma } from '@documenso/prisma';
 import type { OrganisationGroup, OrganisationMemberRole } from '@prisma/client';
-import { OrganisationGroupType, OrganisationMemberInviteStatus, SubscriptionStatus } from '@prisma/client';
+import { OrganisationGroupType, OrganisationMemberInviteStatus } from '@prisma/client';
 
-import { IS_BILLING_ENABLED } from '../../constants/app';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { jobs } from '../../jobs/client';
 import { generateDatabaseId } from '../../universal/id';
@@ -27,13 +22,6 @@ export const acceptOrganisationInvitation = async ({ token }: AcceptOrganisation
       organisation: {
         include: {
           groups: true,
-          organisationClaim: true,
-          subscription: true,
-          members: {
-            select: {
-              id: true,
-            },
-          },
         },
       },
     },
@@ -78,35 +66,6 @@ export const acceptOrganisationInvitation = async ({ token }: AcceptOrganisation
     return;
   }
 
-  const newMemberCount = organisation.members.length + 1;
-
-  // Billing occurs when a user accepts an invite.
-  // Assert that the new member count is within the cap and sync the seat plan with Stripe.
-  if (IS_BILLING_ENABLED()) {
-    const { subscription, organisationClaim } = organisation;
-
-    // A canceled subscription cannot have its seat quantity updated in Stripe,
-    // and an organisation with lapsed billing should not gain new members.
-    // Throw a deliberate error so the invite page can render an accurate
-    // message instead of an opaque Stripe failure.
-    if (subscription && subscription.status === SubscriptionStatus.INACTIVE) {
-      throw new AppError('SUBSCRIPTION_INACTIVE', {
-        message: 'The organisation subscription is inactive',
-      });
-    }
-
-    // Organisations can exist without a subscription (e.g. after being
-    // downgraded to the free plan). The claim cap remains authoritative in
-    // that case, surfacing LIMIT_EXCEEDED instead of an opaque "subscription
-    // not found" error.
-    await assertMemberCountWithinCap(subscription, organisationClaim, newMemberCount);
-
-    if (subscription) {
-      await syncMemberCountWithStripeSeatPlan(subscription, organisationClaim, newMemberCount, 'grow');
-    }
-  }
-
-  // Todo: Logging
   await addUserToOrganisation({
     userId: user.id,
     organisationId: organisation.id,

packages/lib/server-only/organisation/create-organisation-member-invites.ts

@@ -1,3 +1,7 @@
+import {
+  assertMemberCountWithinCap,
+  syncMemberCountWithStripeSeatPlan,
+} from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import { OrganisationInviteEmailTemplate } from '@documenso/email/templates/organisation-invite';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
@@ -13,6 +17,7 @@ import { createElement } from 'react';
 
 import { getI18nInstance } from '../../client-only/providers/i18n-server';
 import { generateDatabaseId } from '../../universal/id';
+import { validateIfSubscriptionIsRequired } from '../../utils/billing';
 import { buildOrganisationWhereQuery } from '../../utils/organisations';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';
@@ -57,6 +62,8 @@ export const createOrganisationMemberInvites = async ({
         },
       },
       organisationGlobalSettings: true,
+      organisationClaim: true,
+      subscription: true,
     },
   });
 
@@ -64,6 +71,10 @@ export const createOrganisationMemberInvites = async ({
     throw new AppError(AppErrorCode.NOT_FOUND);
   }
 
+  const { organisationClaim } = organisation;
+
+  const subscription = validateIfSubscriptionIsRequired(organisation.subscription);
+
   const currentOrganisationMemberRole = await getMemberOrganisationRole({
     organisationId: organisation.id,
     reference: {
@@ -109,6 +120,19 @@ export const createOrganisationMemberInvites = async ({
     }),
   );
 
+  const numberOfCurrentMembers = organisation.members.length;
+  const numberOfCurrentInvites = organisation.invites.length;
+  const numberOfNewInvites = organisationMemberInvites.length;
+
+  const totalMemberCountWithInvites = numberOfCurrentMembers + numberOfCurrentInvites + numberOfNewInvites;
+
+  // Enforce the seat cap and sync billing for seat based plans.
+  if (subscription) {
+    await assertMemberCountWithinCap(subscription, organisationClaim, totalMemberCountWithInvites);
+
+    await syncMemberCountWithStripeSeatPlan(subscription, organisationClaim, totalMemberCountWithInvites);
+  }
+
   await prisma.organisationMemberInvite.createMany({
     data: organisationMemberInvites,
   });

packages/lib/server-only/template/create-document-from-template.ts

@@ -51,8 +51,8 @@ import { buildTeamWhereQuery } from '../../utils/teams';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
 import { incrementDocumentId } from '../envelope/increment-id';
 import { insertFormValuesInPdf } from '../pdf/insert-form-values-in-pdf';
-import { assertOrganisationRatesAndLimits } from '../rate-limit/assert-organisation-rates-and-limits';
 import { resolveSignatureLevel } from '../signature-level/resolve-signature-level';
+import { assertOrganisationRatesAndLimits } from '../rate-limit/assert-organisation-rates-and-limits';
 import { getTeamSettings } from '../team/get-team-settings';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 import { getOrganisationTemplateWhereInput } from './get-organisation-template-by-id';

packages/lib/server-only/user/delete-user.ts

@@ -1,7 +1,6 @@
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
-import { jobs } from '../../jobs/client';
 import { deleteOrganisation } from '../organisation/delete-organisation';
 
 export type DeleteUserOptions = {
@@ -60,13 +59,6 @@ export const deleteUser = async ({ id }: DeleteUserOptions) => {
       })),
     );
 
-  // Organisations the user is a member of (but not owner). Owned organisations
-  // are fully torn down below (including subscription cancellation), so only
-  // these need a seat sync after the user's memberships cascade away.
-  const memberOrganisationIds = user.organisationMember
-    .filter((member) => member.organisation.ownerUserId !== user.id)
-    .map((member) => member.organisationId);
-
   // For organisations the user owns - fully tear them down (orphan envelopes,
   // delete the organisation, and cancel any Stripe subscription). Without this
   // the organisations would only cascade away when the user row is deleted,
@@ -90,21 +82,9 @@ export const deleteUser = async ({ id }: DeleteUserOptions) => {
     }),
   );
 
-  const deletedUser = await prisma.user.delete({
+  return await prisma.user.delete({
     where: {
       id: user.id,
     },
   });
-
-  // The user's memberships were cascade-deleted with the user row — queue a
-  // seat sync for each organisation they belonged to so the Stripe quantity
-  // trues down to the new member count (no proration, no credit).
-  for (const organisationId of memberOrganisationIds) {
-    await jobs.triggerJob({
-      name: 'internal.sync-organisation-seats',
-      payload: { organisationId },
-    });
-  }
-
-  return deletedUser;
 };

packages/lib/translations/de/web.po

@@ -8917,11 +8917,6 @@ msgstr "Weiterleitungs-URL"
 msgid "Redirecting"
 msgstr "Weiterleitung"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/en/web.po

@@ -8908,11 +8908,6 @@ msgstr "Redirect URL"
 msgid "Redirecting"
 msgstr "Redirecting"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr "Redirecting to {0}..."
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/es/web.po

@@ -8917,11 +8917,6 @@ msgstr "URL de redirección"
 msgid "Redirecting"
 msgstr "Redireccionando"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/fr/web.po

@@ -8424,7 +8424,7 @@ msgstr "Veuillez réessayer ou contacter notre support."
 #. placeholder {0}: `'${t(deleteMessage)}'`
 #: apps/remix/app/components/dialogs/envelope-delete-dialog.tsx
 msgid "Please type {0} to confirm"
-msgstr "Veuillez taper {0} pour confirmer"
+msgstr "Veuiillez taper {0} pour confirmer"
 
 #. placeholder {0}: user.email
 #: apps/remix/app/components/dialogs/account-delete-dialog.tsx
@@ -8917,11 +8917,6 @@ msgstr "URL de redirection"
 msgid "Redirecting"
 msgstr "Redirection"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/it/web.po

@@ -8917,11 +8917,6 @@ msgstr "URL di reindirizzamento"
 msgid "Redirecting"
 msgstr "Reindirizzamento"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/ja/web.po

@@ -8917,11 +8917,6 @@ msgstr "リダイレクト URL"
 msgid "Redirecting"
 msgstr "リダイレクト中"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/ko/web.po

@@ -8917,11 +8917,6 @@ msgstr "리디렉션 URL"
 msgid "Redirecting"
 msgstr "리디렉션 중"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/nl/web.po

@@ -8917,11 +8917,6 @@ msgstr "Redirect-URL"
 msgid "Redirecting"
 msgstr "Doorsturen"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/pl/web.po

@@ -8918,11 +8918,6 @@ msgstr "Adres URL przekierowania"
 msgid "Redirecting"
 msgstr "Przekierowywanie"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/pt-BR/web.po

@@ -8908,11 +8908,6 @@ msgstr "URL de Redirecionamento"
 msgid "Redirecting"
 msgstr "Redirecionando"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/translations/zh/web.po

@@ -8917,11 +8917,6 @@ msgstr "重定向 URL"
 msgid "Redirecting"
 msgstr "正在重定向"
 
-#. placeholder {0}: oidcProviderLabel || 'OIDC'
-#: apps/remix/app/routes/_unauthenticated+/signin.tsx
-msgid "Redirecting to {0}..."
-msgstr ""
-
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 msgid "Registration Successful"

packages/lib/types/subscription.ts

@@ -52,7 +52,7 @@ export const ZClaimFlagsSchema = z.object({
   signingReminders: z.boolean().optional(),
 
   cscQesSigning: z.boolean().optional(),
-
+  
   /**
    * Controls whether an organisation is prevented from sending emails.
    *

packages/trpc/server/admin-router/delete-organisation-member.ts

@@ -1,6 +1,8 @@
+import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { jobs } from '@documenso/lib/jobs/client';
 import { prisma } from '@documenso/prisma';
+import { OrganisationMemberInviteStatus } from '@prisma/client';
 
 import { adminProcedure } from '../trpc';
 import {
@@ -26,6 +28,8 @@ export const deleteAdminOrganisationMemberRoute = adminProcedure
         id: organisationId,
       },
       include: {
+        subscription: true,
+        organisationClaim: true,
         teams: {
           select: {
             id: true,
@@ -37,6 +41,14 @@ export const deleteAdminOrganisationMemberRoute = adminProcedure
             userId: true,
           },
         },
+        invites: {
+          where: {
+            status: OrganisationMemberInviteStatus.PENDING,
+          },
+          select: {
+            id: true,
+          },
+        },
       },
     });
 
@@ -60,6 +72,18 @@ export const deleteAdminOrganisationMemberRoute = adminProcedure
       });
     }
 
+    const newMemberCount = organisation.members.length + organisation.invites.length - 1;
+
+    // Removing a member is a reducing operation, so we don't gate it on the
+    // subscription being present. Sync Stripe only when one exists.
+    if (organisation.subscription) {
+      await syncMemberCountWithStripeSeatPlan(
+        organisation.subscription,
+        organisation.organisationClaim,
+        newMemberCount,
+      );
+    }
+
     const teamIds = organisation.teams.map((team) => team.id);
 
     await prisma.$transaction(async (tx) => {
@@ -89,13 +113,6 @@ export const deleteAdminOrganisationMemberRoute = adminProcedure
       });
     });
 
-    // A member was removed — queue a seat sync to true the Stripe quantity down
-    // to the new count (no proration, no credit).
-    await jobs.triggerJob({
-      name: 'internal.sync-organisation-seats',
-      payload: { organisationId },
-    });
-
     await jobs.triggerJob({
       name: 'send.organisation-member-left.email',
       payload: {

packages/trpc/server/organisation-router/delete-organisation-member-invites.ts

@@ -1,3 +1,4 @@
+import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { getMemberOrganisationRole } from '@documenso/lib/server-only/team/get-member-roles';
@@ -31,6 +32,20 @@ export const deleteOrganisationMemberInvitesRoute = authenticatedProcedure
         userId,
         roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
       }),
+      include: {
+        organisationClaim: true,
+        subscription: true,
+        members: {
+          select: {
+            id: true,
+          },
+        },
+        invites: {
+          select: {
+            id: true,
+          },
+        },
+      },
     });
 
     if (!organisation) {
@@ -68,6 +83,22 @@ export const deleteOrganisationMemberInvitesRoute = authenticatedProcedure
       });
     }
 
+    const { organisationClaim } = organisation;
+
+    const numberOfCurrentMembers = organisation.members.length;
+    const numberOfCurrentInvites = organisation.invites.length;
+    const totalMemberCountWithInvites = numberOfCurrentMembers + numberOfCurrentInvites - 1;
+
+    // Removing pending invites is a reducing operation, so we don't gate it on
+    // the subscription being present. Sync Stripe only when one exists.
+    if (organisation.subscription) {
+      await syncMemberCountWithStripeSeatPlan(
+        organisation.subscription,
+        organisationClaim,
+        totalMemberCountWithInvites,
+      );
+    }
+
     await prisma.organisationMemberInvite.deleteMany({
       where: {
         id: {

packages/trpc/server/organisation-router/delete-organisation-members.ts

@@ -1,8 +1,8 @@
+import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import {
   ORGANISATION_MEMBER_ROLE_HIERARCHY,
   ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP,
 } from '@documenso/lib/constants/organisations';
-
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { jobs } from '@documenso/lib/jobs/client';
 import {
@@ -11,6 +11,7 @@ import {
   isOrganisationRoleWithinUserHierarchy,
 } from '@documenso/lib/utils/organisations';
 import { prisma } from '@documenso/prisma';
+import { OrganisationMemberInviteStatus } from '@documenso/prisma/client';
 
 import { authenticatedProcedure } from '../trpc';
 import {
@@ -58,6 +59,8 @@ export const deleteOrganisationMembers = async ({
       roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
     }),
     include: {
+      subscription: true,
+      organisationClaim: true,
       teams: {
         select: {
           id: true,
@@ -72,6 +75,14 @@ export const deleteOrganisationMembers = async ({
           },
         },
       },
+      invites: {
+        where: {
+          status: OrganisationMemberInviteStatus.PENDING,
+        },
+        select: {
+          id: true,
+        },
+      },
     },
   });
 
@@ -79,6 +90,8 @@ export const deleteOrganisationMembers = async ({
     throw new AppError(AppErrorCode.UNAUTHORIZED);
   }
 
+  const { organisationClaim } = organisation;
+
   const membersToDelete = organisation.members.filter((member) => organisationMemberIds.includes(member.id));
 
   const currentUserMember = organisation.members.find((member) => member.userId === userId);
@@ -116,6 +129,15 @@ export const deleteOrganisationMembers = async ({
     }
   }
 
+  const inviteCount = organisation.invites.length;
+  const newMemberCount = organisation.members.length + inviteCount - membersToDelete.length;
+
+  // Removing members is a reducing operation, so we don't gate it on the
+  // subscription being present. Sync Stripe only when one exists.
+  if (organisation.subscription) {
+    await syncMemberCountWithStripeSeatPlan(organisation.subscription, organisationClaim, newMemberCount);
+  }
+
   const removedUserIds = membersToDelete.map((member) => member.userId);
   const teamIds = organisation.teams.map((team) => team.id);
 
@@ -162,13 +184,6 @@ export const deleteOrganisationMembers = async ({
     });
   });
 
-  // Members were removed — queue a seat sync to true the Stripe quantity down to
-  // the new count (no proration, no credit).
-  await jobs.triggerJob({
-    name: 'internal.sync-organisation-seats',
-    payload: { organisationId },
-  });
-
   for (const member of membersToDelete) {
     await jobs.triggerJob({
       name: 'send.organisation-member-left.email',

packages/trpc/server/organisation-router/leave-organisation.ts

@@ -1,7 +1,9 @@
+import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { jobs } from '@documenso/lib/jobs/client';
 import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
 import { prisma } from '@documenso/prisma';
+import { OrganisationMemberInviteStatus } from '@documenso/prisma/client';
 
 import { authenticatedProcedure } from '../trpc';
 import { ZLeaveOrganisationRequestSchema, ZLeaveOrganisationResponseSchema } from './leave-organisation.types';
@@ -22,11 +24,26 @@ export const leaveOrganisationRoute = authenticatedProcedure
     const organisation = await prisma.organisation.findFirst({
       where: buildOrganisationWhereQuery({ organisationId, userId }),
       include: {
+        organisationClaim: true,
+        subscription: true,
         teams: {
           select: {
             id: true,
           },
         },
+        invites: {
+          where: {
+            status: OrganisationMemberInviteStatus.PENDING,
+          },
+          select: {
+            id: true,
+          },
+        },
+        members: {
+          select: {
+            id: true,
+          },
+        },
       },
     });
 
@@ -42,6 +59,17 @@ export const leaveOrganisationRoute = authenticatedProcedure
       });
     }
 
+    const { organisationClaim } = organisation;
+
+    const inviteCount = organisation.invites.length;
+    const newMemberCount = organisation.members.length + inviteCount - 1;
+
+    // Leaving is a reducing operation, so we don't gate it on the subscription
+    // being present. Sync Stripe only when one exists.
+    if (organisation.subscription) {
+      await syncMemberCountWithStripeSeatPlan(organisation.subscription, organisationClaim, newMemberCount);
+    }
+
     const teamIds = organisation.teams.map((team) => team.id);
 
     await prisma.$transaction(async (tx) => {
@@ -73,13 +101,6 @@ export const leaveOrganisationRoute = authenticatedProcedure
       });
     });
 
-    // A member was removed — queue a seat sync to true the Stripe quantity down
-    // to the new count (no proration, no credit).
-    await jobs.triggerJob({
-      name: 'internal.sync-organisation-seats',
-      payload: { organisationId },
-    });
-
     await jobs.triggerJob({
       name: 'send.organisation-member-left.email',
       payload: {

packages/trpc/server/team-router/delete-team-group.ts

@@ -53,15 +53,6 @@ export const deleteTeamGroupRoute = authenticatedProcedure
       });
     }
 
-    // You cannot delete internal team groups. These are the system-managed
-    // admin/manager/member groups that back the team's role-based access, and
-    // deleting them would silently strip team members of their access.
-    if (group.organisationGroup.type === OrganisationGroupType.INTERNAL_TEAM) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You are not allowed to delete internal team groups',
-      });
-    }
-
     // You cannot delete internal organisation groups.
     // The only exception is deleting the "member" organisation group which is used to allow
     // all organisation members to access a team.

packages/trpc/server/team-router/update-team-group.ts

@@ -45,12 +45,9 @@ export const updateTeamGroupRoute = authenticatedProcedure
       });
     }
 
-    if (
-      teamGroup.organisationGroup.type === OrganisationGroupType.INTERNAL_ORGANISATION ||
-      teamGroup.organisationGroup.type === OrganisationGroupType.INTERNAL_TEAM
-    ) {
+    if (teamGroup.organisationGroup.type === OrganisationGroupType.INTERNAL_ORGANISATION) {
       throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You are not allowed to update internal groups',
+        message: 'You are not allowed to update internal organisation groups',
       });
     }
 

packages/tsconfig/process-env.d.ts

@@ -93,13 +93,6 @@ declare namespace NodeJS {
     NEXT_PUBLIC_DISABLE_OIDC_SIGNUP?: string;
     NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS?: string;
 
-    NEXT_PUBLIC_DISABLE_SIGNIN?: string;
-    NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN?: string;
-    NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN?: string;
-    NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN?: string;
-    NEXT_PUBLIC_DISABLE_OIDC_SIGNIN?: string;
-    NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT?: string;
-
     NEXT_PRIVATE_BROWSERLESS_URL?: string;
 
     NEXT_PRIVATE_JOBS_PROVIDER?: 'inngest' | 'local' | 'bullmq';

render.yaml

@@ -163,18 +163,6 @@ services:
         sync: false
       - key: NEXT_PUBLIC_DISABLE_OIDC_SIGNUP
         sync: false
-      - key: NEXT_PUBLIC_DISABLE_SIGNIN
-        sync: false
-      - key: NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN
-        sync: false
-      - key: NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN
-        sync: false
-      - key: NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN
-        sync: false
-      - key: NEXT_PUBLIC_DISABLE_OIDC_SIGNIN
-        sync: false
-      - key: NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT
-        sync: false
       - key: NEXT_PUBLIC_USE_INTERNAL_URL_BROWSERLESS
         sync: false
 

turbo.json

@@ -53,12 +53,6 @@
     "NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNUP",
     "NEXT_PUBLIC_DISABLE_OIDC_SIGNUP",
     "NEXT_PRIVATE_ALLOWED_SIGNUP_DOMAINS",
-    "NEXT_PUBLIC_DISABLE_SIGNIN",
-    "NEXT_PUBLIC_DISABLE_EMAIL_PASSWORD_SIGNIN",
-    "NEXT_PUBLIC_DISABLE_GOOGLE_SIGNIN",
-    "NEXT_PUBLIC_DISABLE_MICROSOFT_SIGNIN",
-    "NEXT_PUBLIC_DISABLE_OIDC_SIGNIN",
-    "NEXT_PUBLIC_DISABLE_OIDC_AUTO_REDIRECT",
     "NEXT_PRIVATE_PLAIN_API_KEY",
     "NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT",
     "NEXT_PRIVATE_DOCUMENSO_LICENSE_KEY",