Captcha bug fixes

verification/curator-service/api/src/controllers/auth.ts

@@ -216,12 +216,13 @@ export class AuthController {
                     req.body.token,
                 );
 
-                if (!captchaResult)
+                if (!captchaResult) {
                     res.status(403).json({
                         message:
                             "Unfortunately, you didn't pass the captcha. Please, try again later.",
                     });
-
+                    return;
+                }
                 passport.authenticate(
                     'register',
                     (error: Error, user: IUser, info: any) => {
@@ -253,12 +254,13 @@ export class AuthController {
                     req.body.token,
                 );
 
-                if (!captchaResult)
+                if (!captchaResult) {
                     res.status(403).json({
                         message:
                             "Unfortunately, you didn't pass the captcha. Please, try again later.",
                     });
-
+                    return;
+                }
                 passport.authenticate(
                     'login',
                     (

verification/curator-service/api/src/util/single-window-rate-limiters.ts

@@ -10,6 +10,7 @@ export const loginLimiter = rateLimit({
             message: 'Too many failed login attempts, please try again later',
         });
     },
+    skipSuccessfulRequests: true,
 });
 
 export const registerLimiter = rateLimit({
@@ -23,6 +24,7 @@ export const registerLimiter = rateLimit({
                 'You sent too many requests. Please wait a while then try again',
         });
     },
+    skipSuccessfulRequests: true,
 });
 
 export const resetPasswordLimiter = rateLimit({
@@ -36,6 +38,7 @@ export const resetPasswordLimiter = rateLimit({
                 'You sent too many requests. Please wait a while then try again',
         });
     },
+    skipSuccessfulRequests: true,
 });
 
 export const forgotPasswordLimiter = rateLimit({
@@ -49,6 +52,7 @@ export const forgotPasswordLimiter = rateLimit({
                 'You sent too many requests. Please wait a while then try again',
         });
     },
+    skipSuccessfulRequests: true,
 });
 
 export const resetPasswordWithTokenLimiter = rateLimit({
@@ -62,4 +66,5 @@ export const resetPasswordWithTokenLimiter = rateLimit({
                 'You sent too many requests. Please wait a while then try again',
         });
     },
+    skipSuccessfulRequests: true,
 });

verification/curator-service/ui/package.json

@@ -28,7 +28,7 @@
         "react-dom": "^16.13.1",
         "react-draggable": "^4.4.4",
         "react-google-button": "^0.7.2",
-        "react-google-recaptcha": "^2.1.0",
+        "react-google-recaptcha": "^3.0.0-alpha.1",
         "react-gtm-module": "^2.0.11",
         "react-helmet": "^6.1.0",
         "react-highlight-words": "^0.17.0",

verification/curator-service/ui/src/components/landing-page/LandingPage.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Paper, Typography } from '@material-ui/core';
 import { Theme, makeStyles } from '@material-ui/core/styles';
 import { useLastLocation } from 'react-router-last-location';
@@ -33,6 +33,7 @@ import {
 import { MapLink } from '../../constants/types';
 import { getReleaseNotesUrl } from '../util/helperFunctions';
 import { getDiseaseName } from '../../redux/app/thunk';
+import ReCAPTCHA from 'react-google-recaptcha';
 
 interface StylesProps {
     smallHeight: boolean;
@@ -202,6 +203,11 @@ const MoreInformationLinks = ({
     );
 };
 
+const RECAPTCHA_SITE_KEY = window.Cypress
+    ? '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
+    : ((process.env.RECAPTCHA_SITE_KEY ||
+          process.env.REACT_APP_RECAPTCHA_SITE_KEY) as string);
+
 const LandingPage = (): JSX.Element => {
     const dispatch = useAppDispatch();
 
@@ -210,6 +216,7 @@ const LandingPage = (): JSX.Element => {
     const lastLocation = useLastLocation();
     const [registrationScreenOn, setRegistrationScreenOn] = useState(true);
     const [changePasswordScreenOn, setChangePasswordScreenOn] = useState(false);
+    const recaptchaRef = useRef<ReCAPTCHA>(null);
 
     const isLoading = useAppSelector(selectIsLoading);
     const error = useAppSelector(selectError);
@@ -277,15 +284,18 @@ const LandingPage = (): JSX.Element => {
                     <SignUpForm
                         disabled={isLoading}
                         setRegistrationScreenOn={setRegistrationScreenOn}
+                        recaptchaRef={recaptchaRef}
                     />
                 ) : (
                     !changePasswordScreenOn && (
                         <SignInForm
                             disabled={isLoading}
                             setRegistrationScreenOn={setRegistrationScreenOn}
+                            recaptchaRef={recaptchaRef}
                         />
                     )
                 )}
+
                 {changePasswordScreenOn && (
                     <ChangePasswordForm
                         token={token}
@@ -319,6 +329,11 @@ const LandingPage = (): JSX.Element => {
 
                 <PartnerLogos />
             </Paper>
+            <ReCAPTCHA
+                sitekey={RECAPTCHA_SITE_KEY}
+                size="invisible"
+                ref={recaptchaRef}
+            />
         </>
     );
 };

verification/curator-service/ui/src/components/landing-page/SignInForm.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect } from 'react';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
 import { useAppDispatch } from '../../hooks/redux';
@@ -69,22 +69,18 @@ interface FormValues {
 interface SignInFormProps {
     disabled?: boolean;
     setRegistrationScreenOn: (active: boolean) => void;
+    recaptchaRef?: React.RefObject<ReCAPTCHA>;
 }
 
-const RECAPTCHA_SITE_KEY = window.Cypress
-    ? '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
-    : ((process.env.RECAPTCHA_SITE_KEY ||
-          process.env.REACT_APP_RECAPTCHA_SITE_KEY) as string);
-
 export default function SignInForm({
     disabled,
     setRegistrationScreenOn,
+    recaptchaRef,
 }: SignInFormProps): JSX.Element {
     const dispatch = useAppDispatch();
     const classes = useStyles();
 
     const [passwordVisible, setPasswordVisible] = useState(false);
-    const recaptchaRef = useRef<ReCAPTCHA>(null);
 
     const validationSchema = Yup.object().shape({
         email: Yup.string()
@@ -100,7 +96,7 @@ export default function SignInForm({
         },
         validationSchema,
         onSubmit: async (values) => {
-            if (!recaptchaRef.current) return;
+            if (!recaptchaRef || !recaptchaRef.current) return;
 
             // eslint-disable-next-line no-useless-catch
             try {
@@ -238,7 +234,6 @@ export default function SignInForm({
                 >
                     Sign in
                 </Button>
-
                 <Typography className={classes.title}>
                     Don't have an account?{' '}
                     <span
@@ -248,11 +243,6 @@ export default function SignInForm({
                         {' '}
                         Sign up!
                     </span>
-                    <ReCAPTCHA
-                        sitekey={RECAPTCHA_SITE_KEY}
-                        size="invisible"
-                        ref={recaptchaRef}
-                    />
                 </Typography>
             </form>
 

verification/curator-service/ui/src/components/landing-page/SignUpForm.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
 import { useAppDispatch } from '../../hooks/redux';
@@ -90,21 +90,17 @@ interface FormValues {
 interface SignUpFormProps {
     disabled: boolean;
     setRegistrationScreenOn: (active: boolean) => void;
+    recaptchaRef?: React.RefObject<ReCAPTCHA>;
 }
 
-const RECAPTCHA_SITE_KEY = window.Cypress
-    ? '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
-    : ((process.env.RECAPTCHA_SITE_KEY ||
-          process.env.REACT_APP_RECAPTCHA_SITE_KEY) as string);
-
 export default function SignUpForm({
     disabled,
     setRegistrationScreenOn,
+    recaptchaRef,
 }: SignUpFormProps): React.ReactElement {
     const classes = useStyles();
     const dispatch = useAppDispatch();
 
-    const recaptchaRef = useRef<ReCAPTCHA>(null);
     const [passwordVisible, setPasswordVisible] = useState(false);
     const [passwordStrength, setPasswordStrength] = useState(0);
     const [passwordConfirmationVisible, setPasswordConfirmationVisible] =
@@ -161,7 +157,7 @@ export default function SignUpForm({
         },
         validationSchema,
         onSubmit: async (values) => {
-            if (!recaptchaRef.current) return;
+            if (!recaptchaRef || !recaptchaRef.current) return;
             const { email, password, isNewsletterChecked } = values;
             // eslint-disable-next-line no-useless-catch
             try {
@@ -452,12 +448,6 @@ export default function SignUpForm({
                 >
                     Sign up
                 </Button>
-                <ReCAPTCHA
-                    sitekey={RECAPTCHA_SITE_KEY}
-                    size="invisible"
-                    ref={recaptchaRef}
-                />
-
                 <Typography className={classes.title}>
                     Already have an account?{' '}
                     <span

verification/curator-service/ui/src/types/index.d.ts

@@ -3,5 +3,6 @@ export {};
 declare global {
     interface Window {
         dataLayer: any;
+        Cypress: any;
     }
 }