github/databasus
1
1
Fork 0
mirror of https://github.com/databasus/databasus.git synced 2026-04-06 00:32:03 +02:00
Code Issues 3 Packages Projects Releases Wiki Activity

Merge pull request #457 from databasus/develop

Browse Source 
FIX (playground): Make turnstile mandatory in sign in and sign up
This commit is contained in:
Rostislav Dugin
2026-03-21 22:32:26 +03:00
committed by GitHub
parent 8cf0fdacb1 231e3cc709
commit 80cd0bf5d3
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/features/users/ui/SignInComponent.tsx
View File

@@ -4,7 +4,12 @@ import { type JSX, useState } from 'react';
import { useCloudflareTurnstile } from '../../../shared/hooks/useCloudflareTurnstile';
import { GITHUB_CLIENT_ID, GOOGLE_CLIENT_ID, IS_EMAIL_CONFIGURED } from '../../../constants';
import {
CLOUDFLARE_TURNSTILE_SITE_KEY,
GITHUB_CLIENT_ID,
GOOGLE_CLIENT_ID,
IS_EMAIL_CONFIGURED,
} from '../../../constants';
import { userApi } from '../../../entity/users';
import { StringUtils } from '../../../shared/lib';
import { FormValidator } from '../../../shared/lib/FormValidator';
@@ -129,7 +134,7 @@ export function SignInComponent({
<CloudflareTurnstileWidget containerRef={containerRef} />
<Button
disabled={isLoading}
disabled={isLoading || (!!CLOUDFLARE_TURNSTILE_SITE_KEY && !token)}
loading={isLoading}
className="w-full"
onClick={() => {

13
frontend/src/features/users/ui/SignUpComponent.tsx
View File

@@ -4,7 +4,12 @@ import { type JSX, useState } from 'react';
import { useCloudflareTurnstile } from '../../../shared/hooks/useCloudflareTurnstile';
import { GITHUB_CLIENT_ID, GOOGLE_CLIENT_ID, IS_CLOUD } from '../../../constants';
import {
CLOUDFLARE_TURNSTILE_SITE_KEY,
GITHUB_CLIENT_ID,
GOOGLE_CLIENT_ID,
IS_CLOUD,
} from '../../../constants';
import { userApi } from '../../../entity/users';
import { StringUtils } from '../../../shared/lib';
import { FormValidator } from '../../../shared/lib/FormValidator';
@@ -224,7 +229,11 @@ export function SignUpComponent({ onSwitchToSignIn }: SignUpComponentProps): JSX
<CloudflareTurnstileWidget containerRef={containerRef} />
<Button
disabled={isLoading || (IS_CLOUD && (!isTermsAccepted || !isPolicyAccepted))}
disabled={
isLoading ||
(IS_CLOUD && (!isTermsAccepted || !isPolicyAccepted)) ||
(!!CLOUDFLARE_TURNSTILE_SITE_KEY && !token)
}
loading={isLoading}
className="w-full"
onClick={() => {