Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1757626&r1=1757625&r2=1757626&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java Thu Aug 25 08:46:39 2016 @@ -18,33 +18,44 @@ */ package org.apache.openmeetings.test.invitiation; -import java.text.SimpleDateFormat; -import java.util.Date; +import static org.apache.openmeetings.util.CalendarHelper.getDate; -import org.apache.openmeetings.core.remote.InvitationService; +import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.basic.ServiceResult; +import org.apache.openmeetings.db.entity.room.Invitation; +import org.apache.openmeetings.db.entity.room.Invitation.MessageType; +import org.apache.openmeetings.db.entity.room.Invitation.Valid; import org.apache.openmeetings.db.entity.user.User; +import org.apache.openmeetings.service.room.InvitationManager; import org.apache.openmeetings.test.AbstractJUnitDefaults; import org.apache.openmeetings.webservice.UserWebService; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.threeten.bp.LocalDateTime; public class TestInvitation extends AbstractJUnitDefaults { @Autowired - private InvitationService invitationService; + private InvitationManager invitationManager; @Autowired private UserWebService userWebService; @Autowired private UserDao userDao; - + @Autowired + private RoomDao roomDao; + @Test - public void testSendInvitationLink() { + public void testSendInvitationLink() throws Exception { ServiceResult result = userWebService.login(username, userpass); User us = userDao.get(result.getCode()); - String date = new SimpleDateFormat("dd.MM.yyyy").format(new Date()); - invitationService.sendInvitationHash(result.getMessage(), "Testname", "Testlastname", "message", "[email protected]", - "subject", 1L, "", false, "", 1, date, "12:00", date, "14:00", 1L, us.getTimeZoneId(), true); + LocalDateTime from = LocalDateTime.now().plusDays(1).withHour(12).withMinute(0).withSecond(0); + User invitee = userDao.getContact("[email protected]", "Testname", "Testlastname", us.getId()); + Invitation i = invitationManager.getInvitation(invitee, roomDao.get(1L), + false, "", Valid.OneTime + , us, us.getLanguageId(), + getDate(from, "GMT"), getDate(from.plusHours(2), "GMT"), null); + + invitationManager.sendInvitationLink(i, MessageType.Create, "subject", "message", false); } }
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java?rev=1757626&r1=1757625&r2=1757626&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java Thu Aug 25 08:46:39 2016 @@ -31,7 +31,7 @@ public class TestAuth extends AbstractJU @Test public void testTestAuth() { - Sessiondata sessionData = sessionDao.create(); + Sessiondata sessionData = sessionDao.create(1L, 1L); System.out.println("sessionData: " + sessionData.getSessionId()); Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1757626&r1=1757625&r2=1757626&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (original) +++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java Thu Aug 25 08:46:39 2016 @@ -108,12 +108,8 @@ public class UserWebService implements U return new ServiceResult(-1L, "Login failed", Type.ERROR); } - Sessiondata sd = sessionDao.create(); + Sessiondata sd = sessionDao.create(u.getId(), u.getLanguageId()); log.debug("Login user SID : " + sd.getSessionId()); - if (!sessionDao.updateUser(sd.getSessionId(), u.getId(), false, u.getLanguageId())) { - return new ServiceResult(-35L, "invalid Session-Object", Type.ERROR); - } - return new ServiceResult(u.getId(), sd.getSessionId(), Type.SUCCESS); } catch (OmException oe) { return new ServiceResult(oe.getCode() == null ? -1 : oe.getCode(), oe.getMessage(), Type.ERROR);
