diff --git a/router/api-router.go b/router/api-router.go index e89ba4e7..cc330d7e 100644 --- a/router/api-router.go +++ b/router/api-router.go @@ -28,7 +28,7 @@ func SetApiRouter(router *gin.Engine) { userRoute := apiRouter.Group("/user") { userRoute.POST("/register", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.Register) - userRoute.POST("/login", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.Login) + userRoute.POST("/login", middleware.CriticalRateLimit(), controller.Login) userRoute.GET("/logout", controller.Logout) selfRoute := userRoute.Group("/") diff --git a/web/src/components/LoginForm.js b/web/src/components/LoginForm.js index d3954cf8..bcc2df65 100644 --- a/web/src/components/LoginForm.js +++ b/web/src/components/LoginForm.js @@ -13,7 +13,6 @@ import { import { Link, useNavigate, useSearchParams } from 'react-router-dom'; import { UserContext } from '../context/User'; import { API, getLogo, showError, showSuccess, showInfo } from '../helpers'; -import Turnstile from 'react-turnstile'; const LoginForm = () => { const [inputs, setInputs] = useState({ @@ -25,9 +24,6 @@ const LoginForm = () => { const [submitted, setSubmitted] = useState(false); const { username, password } = inputs; const [userState, userDispatch] = useContext(UserContext); - const [turnstileEnabled, setTurnstileEnabled] = useState(false); - const [turnstileSiteKey, setTurnstileSiteKey] = useState(''); - const [turnstileToken, setTurnstileToken] = useState(''); let navigate = useNavigate(); const [status, setStatus] = useState({}); @@ -41,11 +37,6 @@ const LoginForm = () => { if (status) { status = JSON.parse(status); setStatus(status); - - if (status.turnstile_check) { - setTurnstileEnabled(true); - setTurnstileSiteKey(status.turnstile_site_key); - } } }, []); @@ -85,12 +76,7 @@ const LoginForm = () => { async function handleSubmit(e) { setSubmitted(true); if (username && password) { - if (turnstileEnabled && turnstileToken === '') { - showInfo('请稍后几秒重试,Turnstile 正在检查用户环境!'); - return; - } - - const res = await API.post(`/api/user/login?turnstile=${turnstileToken}`, { + const res = await API.post(`/api/user/login`, { username, password, }); @@ -133,16 +119,6 @@ const LoginForm = () => { value={password} onChange={handleChange} /> - {turnstileEnabled ? ( - { - setTurnstileToken(token); - }} - /> - ) : ( - <> - )}