Add register form validation

UdhayaShan1 · Jun 17, 2024 · 1623827 · 1623827
1 parent c89e1c2
commit 1623827
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 27 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.5'
 }
 
-group = 'com.example'
+group = 'com.docker3'
 version = '0.0.1-SNAPSHOT'
 
 java {

diff --git a/build/classes/java/main/com/docker3/controller/UserController.class b/build/classes/java/main/com/docker3/controller/UserController.class
diff --git a/build/classes/java/main/com/docker3/service/AuthService.class b/build/classes/java/main/com/docker3/service/AuthService.class
diff --git a/build/resources/main/static/js/login.js b/build/resources/main/static/js/login.js
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/AuthController.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/AuthController.class.uniqueId0
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/AuthService.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/AuthService.class.uniqueId1
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/UserController.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/UserController.class.uniqueId2
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/com/docker3/controller/UserController.java b/src/main/java/com/docker3/controller/UserController.java
@@ -6,6 +6,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,7 +15,7 @@
 import com.docker3.service.AuthService;
 import com.docker3.service.UserService;
 
-@RestController
+@Controller
 public class UserController {
     @Autowired
     private AuthService authService;

diff --git a/src/main/java/com/docker3/service/AuthService.java b/src/main/java/com/docker3/service/AuthService.java
@@ -15,15 +15,14 @@ public class AuthService {
     @Autowired
     private PasswordEncoder passwordEncoder;
 
-    public boolean isUserRegistered(String username) {
-        User user = userRepository.findByUsername(username);
-        return user != null;
-    }
-
     public void registerUser(User user) throws RuntimeException {
         if (userRepository.findByUsername(user.getUsername()) != null) {
-            throw new UserAlreadyExistsException("Username already exists!");
+            throw new UserAlreadyExistsException("Username already taken");
         }
+        if (userRepository.findByEmail(user.getEmail()) != null) {
+            throw new UserAlreadyExistsException("Email already used");
+        }
+
         user.setPassword(passwordEncoder.encode(user.getPassword()));
         userRepository.save(user);
     }

diff --git a/src/main/resources/static/js/register.js b/src/main/resources/static/js/register.js
@@ -1,8 +1,8 @@
 document.getElementById('registerForm').addEventListener('submit', async function (event) {
     event.preventDefault();
-    const username = document.getElementById('username').value.trim();
+    const username = document.getElementById('username').value.trim().toLowerCase();
     const password = document.getElementById('password').value.trim();
-    const email = document.getElementById('email').value.trim();
+    const email = document.getElementById('email').value.trim().toLowerCase();
     const errorMessageElement = document.getElementById('errorMessage');
 
     // Clear previous error message
@@ -19,13 +19,16 @@ document.getElementById('registerForm').addEventListener('submit', async functio
         return;
     }
 
+    if (password.length < 8) {
+        errorMessageElement.textContent = 'Password must be at least 8 characters long.';
+        return;
+    }
+
     if (!email) {
         errorMessageElement.textContent = 'Email is required.';
         return;
     }
 
-
-
     try {
         const response = await fetch('/register', {
             method: 'POST',

diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
@@ -4,24 +4,28 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Login</title>
-    <link rel="stylesheet" href="/css/styles.css">
+    <link rel="stylesheet" href="/css/login.css">
 </head>
 <body>
-<h2>Login</h2>
-<form id="loginForm">
-    <div>
-        <label>Username:</label>
-        <input type="text" id="username" name="username">
+<div class="container">
+    <h2>Login</h2>
+    <form id="loginForm">
+        <div class="form-group">
+            <label for="username">Username:</label>
+            <input type="text" id="username" name="username" placeholder="Enter your username">
+        </div>
+        <div class="form-group">
+            <label for="password">Password:</label>
+            <input type="password" id="password" name="password" placeholder="Enter your password">
+        </div>
+        <div class="form-group">
+            <button type="submit" class="btn">Login</button>
+        </div>
+    </form>
+    <div class="link-container">
+        <a href="/register">Register</a>
     </div>
-    <div>
-        <label>Password:</label>
-        <input type="password" id="password" name="password">
-    </div>
-    <div>
-        <button type="submit">Login</button>
-    </div>
-</form>
-<a href="/register">Register</a>
+</div>
 
 <div id="popup" class="popup">
     <div class="popup-inner">