183_12_1_tresorbackend_rupe-master/src/main/java/ch/bbw/pr/tresorbackend/controller/RecaptchaController.java

@@ -1,4 +0,0 @@
-package ch.bbw.pr.tresorbackend.controller;
-
-public class RecaptchaController {
-}

183_12_2_tresorfrontend_rupe-master/src/comunication/FetchUser.js

@@ -103,27 +103,3 @@ export const loginUser = async (loginValue) => {
         throw new Error('Failed to log in. ' || error.message);
     }
 }
-
-
-export const captchaCheck = async (captchaToken) => {
-    const protocol = process.env.REACT_APP_API_PROTOCOL; // "http"
-    const host = process.env.REACT_APP_API_HOST; // "localhost"
-    const port = process.env.REACT_APP_API_PORT; // "8080"
-    const path = process.env.REACT_APP_API_PATH; // "/api"
-    const portPart = port ? `:${port}` : ''; // port is optional
-    const API_URL = `${protocol}://${host}${portPart}${path}`;
-
-    try {
-
-        const res = await fetch(`${API_URL}/verify-recaptcha`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ captchaToken }),
-        });
-
-        return await res.json();
-    } catch (error) {
-        console.error('Failed to log in:', error.message);
-        throw new Error('Failed to log in. ' || error.message);
-    }
-}

183_12_2_tresorfrontend_rupe-master/src/pages/user/LoginUser.js

@@ -1,7 +1,5 @@
-import React, { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { loginUser, captchaCheck } from '../../comunication/FetchUser';
+import { loginUser } from '../../comunication/FetchUser';
-import ReCAPTCHA from 'react-google-recaptcha';
 
 /**
  * LoginUser
@@ -9,26 +7,15 @@ import ReCAPTCHA from 'react-google-recaptcha';
  */
 function LoginUser({ loginValues, setLoginValues }) {
     const navigate = useNavigate();
-    const [recaptchaToken, setRecaptchaToken] = useState(null);
-
-    const handleCaptcha = (token) => {
-        setRecaptchaToken(token);
-    };
 
     const handleSubmit = async (e) => {
         e.preventDefault();
 
-        if (!recaptchaToken) {
-            alert("Please verify reCAPTCHA");
-            return;
-        }
-
         try {
-            const captchaData = await captchaCheck(recaptchaToken);
-
             let isLoginValid = false
             isLoginValid = await loginUser(loginValues);
-            if (isLoginValid || captchaData.success) {
+            console.log(loginValues);
+            if (isLoginValid) {
                 setLoginValues({ userName: loginValues.email, password: loginValues.password });
                 navigate('/');
             }
@@ -46,7 +33,7 @@ function LoginUser({ loginValues, setLoginValues }) {
                         <div>
                             <label>Email:</label>
                             <input
-                                type="email"
+                                type="text"
                                 value={loginValues.email}
                                 onChange={(e) =>
                                     setLoginValues(prevValues => ({ ...prevValues, email: e.target.value }))}
@@ -57,7 +44,7 @@ function LoginUser({ loginValues, setLoginValues }) {
                         <div>
                             <label>Password:</label>
                             <input
-                                type="password"
+                                type="text"
                                 value={loginValues.password}
                                 onChange={(e) =>
                                     setLoginValues(prevValues => ({ ...prevValues, password: e.target.value }))}
@@ -67,10 +54,6 @@ function LoginUser({ loginValues, setLoginValues }) {
                         </div>
                     </aside>
                 </section>
-                <ReCAPTCHA
-                    sitekey="6LdJj1crAAAAABcEz65x0DUAsuJUBCKwdSi1Mewj"
-                    onChange={handleCaptcha}
-                />
                 <button type="submit">Login</button>
             </form>
         </div>

183_12_2_tresorfrontend_rupe-master/src/pages/user/RegisterUser.js

@@ -31,14 +31,6 @@ function RegisterUser({ loginValues, setLoginValues }) {
             return;
         }
 
-        const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]).{8,}$/;;
-
-        if (!passwordRegex.test(credentials.password)) {
-            setErrorMessage('Password must contain at least one uppercase letter, one lowercase letter, one number, and one special character.');
-            return;
-        }
-
-
         try {
             await postUser(credentials);
             setLoginValues({userName: credentials.email, password: credentials.password});
@@ -81,7 +73,7 @@ function RegisterUser({ loginValues, setLoginValues }) {
                     <div>
                         <label>Email:</label>
                         <input
-                                type="email"
+                            type="text"
                             value={credentials.email}
                             onChange={(e) =>
                                 setCredentials(prevValues => ({...prevValues, email: e.target.value}))}
@@ -94,7 +86,7 @@ function RegisterUser({ loginValues, setLoginValues }) {
                         <div>
                             <label>Password:</label>
                             <input
-                                type="password"
+                                type="text"
                                 value={credentials.password}
                                 onChange={(e) =>
                                     setCredentials(prevValues => ({...prevValues, password: e.target.value}))}
@@ -105,7 +97,7 @@ function RegisterUser({ loginValues, setLoginValues }) {
                         <div>
                             <label>Password confirmation:</label>
                             <input
-                                type="password"
+                                type="text"
                                 value={credentials.passwordConfirmation}
                                 onChange={(e) =>
                                     setCredentials(prevValues => ({...prevValues, passwordConfirmation: e.target.value}))}