Просмотр исходного кода

revert: do not enable turnstile check on login

JustSong 2 лет назад
Родитель
Сommit
f61d326721
2 измененных файлов с 2 добавлено и 26 удалено
  1. 1 1
      router/api-router.go
  2. 1 25
      web/src/components/LoginForm.js

+ 1 - 1
router/api-router.go

@@ -28,7 +28,7 @@ func SetApiRouter(router *gin.Engine) {
 		userRoute := apiRouter.Group("/user")
 		userRoute := apiRouter.Group("/user")
 		{
 		{
 			userRoute.POST("/register", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.Register)
 			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)
 			userRoute.GET("/logout", controller.Logout)
 
 
 			selfRoute := userRoute.Group("/")
 			selfRoute := userRoute.Group("/")

+ 1 - 25
web/src/components/LoginForm.js

@@ -13,7 +13,6 @@ import {
 import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import { UserContext } from '../context/User';
 import { UserContext } from '../context/User';
 import { API, getLogo, showError, showSuccess, showInfo } from '../helpers';
 import { API, getLogo, showError, showSuccess, showInfo } from '../helpers';
-import Turnstile from 'react-turnstile';
 
 
 const LoginForm = () => {
 const LoginForm = () => {
   const [inputs, setInputs] = useState({
   const [inputs, setInputs] = useState({
@@ -25,9 +24,6 @@ const LoginForm = () => {
   const [submitted, setSubmitted] = useState(false);
   const [submitted, setSubmitted] = useState(false);
   const { username, password } = inputs;
   const { username, password } = inputs;
   const [userState, userDispatch] = useContext(UserContext);
   const [userState, userDispatch] = useContext(UserContext);
-  const [turnstileEnabled, setTurnstileEnabled] = useState(false);
-  const [turnstileSiteKey, setTurnstileSiteKey] = useState('');
-  const [turnstileToken, setTurnstileToken] = useState('');
   let navigate = useNavigate();
   let navigate = useNavigate();
 
 
   const [status, setStatus] = useState({});
   const [status, setStatus] = useState({});
@@ -41,11 +37,6 @@ const LoginForm = () => {
     if (status) {
     if (status) {
       status = JSON.parse(status);
       status = JSON.parse(status);
       setStatus(status);
       setStatus(status);
-
-      if (status.turnstile_check) {
-        setTurnstileEnabled(true);
-        setTurnstileSiteKey(status.turnstile_site_key);
-      }
     }
     }
   }, []);
   }, []);
 
 
@@ -85,12 +76,7 @@ const LoginForm = () => {
   async function handleSubmit(e) {
   async function handleSubmit(e) {
     setSubmitted(true);
     setSubmitted(true);
     if (username && password) {
     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,
         username,
         password,
         password,
       });
       });
@@ -133,16 +119,6 @@ const LoginForm = () => {
               value={password}
               value={password}
               onChange={handleChange}
               onChange={handleChange}
             />
             />
-            {turnstileEnabled ? (
-              <Turnstile
-                sitekey={turnstileSiteKey}
-                onVerify={(token) => {
-                  setTurnstileToken(token);
-                }}
-              />
-            ) : (
-              <></>
-            )}
             <Button color="" fluid size="large" onClick={handleSubmit}>
             <Button color="" fluid size="large" onClick={handleSubmit}>
               登录
               登录
             </Button>
             </Button>