#9 Fixing admin login behavior, now the same as regular login

sibbr · Nov 26, 2015 · c2d811c · c2d811c
1 parent 742f6f7
commit c2d811c
Showing 1 changed file with 5 additions and 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
@@ -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);