Commit 8f71ece1 by Tuomas Riihimäki

Check that user-object is not null when creating user from invite.

1 parent eff35ee1
......@@ -477,8 +477,9 @@ public class UserBean implements UserBeanLocal {
@Override
@RolesAllowed(UserPermission.S_INVITE_USERS)
public boolean invite(String invitemail, String url) {
invitemail = invitemail.trim();
List<User> usercheck = userFacade.findByEmail(invitemail.trim());
List<User> usercheck = userFacade.findByEmail(invitemail);
if (usercheck.size() > 0) {
return false;
}
......@@ -486,7 +487,7 @@ public class UserBean implements UserBeanLocal {
LanEvent ev = eventBean.getCurrentEvent();
PlaceGroup pg = new PlaceGroup(ev, Calendar.getInstance(), Calendar.getInstance(), false);
pg.setCreator(creator);
pg.setName("Invitebean");
pg.setName("Invite to " + invitemail);
String token = PasswordFunctions.generateRandomString(30, PasswordFunctions.ALL_CHARS);
pg.getMembers().add(new GroupMembership(pg, null, token));
pgfacade.create(pg);
......@@ -526,6 +527,8 @@ public class UserBean implements UserBeanLocal {
@Override
@PermitAll
public boolean createFromInviteToken(EventUser user, String token) {
if (user == null || user.getLogin() == null)
return false;
GroupMembership gm = findToken(token);
// Check that invite has not already been accepted!
if (gm == null || gm.getUser() != null || gm.getInviteAccepted() != null) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!