From 66567cfecdf5e9ea29ad2cbd866269b013cdf3ef Mon Sep 17 00:00:00 2001
From: javayhu <javayhu@gmail.com>
Date: Sat, 28 Jun 2025 00:34:31 +0800
Subject: [PATCH] chore: optimize turnstile captcha

---
 src/components/auth/register-form.tsx       |  4 ++--
 src/components/shared/captcha.tsx           |  6 +++---
 src/config/website.tsx                      |  1 -
 src/lib/{validate-captcha.ts => captcha.ts} | 11 ++++++++---
 src/types/index.d.ts                        |  1 -
 5 files changed, 13 insertions(+), 10 deletions(-)
 rename src/lib/{validate-captcha.ts => captcha.ts} (75%)

diff --git a/src/components/auth/register-form.tsx b/src/components/auth/register-form.tsx
index 66bb123..c00878e 100644
--- a/src/components/auth/register-form.tsx
+++ b/src/components/auth/register-form.tsx
@@ -15,8 +15,8 @@ import {
 import { Input } from '@/components/ui/input';
 import { websiteConfig } from '@/config/website';
 import { authClient } from '@/lib/auth-client';
+import { isTurnstileEnabled, validateTurnstileToken } from '@/lib/captcha';
 import { getUrlWithLocaleInCallbackUrl } from '@/lib/urls/urls';
-import { validateTurnstileToken } from '@/lib/validate-captcha';
 import { DEFAULT_LOGIN_REDIRECT, Routes } from '@/routes';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { EyeIcon, EyeOffIcon, Loader2Icon } from 'lucide-react';
@@ -53,7 +53,7 @@ export const RegisterForm = ({
   const [showPassword, setShowPassword] = useState(false);
 
   // turnstile captcha schema
-  const turnstileEnabled = websiteConfig.features.enableTurnstileCaptcha;
+  const turnstileEnabled = isTurnstileEnabled();
   const captchaSchema = turnstileEnabled
     ? z.string().min(1, 'Please complete the captcha')
     : z.string().optional();
diff --git a/src/components/shared/captcha.tsx b/src/components/shared/captcha.tsx
index 3417d3a..ae1ee2b 100644
--- a/src/components/shared/captcha.tsx
+++ b/src/components/shared/captcha.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { FormMessage } from '@/components/ui/form';
-import { websiteConfig } from '@/config/website';
+import { isTurnstileEnabled } from '@/lib/captcha';
 import { useLocale } from 'next-intl';
 import { useTheme } from 'next-themes';
 import dynamic from 'next/dynamic';
@@ -22,11 +22,11 @@ type Props = Omit<ComponentProps<typeof Turnstile>, 'siteKey'> & {
  * Captcha component for Cloudflare Turnstile
  */
 export const Captcha = ({ validationError, ...props }: Props) => {
-  const isTurnstileEnabled = websiteConfig.features.enableTurnstileCaptcha;
+  const turnstileEnabled = isTurnstileEnabled();
   const theme = useTheme();
   const locale = useLocale();
 
-  return isTurnstileEnabled ? (
+  return turnstileEnabled ? (
     <>
       <Turnstile
         options={{
diff --git a/src/config/website.tsx b/src/config/website.tsx
index 30f8235..d5eed4d 100644
--- a/src/config/website.tsx
+++ b/src/config/website.tsx
@@ -38,7 +38,6 @@ export const websiteConfig: WebsiteConfig = {
     enableAffonsoAffiliate: false,
     enablePromotekitAffiliate: false,
     enableDatafastRevenueTrack: false,
-    enableTurnstileCaptcha: true,
   },
   routes: {
     defaultLoginRedirect: '/dashboard',
diff --git a/src/lib/validate-captcha.ts b/src/lib/captcha.ts
similarity index 75%
rename from src/lib/validate-captcha.ts
rename to src/lib/captcha.ts
index 4c597d2..5f4b762 100644
--- a/src/lib/validate-captcha.ts
+++ b/src/lib/captcha.ts
@@ -1,4 +1,9 @@
-import { websiteConfig } from '@/config/website';
+export function isTurnstileEnabled() {
+  return (
+    process.env.NEXT_PUBLIC_TURNSTILE_SITE_KEY !== '' &&
+    process.env.TURNSTILE_SECRET_KEY !== ''
+  );
+}
 
 interface TurnstileResponse {
   success: boolean;
@@ -9,8 +14,8 @@ interface TurnstileResponse {
  * https://developers.cloudflare.com/turnstile/get-started/server-side-validation/
  */
 export async function validateTurnstileToken(token: string) {
-  const isTurnstileEnabled = websiteConfig.features.enableTurnstileCaptcha;
-  if (!isTurnstileEnabled) {
+  const turnstileEnabled = isTurnstileEnabled();
+  if (!turnstileEnabled) {
     console.log('validateTurnstileToken, turnstile is disabled');
     return true;
   }
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index cdc2de6..2658d83 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -71,7 +71,6 @@ export interface FeaturesConfig {
   enableAffonsoAffiliate?: boolean;   // Whether to enable affonso affiliate
   enablePromotekitAffiliate?: boolean;   // Whether to enable promotekit affiliate
   enableDatafastRevenueTrack?: boolean;   // Whether to enable datafast revenue tracking
-  enableTurnstileCaptcha?: boolean;   // Whether to enable turnstile captcha
 }
 
 /**