Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,9 @@
}

const MERGE_STRATEGY_SHORT: Record<OAuthAccountMergeStrategy, string> = {
link_method: "Link providers",
allow_duplicates: "Allow duplicates",
raise_error: "Block multiple",
link_method: "Link accounts",
allow_duplicates: "Create new account",
raise_error: "Block sign-up",
};

// ─── Designed Email Verification toggle (logic copied from EmailVerificationSetting) ──
Expand Down Expand Up @@ -726,13 +726,15 @@
<MethodToggleRow
icon={SignInIcon}
label="Allow new user sign-ups"
hint="Existing users can still sign in when sign-up is disabled. You can always create new accounts manually via the dashboard."
checked={allowSignUp}
onCheckedChange={onAllowSignUpChange}
density="compact"
/>
<MethodToggleRow
icon={EnvelopeSimpleIcon}
label="Require email verification"
hint="Users must verify their primary email before they can use your application. Unverified users will be restricted."
checked={emailVerification.checked}
onCheckedChange={emailVerification.onCheckedChange}
density="compact"
Expand All @@ -744,7 +746,8 @@
<UserCircleIcon size={18} className="text-foreground/70 dark:text-muted-foreground" aria-hidden="true" />
</div>
<div className="flex-1 min-w-0">
<div className="text-sm font-medium text-foreground truncate">Multi-provider sign-up mode</div>
<div className="text-sm font-medium text-foreground truncate">Same-email social login policy</div>
<div className="text-xs text-muted-foreground mt-0.5">Determines what happens when a user uses a new social login provider with an email that's already connected to an account</div>

Check failure on line 750 in apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/auth-methods/page-client.tsx

View workflow job for this annotation

GitHub Actions / lint_and_build (24)

`'` can be escaped with `&apos;`, `&lsquo;`, `&#39;`, `&rsquo;`
</div>
<DesignSelectorDropdown
value={mergeStrategy}
Expand Down
Loading