Working application

Author: bitscoder-dotcom

src/main/java/com/bitscoderdotcom/link_generator_system/controller/AuthController.java

@@ -4,12 +4,18 @@
 import com.bitscoderdotcom.link_generator_system.dto.SignInRequest;
 import com.bitscoderdotcom.link_generator_system.dto.UserRegistrationRequest;
 import com.bitscoderdotcom.link_generator_system.security.service.AuthService;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import lombok.AllArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import java.util.Objects;
 
 @Controller
 @AllArgsConstructor
@@ -18,13 +24,44 @@ public class AuthController {
 
     private AuthService authService;
 
+    @GetMapping("/register")
+    public String showRegistrationForm(Model model) {
+        model.addAttribute("userRegistrationRequest", new UserRegistrationRequest());
+        return "register";
+    }
+
     @PostMapping("/register")
-    public ResponseEntity<ApiResponse<UserRegistrationRequest.Response>> register(@RequestBody UserRegistrationRequest request) {
-        return authService.register(request);
+    public String register(UserRegistrationRequest request, RedirectAttributes redirectAttributes) {
+        String response = authService.register(request);
+        if (response.equals("Company registered successfully")) {
+            redirectAttributes.addFlashAttribute("message", response);
+            return "redirect:/lgsApp/v1/auth/signIn";
+        } else {
+            redirectAttributes.addFlashAttribute("message", response);
+            return "redirect:/registrationFailure";
+        }
+    }
+
+    @GetMapping("/signIn")
+    public String showSignInForm(Model model) {
+        model.addAttribute("signInRequest", new SignInRequest());
+        return "signIn";
     }
 
     @PostMapping("/signIn")
-    public ResponseEntity<ApiResponse<SignInRequest.Response>> signIn(@RequestBody SignInRequest request) {
-        return authService.signIn(request);
+    public String signIn(@ModelAttribute SignInRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+        ResponseEntity<ApiResponse<SignInRequest.Response>> apiResponse = authService.signIn(request);
+        if (apiResponse.getStatusCode() == HttpStatus.OK) {
+            // Create a new cookie
+            Cookie cookie = new Cookie("token", Objects.requireNonNull(apiResponse.getBody()).getData().getToken());
+            cookie.setHttpOnly(true);
+            // Add the cookie to the response
+            response.addCookie(cookie);
+            // Redirect to the generateInvoice page
+            return "redirect:/lgsApp/v1/invoice/generateInvoice";
+        } else {
+            redirectAttributes.addFlashAttribute("error", Objects.requireNonNull(apiResponse.getBody()).getMessage());
+            return "redirect:/error";
+        }
     }
 }

src/main/java/com/bitscoderdotcom/link_generator_system/controller/HomeController.java

@@ -0,0 +1,13 @@
+package com.bitscoderdotcom.link_generator_system.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class HomeController {
+
+    @GetMapping("/")
+    public String home() {
+        return "home";
+    }
+}

src/main/java/com/bitscoderdotcom/link_generator_system/controller/InvoiceController.java

@@ -5,6 +5,7 @@
 import com.bitscoderdotcom.link_generator_system.entities.Invoice;
 import com.bitscoderdotcom.link_generator_system.service.service.InvoiceService;
 import lombok.AllArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -19,9 +20,27 @@ public class InvoiceController {
 
     private InvoiceService invoiceService;
 
+    @GetMapping("/generateInvoice")
+    public String showInvoiceForm(Model model) {
+        model.addAttribute("invoiceDto", new InvoiceDto());
+        return "generateInvoice";
+    }
+
     @PostMapping("/generateInvoice")
-    public ResponseEntity<ApiResponse<InvoiceDto.Response>> generateInvoice(@RequestBody InvoiceDto invoiceDto, Principal principal) {
-        return invoiceService.generateInvoice(invoiceDto, principal);
+    public String generateInvoice(@ModelAttribute InvoiceDto invoiceDto, Principal principal, Model model) {
+        ResponseEntity<ApiResponse<InvoiceDto.Response>> apiResponse = invoiceService.generateInvoice(invoiceDto, principal);
+
+        // Check if the invoice was generated successfully
+        if (apiResponse != null && apiResponse.getStatusCode() == HttpStatus.OK) {
+            // Add a success message
+            model.addAttribute("message", "Invoice generated successfully. An email has been sent to the customer.");
+        } else {
+            // Add an error message
+            model.addAttribute("error", "There was an error generating the invoice.");
+        }
+
+        // Stay on the same page
+        return "generateInvoice";
     }
 
     @GetMapping("/{invoiceId}/payment")

src/main/java/com/bitscoderdotcom/link_generator_system/dto/UserRegistrationRequest.java

@@ -12,6 +12,7 @@
 @AllArgsConstructor
 @Getter
 @Setter
+@ToString
 public class UserRegistrationRequest {
 
     private String name;

src/main/java/com/bitscoderdotcom/link_generator_system/security/WebSecurityConfig.java

@@ -5,6 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
@@ -80,13 +81,12 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http.csrf().disable()
                 .headers().frameOptions().disable()
                 .and()
-                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+                .sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
                 .and()
                 .authorizeHttpRequests()
-                .requestMatchers("/lgsApp/v1/auth/**").permitAll()
-                .requestMatchers("/h2-console/**").permitAll()
-                .requestMatchers("/lgsApp/v1/invoice/{invoiceId}/payment", "/payment", "/paymentSuccess", "/error" ).permitAll()
-                .anyRequest().authenticated()
+                .requestMatchers(HttpMethod.POST,"/lgsApp/v1/invoice/generateInvoice").authenticated()
+                .anyRequest().permitAll()
                 .and()
                 .formLogin();
 

src/main/java/com/bitscoderdotcom/link_generator_system/security/jwt/AuthTokenFilter.java

@@ -3,6 +3,7 @@
 import com.bitscoderdotcom.link_generator_system.security.service.UserDetailsServiceImpl;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -46,11 +47,23 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         filterChain.doFilter(request, response);
     }
 
-    private String parseJwt(HttpServletRequest request) {
-        String headerAuth = request.getHeader("Authorization");
+//    private String parseJwt(HttpServletRequest request) {
+//        String headerAuth = request.getHeader("Authorization");
+//
+//        if (StringUtils.hasText(headerAuth) && headerAuth.startsWith("Bearer ")) {
+//            return headerAuth.substring(7);
+//        }
+//        return null;
+//    }
 
-        if (StringUtils.hasText(headerAuth) && headerAuth.startsWith("Bearer ")) {
-            return headerAuth.substring(7);
+    private String parseJwt(HttpServletRequest request) {
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                if (cookie.getName().equals("token")) {
+                    return cookie.getValue();
+                }
+            }
         }
         return null;
     }

src/main/java/com/bitscoderdotcom/link_generator_system/security/service/AuthService.java

@@ -38,9 +38,9 @@ public class AuthService {
     private EmailService emailService;
 
     @Transactional
-    public ResponseEntity<ApiResponse<UserRegistrationRequest.Response>> register(UserRegistrationRequest request) {
+    public String register(UserRegistrationRequest request) {
 
-        log.info("Register method called with request: {}", request);
+        log.info("Register method called");
 
         String username = request.getName();
         String email = request.getEmail();
@@ -50,16 +50,12 @@ public ResponseEntity<ApiResponse<UserRegistrationRequest.Response>> register(Us
 
         if (usernameExists) {
             log.info("Username already taken: {}", username);
-            throw new ResponseStatusException(
-                    HttpStatus.BAD_REQUEST, "Username is already taken!"
-            );
+            return "Username is already taken!";
         }
 
         if (emailExists) {
             log.info("Email already in use: {}", email);
-            throw new ResponseStatusException(
-                    HttpStatus.BAD_REQUEST, "Email Address already in use!"
-            );
+            return "Email Address already in use!";
         }
 
         Company company = new Company();
@@ -77,15 +73,7 @@ public ResponseEntity<ApiResponse<UserRegistrationRequest.Response>> register(Us
         emailDetails.setMessageBody("Your account has been registered on our platform");
         emailService.sendEmail(emailDetails);
 
-        UserRegistrationRequest.Response response = new UserRegistrationRequest.Response(
-                LocalDateTime.now(),
-                UUID.randomUUID().toString(),
-                true,
-                "Company registered successfully",
-                request.getName()
-        );
-
-        return createSuccessResponse("Company registered successfully", response);
+        return "Company registered successfully";
     }
 
     public ResponseEntity<ApiResponse<SignInRequest.Response>> signIn(SignInRequest request) {

src/main/java/com/bitscoderdotcom/link_generator_system/security/service/UserDetailsServiceImpl.java

@@ -33,7 +33,7 @@ public UserDetails loadUserByUsername(String email) throws UsernameNotFoundExcep
                 });
 
         log.info("Found COMPANY user: {}", email);
-        return buildUserDetails(company);
+        return UserDetailsImpl.build(company);
     }
 
     private UserDetails buildUserDetails(Company company) {

src/main/java/com/bitscoderdotcom/link_generator_system/service/service/InvoiceService.java

@@ -8,8 +8,8 @@
 import java.security.Principal;
 
 public interface InvoiceService {
-
     ResponseEntity<ApiResponse<InvoiceDto.Response>> generateInvoice(InvoiceDto invoiceDto, Principal principal);
     ResponseEntity<String> processPayment(String linkId, String invoiceId);
     Invoice getInvoiceById(String id);
+
 }

src/main/java/com/bitscoderdotcom/link_generator_system/service/service/serviceImpl/InvoiceServiceImpl.java

@@ -152,6 +152,8 @@ private String createMessageBody(Invoice invoice, PaymentLink paymentLink) {
         messageBody += "<hr />";
         messageBody += "<p>Please click the following link to view and pay your invoice: <a href=\"" +
                 paymentLink.getUrl() + "\">" + paymentLink.getUrl() + "</a></p>";
+        messageBody += "<p>LinkId for payment verification: " + paymentLink.getId() + "</p>";
+        messageBody += "<p><strong>Please note:</strong> The LinkId and the InvoiceId are necessary for validating the payment when requested.</p>";
         messageBody += "<p>Thank you.</p>";
         messageBody += "</body></html>";
         return messageBody;

src/main/resources/templates/error.html

@@ -28,11 +28,9 @@ <h1>Error</h1>
     <a href="/">Go Back</a>
 </div>
 <script>
-    // Get the error message from the URL query string
     var urlParams = new URLSearchParams(window.location.search);
     var errorMessage = urlParams.get('error');
 
-    // Display the error message
     document.getElementById('errorMessage').textContent = errorMessage;
 </script>
 </body>