From c2d811c0142bcb798d37fd2ff3a624bb376f6ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Guimar=C3=A3es?= Date: Thu, 26 Nov 2015 09:00:02 -0200 Subject: [PATCH] #9 Fixing admin login behavior, now the same as regular login --- .../api/controller/InterfaceController.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/br/gov/sibbr/api/controller/InterfaceController.java b/src/main/java/br/gov/sibbr/api/controller/InterfaceController.java index 493c3ae..acbabda 100644 --- a/src/main/java/br/gov/sibbr/api/controller/InterfaceController.java +++ b/src/main/java/br/gov/sibbr/api/controller/InterfaceController.java @@ -48,17 +48,11 @@ public String login(LoginForm loginForm, Model model) { if (email != null && password != null) { String message = authService.checkPassword(email, password); if (message == null) { - if (email.equalsIgnoreCase(AuthService.ADMIN_EMAIL)) { - - } else { - // Successful authentication with valid credentials, fetch - // user token: - // TODO: admin password is not working after password change - String token = authService.fetchToken(email); - if (token != null) { - model.addAttribute("token", token); - return "login_success"; - } + // Successful authentication. Valid credentials, fetch user token: + String token = authService.fetchToken(email); + if (token != null) { + model.addAttribute("token", token); + return "login_success"; } } model.addAttribute("message", message);