@autobusal/providers 1.2.12 → 1.3.0

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to `@autobusal/providers` are documented here. This project
 adheres to [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2026-07-25
+
+### Changed
+
+- **Captcha is now a runtime, per-label setting.** `Recaptcha.tsx` reads the
+  label's captcha config (provider + public site key) from `/api/settings/get`
+  via `useGetSettings()` and mounts `GoogleReCaptchaProvider` ONLY when the
+  provider is `recaptcha` (build-time `VITE_RECAPTCHA_KEY` remains as a
+  fallback). Cloudflare Turnstile needs no app-level provider. Because the
+  component now needs the query client, it moved INSIDE `<Queries>` in
+  `Providers.tsx`. `SettingsData`/`LabelSettings` types gained `captcha`.
+
 ## [1.2.12] - 2026-07-24
 
 ### Fixed

package/Providers.tsx

@@ -20,9 +20,13 @@ const Providers = ({ type, loading, children }: Props): JSX.Element => (
   // the initial settings fetch). The QueryClient in <Queries> is created at
   // module scope, so remounting this subtree while suspended keeps the same
   // client and cache - no refetch loop.
+  // Edited: Ferjolt Ozuni - Date: 2026-07-25
+  // Recaptcha moved INSIDE Queries: it now reads the label's runtime captcha
+  // settings via useGetSettings(), which needs the QueryClientProvider (and
+  // suspends into the outer boundary on a cold cache, like Styles/Setup).
   <Suspense fallback={ loading }>
-    <Recaptcha>
-      <Queries>
+    <Queries>
+      <Recaptcha>
         <Styles>
           <Notifications>
             <Setup type={ type }>
@@ -32,8 +36,8 @@ const Providers = ({ type, loading, children }: Props): JSX.Element => (
             </Setup>
           </Notifications>
         </Styles>
-      </Queries>
-    </Recaptcha>
+      </Recaptcha>
+    </Queries>
   </Suspense>
 );
 

package/Recaptcha/Recaptcha.tsx

@@ -1,13 +1,36 @@
 import { GoogleReCaptchaProvider } from 'react-google-recaptcha-v3';
+import { useGetSettings } from '../services';
 
 interface Props {
   children: JSX.Element
 }
 
-const Recaptcha = ({ children }: Props): JSX.Element => (
-  <GoogleReCaptchaProvider reCaptchaKey={ import.meta.env.VITE_RECAPTCHA_KEY }>
-    { children }
-  </GoogleReCaptchaProvider>
-);
+// Edited: Ferjolt Ozuni - Date: 2026-07-25
+// The captcha provider + site key are now the label's runtime settings
+// (/api/settings/get, managed at /admin/label?type=captcha) instead of the
+// build-time VITE_RECAPTCHA_KEY - which stays only as a fallback for labels
+// without a captcha config yet. The Google provider script is mounted ONLY
+// when reCAPTCHA is the active provider; Cloudflare Turnstile needs no
+// app-wide provider (its script is loaded on demand by useRecaptcha in
+// @autobusal/hooks). NB: this component now calls useGetSettings(), so it
+// must sit INSIDE <Queries> (see Providers.tsx).
+const Recaptcha = ({ children }: Props): JSX.Element => {
+  const { data } = useGetSettings();
 
-export default Recaptcha;
+  const provider = data?.captcha?.provider
+    ?? (import.meta.env.VITE_RECAPTCHA_KEY ? 'recaptcha' : 'none');
+
+  const siteKey = data?.captcha?.site_key ?? import.meta.env.VITE_RECAPTCHA_KEY;
+
+  if (provider !== 'recaptcha' || !siteKey) {
+    return children;
+  }
+
+  return (
+    <GoogleReCaptchaProvider reCaptchaKey={ siteKey }>
+      { children }
+    </GoogleReCaptchaProvider>
+  );
+};
+
+export default Recaptcha;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/providers",
-  "version": "1.2.12",
+  "version": "1.3.0",
   "author": "Ferjolt Ozuni",
   "type": "module",
   "main": "index.ts"

package/types/settings.ts

@@ -1,6 +1,14 @@
 export interface SettingsData {
   url: string
 
+  // Edited: Ferjolt Ozuni - Date: 2026-07-25
+  // Runtime captcha config (provider + PUBLIC site key) from
+  // /api/settings/get - replaces the build-time VITE_RECAPTCHA_KEY.
+  captcha?: {
+    provider: 'none' | 'recaptcha' | 'turnstile'
+    site_key: string | null
+  }
+
   preferences: {
     company: string
 
@@ -122,6 +130,21 @@ export interface LabelSettings {
       client_secret: string
     }
   }
+
+  // Edited: Ferjolt Ozuni - Date: 2026-07-25
+  // Admin-managed captcha configuration; a single provider field makes
+  // reCAPTCHA and Turnstile mutually exclusive.
+  captcha?: {
+    provider: 'none' | 'recaptcha' | 'turnstile'
+    recaptcha: {
+      site_key?: string
+      secret_key?: string
+    }
+    turnstile: {
+      site_key?: string
+      secret_key?: string
+    }
+  }
 }
 
 // Edited: Ferjolt Ozuni - Date: 2026-07-18