From 656586e0357c1e4f7089d5230f753a898abc6c5f Mon Sep 17 00:00:00 2001 From: zkldi <20380519+zkldi@users.noreply.github.com> Date: Thu, 2 Dec 2021 09:56:56 +0000 Subject: [PATCH] Enable captcha in the UI. --- client/package.json | 2 ++ client/pnpm-lock.yaml | 30 ++++++++++++++++ client/src/app/pages/RegisterPage.tsx | 35 +++++++++++++------ .../dashboard/import/BeatorajaDBPage.tsx | 1 + 4 files changed, 57 insertions(+), 11 deletions(-) diff --git a/client/package.json b/client/package.json index ae980ebd0..12c5682b6 100644 --- a/client/package.json +++ b/client/package.json @@ -37,6 +37,7 @@ "@svgr/webpack": "4.3.2", "@tanem/svg-injector": "8.0.50", "@types/aes-js": "^3.1.1", + "@types/react-google-recaptcha": "^2.1.2", "apexcharts": "3.19.2", "babel-loader": "8.0.6", "babel-plugin-named-asset-import": "^0.3.7", @@ -71,6 +72,7 @@ "react-async": "10.0.1", "react-bootstrap": "^1.6.1", "react-dom": "16.12.0", + "react-google-recaptcha": "^2.1.0", "react-hot-toast": "2.0.0", "react-markdown": "^7.0.1", "react-perfect-scrollbar": "1.5.8", diff --git a/client/pnpm-lock.yaml b/client/pnpm-lock.yaml index 6ec12d949..4a9356f88 100644 --- a/client/pnpm-lock.yaml +++ b/client/pnpm-lock.yaml @@ -19,6 +19,7 @@ specifiers: '@types/node': 16.0.0 '@types/react': 17.0.13 '@types/react-dom': 17.0.8 + '@types/react-google-recaptcha': ^2.1.2 '@types/react-router': 5.1.15 '@types/react-router-dom': 5.1.7 '@types/react-table': 7.7.2 @@ -69,6 +70,7 @@ specifiers: react-bootstrap: ^1.6.1 react-dev-utils: ^9.1.0 react-dom: 16.12.0 + react-google-recaptcha: ^2.1.0 react-hot-toast: 2.0.0 react-markdown: ^7.0.1 react-perfect-scrollbar: 1.5.8 @@ -109,6 +111,7 @@ dependencies: '@svgr/webpack': 4.3.2 '@tanem/svg-injector': 8.0.50 '@types/aes-js': 3.1.1 + '@types/react-google-recaptcha': 2.1.2 apexcharts: 3.19.2 babel-loader: 8.0.6_webpack@4.41.0 babel-plugin-named-asset-import: 0.3.7 @@ -143,6 +146,7 @@ dependencies: react-async: 10.0.1_react@17.0.2 react-bootstrap: 1.6.1_react-dom@16.12.0+react@17.0.2 react-dom: 16.12.0_react@17.0.2 + react-google-recaptcha: 2.1.0_react@17.0.2 react-hot-toast: 2.0.0_react-dom@16.12.0+react@17.0.2 react-markdown: 7.0.1_43559efe81628b42e1e465743e6a3ffa react-perfect-scrollbar: 1.5.8_react-dom@16.12.0+react@17.0.2 @@ -3013,6 +3017,12 @@ packages: '@types/react': 17.0.13 dev: true + /@types/react-google-recaptcha/2.1.2: + resolution: {integrity: sha512-Zeb0pwDeXHYIQy5mNgewMr+jf4xtrjSHTdJW8wrubNB6sNEaxqo8yk02HVpwy7p7Hzh5y6iSz6gKoPonVBlswQ==} + dependencies: + '@types/react': 17.0.13 + dev: false + /@types/react-router-dom/5.1.7: resolution: {integrity: sha512-D5mHD6TbdV/DNHYsnwBTv+y73ei+mMjrkGrla86HthE4/PVvL1J94Bu3qABU+COXzpL23T1EZapVVpwHuBXiUg==} dependencies: @@ -9754,6 +9764,16 @@ packages: strip-json-comments: 2.0.1 dev: true + /react-async-script/1.2.0_react@17.0.2: + resolution: {integrity: sha512-bCpkbm9JiAuMGhkqoAiC0lLkb40DJ0HOEJIku+9JDjxX3Rcs+ztEOG13wbrOskt3n2DTrjshhaQ/iay+SnGg5Q==} + peerDependencies: + react: '>=16.4.1' + dependencies: + hoist-non-react-statics: 3.3.2 + prop-types: 15.7.2 + react: 17.0.2 + dev: false + /react-async/10.0.1_react@17.0.2: resolution: {integrity: sha512-ORUz5ca0B57QgBIzEZM5SuhJ6xFjkvEEs0gylLNlWf06vuVcLZsjIw3wx58jJkZG38p+0nUAxRgFW2b7mnVZzA==} peerDependencies: @@ -9840,6 +9860,16 @@ packages: resolution: {integrity: sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==} dev: false + /react-google-recaptcha/2.1.0_react@17.0.2: + resolution: {integrity: sha512-K9jr7e0CWFigi8KxC3WPvNqZZ47df2RrMAta6KmRoE4RUi7Ys6NmNjytpXpg4HI/svmQJLKR+PncEPaNJ98DqQ==} + peerDependencies: + react: '>=16.4.1' + dependencies: + prop-types: 15.7.2 + react: 17.0.2 + react-async-script: 1.2.0_react@17.0.2 + dev: false + /react-hot-toast/2.0.0_react-dom@16.12.0+react@17.0.2: resolution: {integrity: sha512-J0J2rcSvKetlziVquwESgk85pV9JB0Dz3RJIZcAEv7CWU2y2z8BQqxmZHZUxjPKIBGPqXAocZch4Kj4oUdX4+w==} engines: {node: '>=10'} diff --git a/client/src/app/pages/RegisterPage.tsx b/client/src/app/pages/RegisterPage.tsx index 09f69dde8..55070887b 100644 --- a/client/src/app/pages/RegisterPage.tsx +++ b/client/src/app/pages/RegisterPage.tsx @@ -2,9 +2,10 @@ import useSetSubheader from "components/layout/header/useSetSubheader"; import Divider from "components/util/Divider"; import { UserContext } from "context/UserContext"; import { useFormik } from "formik"; -import { TachiConfig } from "lib/config"; +import { ClientConfig, TachiConfig } from "lib/config"; import React, { useContext, useState } from "react"; import { Button, Col, Form } from "react-bootstrap"; +import ReCAPTCHA from "react-google-recaptcha"; import toast from "react-hot-toast"; import { Link, useHistory } from "react-router-dom"; import { PublicUserDocument } from "tachi-common"; @@ -244,16 +245,28 @@ function RegisterForm({ onChange={formik.handleChange} /> - - Invite Code - - + {ClientConfig.MANDATE_LOGIN && ( + + Invite Code + + + )} + + { + formik.setFieldValue("captcha", v); + }} + /> {err} diff --git a/client/src/app/pages/dashboard/import/BeatorajaDBPage.tsx b/client/src/app/pages/dashboard/import/BeatorajaDBPage.tsx index 365497939..596ad9165 100644 --- a/client/src/app/pages/dashboard/import/BeatorajaDBPage.tsx +++ b/client/src/app/pages/dashboard/import/BeatorajaDBPage.tsx @@ -8,6 +8,7 @@ import { Link } from "react-router-dom"; export default function BeatorajaDBPage() { useSetSubheader(["Import Scores", "Beatoraja Database File"]); + return ( <>