Author: bleny Date: 2014-06-26 16:29:00 +0200 (Thu, 26 Jun 2014) New Revision: 2109 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2109 Log: disable login cheat Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-06-26 09:20:44 UTC (rev 2108) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-06-26 14:29:00 UTC (rev 2109) @@ -27,12 +27,6 @@ import com.opensymphony.xwork2.interceptor.Interceptor; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaPersistenceContext; -import fr.ifremer.wao.entity.ObsProgram; -import fr.ifremer.wao.entity.UserProfile; -import fr.ifremer.wao.entity.UserProfileImpl; -import fr.ifremer.wao.entity.UserRole; -import fr.ifremer.wao.entity.WaoUser; -import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.WaoApplicationContext; import fr.ifremer.wao.services.WaoService; import fr.ifremer.wao.services.WaoServiceContext; @@ -77,26 +71,9 @@ WaoSession waoSession = getWaoSession(invocation); - if (waoSession.getAuthenticatedWaoUser() == null) { + if (waoSession.getAuthenticatedWaoUser() == null && ! ACTIONS_ACCESSIBLE_WITHOUT_LOGIN.contains(waoAction.getClass())) { - boolean loginCheat = getWaoApplicationContext(invocation).getApplicationConfig().isDevMode(); - if (loginCheat) { - // login à l'arrache - WaoUser admin = serviceContext.getPersistenceContext().getWaoUserDao().forLoginEquals("vincent.badts@ifremer.fr").findUnique(); - admin.sizeUserProfile(); - admin.sizeCanReadBoats(); - admin.getCompany().getTopiaId(); - UserProfile userProfile = new UserProfileImpl(); - userProfile.setUserRole(UserRole.ADMIN); - userProfile.setObsProgram(ObsProgram.OBSVENTE); - userProfile.setCanWrite(true); - AuthenticatedWaoUser authenticatedWaoUser = new AuthenticatedWaoUser(admin, userProfile); - waoSession.setAuthenticatedWaoUser(authenticatedWaoUser); - } else { - if ( ! ACTIONS_ACCESSIBLE_WITHOUT_LOGIN.contains(waoAction.getClass())) { - return "redirect-to-login"; - } - } + return "redirect-to-login"; }