diff --git a/src/main/java/com/example/fercoganbackend/controller/AppController.java b/src/main/java/com/example/fercoganbackend/controller/AppController.java index be4e7d5..757f2e7 100644 --- a/src/main/java/com/example/fercoganbackend/controller/AppController.java +++ b/src/main/java/com/example/fercoganbackend/controller/AppController.java @@ -3,6 +3,7 @@ package com.example.fercoganbackend.controller; import com.example.fercoganbackend.component.ContadorWebSocketHandler; import com.example.fercoganbackend.entity.Rol; import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.otros.ConfirmadoTF; import com.example.fercoganbackend.service.ContadorService; import com.example.fercoganbackend.service.UsuarioService; import org.springframework.web.bind.annotation.*; @@ -33,9 +34,9 @@ public class AppController { // Verificar si aprobado @GetMapping("/auth/verificar/{username}") - public String verificar(@PathVariable String username) { - boolean aprobado = usuarioService.estaAprobado(username); - return aprobado ? "Usuario aprobado ✅" : "Usuario pendiente ❌"; + public ConfirmadoTF verificar(@PathVariable String username) { + ConfirmadoTF aprobado = usuarioService.registradoYAprobado(username); + return aprobado; } // Listar pendientes (solo admin/super) diff --git a/src/main/java/com/example/fercoganbackend/otros/ConfirmadoTF.java b/src/main/java/com/example/fercoganbackend/otros/ConfirmadoTF.java new file mode 100644 index 0000000..cb5381f --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/otros/ConfirmadoTF.java @@ -0,0 +1,25 @@ +package com.example.fercoganbackend.otros; + +public class ConfirmadoTF { + private boolean authenticated; + private boolean confirmed; + + public ConfirmadoTF(){ + } + + public boolean isAuthenticated() { + return authenticated; + } + + public void setAuthenticated(boolean authenticated) { + this.authenticated = authenticated; + } + + public boolean isConfirmed() { + return confirmed; + } + + public void setConfirmed(boolean confirmed) { + this.confirmed = confirmed; + } +} diff --git a/src/main/java/com/example/fercoganbackend/service/UsuarioService.java b/src/main/java/com/example/fercoganbackend/service/UsuarioService.java index 2b873cd..587c7b7 100644 --- a/src/main/java/com/example/fercoganbackend/service/UsuarioService.java +++ b/src/main/java/com/example/fercoganbackend/service/UsuarioService.java @@ -1,6 +1,7 @@ package com.example.fercoganbackend.service; import com.example.fercoganbackend.entity.Rol; import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.otros.ConfirmadoTF; import com.example.fercoganbackend.repository.UsuarioRepository; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -39,4 +40,16 @@ public class UsuarioService { public boolean estaAprobado(String username) { return repo.findByUsername(username).map(Usuario::isAprobado).orElse(false); } + public boolean estaRegistrado(String username) { + return repo.findByUsername(username).isPresent(); + } + + public ConfirmadoTF registradoYAprobado(String username){ + ConfirmadoTF confirmadotf = new ConfirmadoTF(); + confirmadotf.setAuthenticated(estaRegistrado(username)); + confirmadotf.setConfirmed(estaAprobado(username)); + return confirmadotf; + } + + }