Update scripts, controllers, security config, templates, and tests

Author: tsviz

build_and_run_app.sh

@@ -19,9 +19,9 @@ cleanup() {
 }
 
 # Trap the EXIT signal to perform cleanup
-trap cleanup EXIT
+# trap cleanup EXIT
 
 set -e # Exit immediately if a command exits with a non-zero status.
 mvn clean package -Dmaven.test.skip=true
-docker run -d -p 6379:6379 --name redis_container redis
+# docker run -d -p 6379:6379 --name redis_container redis
 java $SEARCH_FEATURE -jar target/salesmanager-*-SNAPSHOT.jar --spring.redis.host=localhost --spring.redis.port=6379 --spring.redis.mode=standalone --server.port=8086 --spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect

src/main/java/net/codejava/AppController.java

@@ -168,12 +168,17 @@ public String loginGet(Model model) {
 	public String loginPost(HttpServletRequest request, Model model) {
 		String username = request.getParameter("username");
 		String password = request.getParameter("password");
+		boolean rememberMe = "on".equals(request.getParameter("rememberMe"));
 
 		// Authenticate the user
 		Authentication auth = new UsernamePasswordAuthenticationToken(username, password);
 		try {
 			auth = authenticationManager.authenticate(auth);
 			SecurityContextHolder.getContext().setAuthentication(auth);
+
+			if (rememberMe) {
+				// Logic for handling "Remember Me" can be added here if needed
+			}
 		} catch (BadCredentialsException e) {
 			model.addAttribute("error", "Invalid username or password.");
 			return "login";

src/main/java/net/codejava/SecurityConfig.java

@@ -29,20 +29,22 @@ protected void configure(HttpSecurity http) throws Exception {
             .authorizeRequests()
                 .antMatchers("/login").permitAll()
                 .antMatchers(HttpMethod.POST, "/import").permitAll()
-                // .anyRequest().permitAll()
                 .anyRequest().authenticated()
                 .and()
             .formLogin()
-                // .loginPage("/login")
-                // .loginProcessingUrl("/login") // This should match the form action in your login.html file
                 .usernameParameter("username")
                 .passwordParameter("password")
-                .defaultSuccessUrl("/", true) // This is the URL to redirect to after a successful login
+                .defaultSuccessUrl("/", true)
                 .failureUrl("/login?error=true")
                 .permitAll()
                 .and()
+            .rememberMe()
+                .key("uniqueAndSecret")
+                .rememberMeParameter("rememberMe")
+                .tokenValiditySeconds(7 * 24 * 60 * 60) // 7 days
+                .and()
             .logout()
-                .logoutUrl("/logout") // This is the URL to send the user to once they have logged out
+                .logoutUrl("/logout")
                 .invalidateHttpSession(true)
                 .permitAll();
     }

src/main/resources/templates/login.html

@@ -29,6 +29,10 @@ <h1>Welcome, Sales Manager!</h1>
             <input type="text" id="username" name="username" required />
             <label for="password">Password:</label>
             <input type="password" id="password" name="password" required />
+            <div>
+                <input type="checkbox" id="rememberMe" name="rememberMe" />
+                <label for="rememberMe">Remember Me</label>
+            </div>
             <button type="submit">Login</button>
         </form>
     </div>

src/test/java/net/codejava/JUnit5ExampleTest12.java

@@ -11,7 +11,7 @@
 public class JUnit5ExampleTest12 {
 
     // Global variables to control test behavior
-    private static boolean isFeatureEnabled = true;
+    private static boolean isSearchFeatureEnabled = true;
     private static int maxRecordsPerPage = 20;
     private static String defaultSearchQuery = "Laptop";
     private static String defaultItemName = "Smartphone";
@@ -23,7 +23,7 @@ public class JUnit5ExampleTest12 {
 
     @Test
     void testEnableSearchFeatureDefaultValue() {
-        if (isFeatureEnabled) {
+        if (isSearchFeatureEnabled) {
             System.out.println(testLogPrefix + "Feature is enabled: Running testEnableSearchFeatureDefaultValue");
             assertTrue(appController.getEnableSearchFeature(), testLogPrefix + "enableSearchFeature should be true by default");
         } else {
@@ -33,7 +33,7 @@ void testEnableSearchFeatureDefaultValue() {
         System.out.println(testLogPrefix + "Checking additional conditions...");
         System.out.println(testLogPrefix + "Test completed successfully.");
         System.out.println(testLogPrefix + "Logging additional information.");
-        System.out.println(testLogPrefix + "Feature flag value: " + isFeatureEnabled);
+        System.out.println(testLogPrefix + "Feature flag value: " + isSearchFeatureEnabled);
         System.out.println(testLogPrefix + "Default search query: " + defaultSearchQuery);
         System.out.println(testLogPrefix + "Default item name: " + defaultItemName);
         System.out.println(testLogPrefix + "Default item price: " + defaultItemPrice);
@@ -67,7 +67,7 @@ void testDefaultItemPrice() {
 
     @Test
     void testEnableSearchFeatureInHomePage() {
-        if (isFeatureEnabled) {
+        if (isSearchFeatureEnabled) {
             System.out.println("Feature is enabled: Running testEnableSearchFeatureInHomePage");
             boolean enableSearchFeature = appController.getEnableSearchFeature();
             System.out.println("Home Page - enableSearchFeature: " + enableSearchFeature);
@@ -79,7 +79,7 @@ void testEnableSearchFeatureInHomePage() {
 
     @Test
     void testEnableSearchFeatureInNewForm() {
-        if (isFeatureEnabled) {
+        if (isSearchFeatureEnabled) {
             System.out.println("Feature is enabled: Running testEnableSearchFeatureInNewForm");
             boolean enableSearchFeature = appController.getEnableSearchFeature();
             System.out.println("New Form - enableSearchFeature: " + enableSearchFeature);
@@ -91,7 +91,7 @@ void testEnableSearchFeatureInNewForm() {
 
     @Test
     void testEnableSearchFeatureInEditForm() {
-        if (isFeatureEnabled) {
+        if (isSearchFeatureEnabled) {
             System.out.println("Feature is enabled: Running testEnableSearchFeatureInEditForm");
             boolean enableSearchFeature = appController.getEnableSearchFeature();
             System.out.println("Edit Form - enableSearchFeature: " + enableSearchFeature);
@@ -103,7 +103,7 @@ void testEnableSearchFeatureInEditForm() {
 
     @Test
     void testEnableSearchFeatureInSearch() {
-        if (isFeatureEnabled) {
+        if (isSearchFeatureEnabled) {
             System.out.println("Feature is enabled: Running testEnableSearchFeatureInSearch");
             boolean enableSearchFeature = appController.getEnableSearchFeature();
             System.out.println("Search - enableSearchFeature: " + enableSearchFeature);
@@ -139,7 +139,7 @@ void testDefaultItemPriceInSearch() {
 
     @Test
     void testEnableSearchFeatureInSave() {
-        if (isFeatureEnabled) {
+        if (isSearchFeatureEnabled) {
             System.out.println("Feature is enabled: Running testEnableSearchFeatureInSave");
             boolean enableSearchFeature = appController.getEnableSearchFeature();
             System.out.println("Save - enableSearchFeature: " + enableSearchFeature);