Merge pull request #33 from OtavioXimarelli/copilot/fix-bf63447b-ec34-47d4-8a73-e4360de2143b

Consolidate controllers and security layer - remove duplicated code and redundant files

Author: OtavioXimarelli

src/main/java/com/otavio/aifoodapp/config/SecurityDebugConfig.java

@@ -1,29 +1,37 @@
 package com.otavio.aifoodapp.controller;
 
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 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.RestController;
 
+import com.otavio.aifoodapp.dto.UserDTO;
 import com.otavio.aifoodapp.model.User;
+import com.otavio.aifoodapp.repository.UserRepository;
 import com.otavio.aifoodapp.security.TokenService;
 import com.otavio.aifoodapp.service.FoodItemService;
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * Controller for authentication related endpoints
+ * Controlador consolidado para autenticação
+ * Combina funcionalidades de status, login, logout e gerenciamento de tokens
  */
 @RestController
 @RequestMapping("/api/auth")
@@ -32,22 +40,79 @@ public class AuthController {
 
     private final FoodItemService foodItemService;
     private final TokenService tokenService;
+    private final UserRepository userRepository;
 
     // Cache para controlar a frequência de verificações por sessão
     private final Map<String, Long> lastStatusChecks = new ConcurrentHashMap<>();
     private static final long STATUS_CHECK_THROTTLE_MS = 2000; // 2 segundos
 
-    public AuthController(FoodItemService foodItemService, TokenService tokenService) {
+    public AuthController(FoodItemService foodItemService, TokenService tokenService, UserRepository userRepository) {
         this.foodItemService = foodItemService;
         this.tokenService = tokenService;
+        this.userRepository = userRepository;
     }
 
+    
     /**
-     * Check if user is authenticated and return user details
-     * Used by the frontend to verify persistent authentication
-     * @return User authentication status and details
+     * Verificar informações do usuário atual
+     * Endpoint alternativo para obter dados do usuário autenticado
+     */
+    @GetMapping("/me")
+    public ResponseEntity<UserDTO> getCurrentUser(Authentication authentication) {
+        if (authentication == null || !authentication.isAuthenticated()) {
+            return ResponseEntity.status(401).build();
+        }
+
+        if (authentication.getPrincipal() instanceof OAuth2User oauth2User) {
+            String email = oauth2User.getAttribute("email");
+            String name = oauth2User.getAttribute("name");
+
+            Optional<User> dbUser = (email != null) ? userRepository.findByEmail(email) : Optional.empty();
+            if (dbUser.isPresent()) {
+                return ResponseEntity.ok(UserDTO.fromUser(dbUser.get()));
+            } else {
+                UserDTO dto = new UserDTO(null, email, name, "USER");
+                return ResponseEntity.ok(dto);
+            }
+        }
+
+        if (authentication.getPrincipal() instanceof User user) {
+            return ResponseEntity.ok(UserDTO.fromUser(user));
+        }
+
+        return ResponseEntity.status(401).build();
+    }
+
+    /**
+     * Endpoint para logout
+     */
+    @PostMapping("/logout")
+    public ResponseEntity<Map<String, String>> logout(HttpServletRequest request,
+                                                      HttpServletResponse response,
+                                                      Authentication authentication) {
+        if (authentication != null) {
+            new SecurityContextLogoutHandler().logout(request, response, authentication);
+        }
+        Map<String, String> result = new HashMap<>();
+        result.put("message", "Logged out successfully");
+        return ResponseEntity.ok(result);
+    }
+
+    /**
+     * Endpoint para obter URL de login do Google
+     */
+    @GetMapping("/login/google")
+    public ResponseEntity<Map<String, String>> getGoogleLoginUrl() {
+        Map<String, String> response = new HashMap<>();
+        response.put("loginUrl", "/oauth2/authorization/google");
+        response.put("message", "Redirect to this URL to login with Google");
+        return ResponseEntity.ok(response);
+    }
+
+    /**
+     * Verificar se o usuário está autenticado e retornar detalhes
+     * Usado pelo frontend para verificar autenticação persistente
      */
-    
     @GetMapping("/status")
     public ResponseEntity<?> authStatus(HttpServletRequest request) {
         log.info("=== AUTH STATUS CHECK ===");