Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 58e23aae by Juho Juopperi
Options

broken code

1 parent 5f45410b
Inline Side-by-side
Showing with 24 additions and 7 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/EventBean.java
...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.facade.EventOrganiserFacade; ...@@ -17,7 +17,7 @@ import fi.insomnia.bortal.facade.EventOrganiserFacade;
import fi.insomnia.bortal.facade.LanEventDomainFacade; import fi.insomnia.bortal.facade.LanEventDomainFacade;
import fi.insomnia.bortal.facade.LanEventPropertyFacade; import fi.insomnia.bortal.facade.LanEventPropertyFacade;
import fi.insomnia.bortal.model.EventOrganiser; import fi.insomnia.bortal.model.EventOrganiser;
import fi.insomnia.bortal.model.IUser; import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.LanEventDomain; import fi.insomnia.bortal.model.LanEventDomain;
import fi.insomnia.bortal.model.LanEventProperty; import fi.insomnia.bortal.model.LanEventProperty;
...@@ -82,7 +82,7 @@ public class EventBean implements EventBeanLocal { ...@@ -82,7 +82,7 @@ public class EventBean implements EventBeanLocal {
settings = new EventOrganiser(); settings = new EventOrganiser();
settings.setOrganisation(DEFAULT_ORGANISATION_NAME); settings.setOrganisation(DEFAULT_ORGANISATION_NAME);
IUser defaultUser = permbean.getAnonUser(); EventUser defaultUser = permbean.getAnonEventUser();
settings.setAdmin(defaultUser); settings.setAdmin(defaultUser);
eventOrganiserFacade.create(settings); eventOrganiserFacade.create(settings);
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/JaasBean.java
...@@ -15,8 +15,10 @@ import fi.insomnia.bortal.enums.BortalApplication; ...@@ -15,8 +15,10 @@ import fi.insomnia.bortal.enums.BortalApplication;
import fi.insomnia.bortal.enums.apps.IAppPermission; import fi.insomnia.bortal.enums.apps.IAppPermission;
import fi.insomnia.bortal.enums.apps.SpecialPermission; import fi.insomnia.bortal.enums.apps.SpecialPermission;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.facade.EventUserFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.ApplicationPermission; import fi.insomnia.bortal.model.ApplicationPermission;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.IUser; import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
...@@ -29,10 +31,14 @@ import fi.insomnia.bortal.model.User; ...@@ -29,10 +31,14 @@ import fi.insomnia.bortal.model.User;
public class JaasBean implements JaasBeanLocal, JaasBeanRemote { public class JaasBean implements JaasBeanLocal, JaasBeanRemote {
private static final Logger logger = LoggerFactory.getLogger(JaasBean.class); private static final Logger logger = LoggerFactory.getLogger(JaasBean.class);
@EJB @EJB
private UserFacade userfacade; private UserFacade userfacade;
@EJB @EJB
private EventUserFacade eventUserFacade;
@EJB
private LoggingBeanLocal secubean; private LoggingBeanLocal secubean;
@EJB @EJB
...@@ -42,10 +48,21 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote { ...@@ -42,10 +48,21 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote {
@EJB @EJB
private EventBeanLocal eventbean; private EventBeanLocal eventbean;
public IUser tryLogin(String username, String password) { public EventUser tryLogin(String username, String password) {
EventUser eventUser = eventUserFacade.findByLogin(username.trim());
IUser user = userfacade.findByLogin(username.trim()); // Might not have EventUser
IUser ret = null; if (eventUser == null) {
User user = userfacade.findByLogin(username.trim());
if (user != null) {
eventUser = new EventUser(user, eventbean.getCurrentEvent());
eventUserFacade.merge(eventUser);
}
}
EventUser ret = null;
if (user != null) { if (user != null) {
if (user.isAnonymous()) { if (user.isAnonymous()) {
logger.info("logging in as anonymous!!!"); logger.info("logging in as anonymous!!!");
...@@ -72,12 +89,12 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote { ...@@ -72,12 +89,12 @@ public class JaasBean implements JaasBeanLocal, JaasBeanRemote {
@Override @Override
public Enumeration<String> getGroupNames(String user) { public Enumeration<String> getGroupNames(String user) {
logger.info("Fetching groupNames for user {} event {}", user, eventbean.getCurrentEvent().getName()); logger.info("Fetching groupNames for user {} event {}", user, eventbean.getCurrentEvent().getName());
User usr = userfacade.findByLogin(user); EventUser usr = eventUserFacade.findByLogin(user);
HashSet<String> roleset = new HashSet<String>(); HashSet<String> roleset = new HashSet<String>();
roleset.add(UserPermission.ANYUSER.getFullName()); roleset.add(UserPermission.ANYUSER.getFullName());
if (usr == null) { if (usr == null) {
usr = permbean.getAnonUser(); usr = permbean.getAnonEventUser();
roleset.add(SpecialPermission.ANONYMOUS.name()); roleset.add(SpecialPermission.ANONYMOUS.name());
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!