fix: whether captcha is enabled is determined by pltcfg

ElaBosak233 · Jun 2, 2024 · 9b44b2b · 9b44b2b
1 parent 47561c3
commit 9b44b2b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/internal/extension/files/configs/application.json b/internal/extension/files/configs/application.json
@@ -69,7 +69,6 @@
 		}
 	},
 	"captcha": {
-		"enabled": false,
 		"provider": "turnstile",
 		"turnstile": {
 			"url": "https://challenges.cloudflare.com/turnstile/v0/siteverify",

diff --git a/internal/service/user.go b/internal/service/user.go
@@ -78,7 +78,7 @@ func (t *UserService) Create(req request.UserCreateRequest) (err error) {
 func (t *UserService) Register(req request.UserRegisterRequest) (err error) {
 	hashedPassword, _ := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
 	success := true
-	if config.AppCfg().Captcha.Enabled {
+	if config.PltCfg().User.Register.Captcha.Enabled {
 		capt := captcha.NewCaptcha()
 		success, err = capt.Verify(req.CaptchaToken, req.RemoteIP)
 	}

diff --git a/web/src/pages/login.tsx b/web/src/pages/login.tsx
@@ -130,26 +130,28 @@ export default function Page() {
 							登录
 						</Button>
 					</form>
-					<Box
-						sx={{
-							display: "flex",
-							marginTop: "1rem",
-							justifyContent: "end",
-						}}
-					>
-						没有帐号？
+					{configStore?.pltCfg?.user?.register?.enabled && (
 						<Box
-							onClick={() => navigate("/register")}
 							sx={{
-								fontStyle: "italic",
-								":hover": {
-									cursor: "pointer",
-								},
+								display: "flex",
+								marginTop: "1rem",
+								justifyContent: "end",
 							}}
 						>
-							注册
+							没有帐号？
+							<Box
+								onClick={() => navigate("/register")}
+								sx={{
+									fontStyle: "italic",
+									":hover": {
+										cursor: "pointer",
+									},
+								}}
+							>
+								注册
+							</Box>
 						</Box>
-					</Box>
+					)}
 				</Box>
 			</Box>
 		</>

diff --git a/web/src/pages/register.tsx b/web/src/pages/register.tsx
@@ -11,7 +11,7 @@ import {
 	showErrNotification,
 	showSuccessNotification,
 } from "@/utils/notification";
-import Turnstile, { useTurnstile } from "react-turnstile";
+import Turnstile from "react-turnstile";
 import ReCAPTCHA from "react-google-recaptcha";
 
 export default function Page() {
@@ -20,8 +20,6 @@ export default function Page() {
 	const userApi = useUserApi();
 	const authStore = useAuthStore();
 
-	const turnstile = useTurnstile();
-
 	useEffect(() => {
 		document.title = `注册 - ${configStore?.pltCfg?.site?.title}`;
 	}, []);
@@ -143,7 +141,8 @@ export default function Page() {
 								{...form.getInputProps("password")}
 							/>
 							<Flex justify={"center"}>
-								{configStore?.captchaCfg?.enabled && (
+								{configStore?.pltCfg?.user?.register?.captcha
+									?.enabled && (
 									<>
 										{configStore?.captchaCfg?.provider ===
 											"turnstile" && (