diff --git a/elections-admin-web/src/main/java/net/lacnic/elections/adminweb/app/ElectionsWebAdminSession.java b/elections-admin-web/src/main/java/net/lacnic/elections/adminweb/app/ElectionsWebAdminSession.java index 554317c..1766710 100644 --- a/elections-admin-web/src/main/java/net/lacnic/elections/adminweb/app/ElectionsWebAdminSession.java +++ b/elections-admin-web/src/main/java/net/lacnic/elections/adminweb/app/ElectionsWebAdminSession.java @@ -4,19 +4,15 @@ import java.util.List; import java.util.Locale; -import javax.security.jacc.PolicyContextException; - import org.apache.wicket.authroles.authentication.AuthenticatedWebSession; import org.apache.wicket.authroles.authorization.strategies.role.Roles; import org.apache.wicket.protocol.http.request.WebClientInfo; import org.apache.wicket.request.Request; import net.lacnic.elections.adminweb.wicket.util.UtilsString; -import net.lacnic.elections.dao.ElectionsDaoFactory; import net.lacnic.elections.domain.Parameter; import net.lacnic.elections.domain.UserAdmin; import net.lacnic.elections.utils.Constants; -import net.lacnic.portal.auth.client.LoginData; public class ElectionsWebAdminSession extends AuthenticatedWebSession { @@ -27,7 +23,6 @@ public class ElectionsWebAdminSession extends AuthenticatedWebSession { private Long authorizedElectionId; private UserAdmin userAdmin; - public UserAdmin getUserAdmin() { return userAdmin; } @@ -42,15 +37,15 @@ public ElectionsWebAdminSession(Request request) { @Override public boolean authenticate(String userAdminId, String password) { - - Parameter parameter =AppContext.getInstance().getManagerBeanRemote().getParameter(Constants.WS_AUTH_METHOD); - if(parameter.getValue().equals(Constants.WS_AUTH_TYPE_APP)) { - userAdmin = AppContext.getInstance().getManagerBeanRemote().userAdminLogin(userAdminId,UtilsString.wantHashMd5(password), getIPClient()); + Parameter parameter = AppContext.getInstance().getManagerBeanRemote().getParameter(Constants.WS_AUTH_METHOD); + + if (parameter.getValue().equals(Constants.WS_AUTH_TYPE_APP)) { + userAdmin = AppContext.getInstance().getManagerBeanRemote().userAdminLogin(userAdminId, UtilsString.wantHashMd5(password), getIPClient()); - }else { - userAdmin = AppContext.getInstance().getManagerBeanRemote().login(userAdminId, password, getIPClient()); - } + } else { + userAdmin = AppContext.getInstance().getManagerBeanRemote().login(userAdminId, password, getIPClient()); + } String lang; @@ -59,8 +54,8 @@ public boolean authenticate(String userAdminId, String password) { setPassword(password); setAuthorizedElectionId(userAdmin.getAuthorizedElectionId()); - lang = getLocale().getLanguage(); - switch(lang) { + lang = getLocale().getLanguage(); + switch (lang) { case "pt": setLocale(new Locale("PT")); break; @@ -69,10 +64,10 @@ public boolean authenticate(String userAdminId, String password) { break; case "es": setLocale(new Locale("ES")); - break; + break; default: setLocale(new Locale("ES")); - } + } return true; } @@ -111,7 +106,6 @@ public static String getIPClient() { return info.getProperties().getRemoteAddress(); } - public String getUserAdminId() { return userAdminId; }