Fix issues #129, #130, #94, #106, #105, #126

- #129: Add delete/toggleActive functionality for customers (AdminCustomerController)
- #130: Add isActive boolean flag in User model with soft delete and security checks
- #94: Fix Update Product Details (AdminProductController, productsUpdate.jsp)
- #106: Fix misaligned login button on mobile (adminlogin.jsp CSS)
- #105: Add Dockerfile and docker-compose.yml for easier setup
- #126: Split Admin controller into AdminController, AdminCategoryController, AdminProductController, AdminCustomerController

Additional: AdminDataLoader for BCrypt admin password, fix SecurityConfiguration UserDetailsService
Made-with: Cursor

Author: Snehil208001

.gitignore

@@ -39,4 +39,5 @@ target
 .flattened-pom.xml
 secrets.yml
 .gradletasknamecache
-.sts4-cache
+.sts4-cache
+cookies.txt

JtProject/.dockerignore

@@ -0,0 +1,6 @@
+target/
+.git
+.gitignore
+*.iml
+.idea
+*.md

JtProject/Dockerfile

@@ -0,0 +1,28 @@
+# Build stage
+FROM maven:3.8-eclipse-temurin-11 AS build
+WORKDIR /app
+
+# Copy pom.xml and download dependencies
+COPY pom.xml .
+RUN mvn dependency:go-offline -B
+
+# Copy source code and build
+COPY src ./src
+RUN mvn clean package -DskipTests -B
+
+# Run stage
+FROM eclipse-temurin:11-jre-alpine
+WORKDIR /app
+
+# Create non-root user
+RUN addgroup -S spring && adduser -S spring -G spring
+USER spring:spring
+
+# Copy jar from build stage
+COPY --from=build /app/target/*.jar app.jar
+
+# Expose port
+EXPOSE 8080
+
+# Run the application
+ENTRYPOINT ["java", "-jar", "app.jar"]

JtProject/basedata.sql

@@ -2,8 +2,8 @@
 SET SQL_MODE ='IGNORE_SPACE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION';
 
 # create database and use it
-CREATE DATABASE IF NOT EXISTS ecommjava;
-USE ecommjava;
+CREATE DATABASE IF NOT EXISTS ecomjava;
+USE ecomjava;
 
 # create the category table
 CREATE TABLE IF NOT EXISTS CATEGORY(
@@ -30,13 +30,15 @@ email    varchar(255) null,
 password varchar(255) null,
 role     varchar(255) null,
 username varchar(255) null,
+is_active tinyint(1) not null default 1,
 UNIQUE (username)
 );
 
-# insert default customers
-INSERT INTO CUSTOMER(address, email, password, role, username) VALUES
-                                                                   ('123, Albany Street', 'admin@nyan.cat', '123', 'ROLE_ADMIN', 'admin'),
-                                                                   ('765, 5th Avenue', 'lisa@gmail.com', '765', 'ROLE_NORMAL', 'lisa');
+# insert default customers (BCrypt: admin=123)
+# For lisa=765, register via /register or update password in DB with BCrypt hash
+INSERT INTO CUSTOMER(address, email, password, role, username, is_active) VALUES
+('123, Albany Street', 'admin@nyan.cat', '$2a$10$dXJ3SW6G7P50lGmMkkmwe.20cQQubK3.HZWzG3YB1tlRy.fqvM/BG', 'ROLE_ADMIN', 'admin', 1),
+('765, 5th Avenue', 'lisa@gmail.com', '765', 'ROLE_NORMAL', 'lisa', 1);
 
 # create the product table
 CREATE TABLE IF NOT EXISTS PRODUCT(

JtProject/fix_admin_password.sql

@@ -0,0 +1,10 @@
+-- Fix admin password for BCrypt authentication
+-- Run this in your ecomjava database if admin/123 login fails
+-- This updates the admin user's password to BCrypt hash of "123"
+
+USE ecomjava;
+
+UPDATE CUSTOMER 
+SET password = '$2a$10$Gqo6QT80w8V9jOd0hUlA2uj2lDe3bwNgz.eMP8UwnsB6zMVJ2hYh6',
+    is_active = 1
+WHERE username = 'admin';

JtProject/insert_admin.sql

@@ -0,0 +1,4 @@
+USE ecomjava;
+
+INSERT INTO customer (address, email, password, role, username, is_active) VALUES
+('123, Albany Street', 'admin@nyan.cat', '$2a$10$dXJ3SW6G7P50lGmMkkmwe.20cQQubK3.HZWzG3YB1tlRy.fqvM/BG', 'ROLE_ADMIN', 'admin', 1);

JtProject/src/main/java/com/jtspringproject/JtSpringProject/HibernateConfiguration.java

@@ -3,13 +3,16 @@
 import java.util.Properties;
 
 import javax.sql.DataSource;
+import javax.persistence.EntityManagerFactory;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.orm.hibernate5.HibernateTransactionManager;
 import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
@@ -68,5 +71,19 @@ public HibernateTransactionManager transactionManager() {
         HibernateTransactionManager transactionManager = new HibernateTransactionManager();
         transactionManager.setSessionFactory(sessionFactory().getObject());
         return transactionManager;
-    }   
+    }
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan(PACKAGES_TO_SCAN);
+        em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
+        Properties props = new Properties();
+        props.put("hibernate.dialect", DIALECT);
+        props.put("hibernate.show_sql", SHOW_SQL);
+        props.put("hibernate.hbm2ddl.auto", HBM2DDL_AUTO);
+        em.setJpaProperties(props);
+        return em;
+    }
 }

JtProject/src/main/java/com/jtspringproject/JtSpringProject/config/AdminDataLoader.java

@@ -0,0 +1,35 @@
+package com.jtspringproject.JtSpringProject.config;
+
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+
+import com.jtspringproject.JtSpringProject.models.User;
+import com.jtspringproject.JtSpringProject.services.userService;
+
+@Component
+public class AdminDataLoader implements CommandLineRunner {
+
+    private final userService userService;
+    private final PasswordEncoder passwordEncoder;
+
+    public AdminDataLoader(userService userService, PasswordEncoder passwordEncoder) {
+        this.userService = userService;
+        this.passwordEncoder = passwordEncoder;
+    }
+
+    @Override
+    public void run(String... args) {
+        try {
+            User admin = userService.getUserByUsername("admin");
+            if (admin != null && !passwordEncoder.matches("123", admin.getPassword())) {
+                admin.setPassword(passwordEncoder.encode("123"));
+                admin.setActive(true);
+                userService.updateUser(admin);
+                System.out.println(">>> Admin password updated. Login with admin/123");
+            }
+        } catch (Exception e) {
+            System.err.println("AdminDataLoader: " + e.getMessage());
+        }
+    }
+}

JtProject/src/main/java/com/jtspringproject/JtSpringProject/configuration/SecurityConfiguration.java

@@ -32,6 +32,7 @@ SecurityFilterChain adminFilterChain(HttpSecurity http) throws Exception {
             http.antMatcher("/admin/**") 
                    .authorizeHttpRequests(requests -> requests
             		 .requestMatchers(new AntPathRequestMatcher("/admin/login")).permitAll()
+                     .requestMatchers(new AntPathRequestMatcher("/admin/loginvalidate")).permitAll()
                      .requestMatchers(new AntPathRequestMatcher("/admin/**")).hasRole("ADMIN")
                     )
                     .formLogin(login -> login
@@ -93,11 +94,13 @@ UserDetailsService userDetailsService() {
 			if(user == null) {
 	            throw new UsernameNotFoundException("User with username " + username + " not found.");
 			}
+			if(!user.isActive()) {
+				throw new UsernameNotFoundException("User account is deactivated.");
+			}
 			String role =  user.getRole().equals("ROLE_ADMIN") ? "ADMIN":"USER"; 
 
 			return org.springframework.security.core.userdetails.User
 					.withUsername(username)
-					.passwordEncoder(input->passwordEncoder().encode(input))
 					.password(user.getPassword())
 					.roles(role)
 					.build();

JtProject/src/main/java/com/jtspringproject/JtSpringProject/controller/AdminCategoryController.java

@@ -0,0 +1,52 @@
+package com.jtspringproject.JtSpringProject.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.jtspringproject.JtSpringProject.models.Category;
+import com.jtspringproject.JtSpringProject.services.categoryService;
+
+@Controller
+@RequestMapping("/admin")
+public class AdminCategoryController {
+
+	private final categoryService categoryService;
+
+	@Autowired
+	public AdminCategoryController(categoryService categoryService) {
+		this.categoryService = categoryService;
+	}
+
+	@GetMapping("categories")
+	public ModelAndView getCategories() {
+		ModelAndView mView = new ModelAndView("categories");
+		List<Category> categories = this.categoryService.getCategories();
+		mView.addObject("categories", categories);
+		return mView;
+	}
+
+	@PostMapping("/categories")
+	public String addCategory(@RequestParam("categoryname") String categoryName) {
+		this.categoryService.addCategory(categoryName);
+		return "redirect:categories";
+	}
+
+	@GetMapping("categories/delete")
+	public String removeCategory(@RequestParam("id") int id) {
+		this.categoryService.deleteCategory(id);
+		return "redirect:/admin/categories";
+	}
+
+	@GetMapping("categories/update")
+	public String updateCategory(@RequestParam("categoryid") int id, @RequestParam("categoryname") String categoryName) {
+		this.categoryService.updateCategory(id, categoryName);
+		return "redirect:/admin/categories";
+	}
+}