refactor: move captcha modal call from auth to Register component

Author: Miodec

frontend/src/ts/auth.tsx

@@ -9,7 +9,6 @@ import {
 } from "firebase/auth";
 
 import Ape from "./ape";
-import { showRegisterCaptchaModal } from "./components/modals/RegisterCaptchaModal";
 import { updateFromServer as updateConfigFromServer } from "./config/remote";
 import * as DB from "./db";
 import { authEvent } from "./events/auth";
@@ -229,14 +228,11 @@ export async function signUp(
   name: string,
   email: string,
   password: string,
+  captchaToken: string,
 ): Promise<AuthResult> {
   if (!isAuthAvailable()) {
     return { success: false, message: "Authentication uninitialized" };
   }
-  const captchaToken = await showRegisterCaptchaModal();
-  if (captchaToken === undefined || captchaToken === "") {
-    return { success: false, message: "Please complete the captcha" };
-  }
 
   try {
     const createdAuthUser = await createUserWithEmailAndPassword(

frontend/src/ts/components/pages/login/Register.tsx

@@ -22,6 +22,7 @@ import {
 import { isDevEnvironment } from "../../../utils/env";
 import { remoteValidationForm } from "../../../utils/remote-validation";
 import { H3 } from "../../common/Headers";
+import { showRegisterCaptchaModal } from "../../modals/RegisterCaptchaModal";
 import { InputField } from "../../ui/form/InputField";
 import { SubmitButton } from "../../ui/form/SubmitButton";
 import {
@@ -88,8 +89,19 @@ export function Register(): JSXElement {
     },
     onSubmit: async ({ value }) => {
       disableLoginPageInputs();
+      const captchaToken = await showRegisterCaptchaModal();
+      if (captchaToken === undefined || captchaToken === "") {
+        showErrorNotification("Please complete the captcha");
+        enableLoginPageInputs();
+        return;
+      }
       try {
-        const data = await signUp(value.username, value.email, value.password);
+        const data = await signUp(
+          value.username,
+          value.email,
+          value.password,
+          captchaToken,
+        );
         if (!data.success) {
           showErrorNotification(data.message);
         }