Repository: openmeetings Updated Branches: refs/heads/master d6610a5d1 -> 21ab100b8
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/21ab100b Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/21ab100b Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/21ab100b Branch: refs/heads/master Commit: 21ab100b8fff996c5e877ceff7743d1ce472630a Parents: d6610a5 Author: Maxim Solodovnik <[email protected]> Authored: Sun Oct 1 20:51:14 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Oct 1 20:51:14 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/core/remote/MainService.java | 103 ------------------- .../openmeetings/core/remote/MobileService.java | 1 + .../openmeetings/core/service/MainService.java | 96 +++++++++++++++++ .../openmeetings/web/app/Application.java | 2 +- .../apache/openmeetings/web/app/WebSession.java | 1 - .../openmeetings/AbstractJUnitDefaults.java | 9 +- .../openmeetings/AbstractWicketTester.java | 4 +- .../invitiation/TestInvitation.java | 2 +- .../apache/openmeetings/userdata/TestLogin.java | 2 +- .../org/apache/openmeetings/web/LoginUI.java | 2 +- .../apache/openmeetings/web/TestMainAreas.java | 54 ++++++++++ .../web/app/TestOmAuthenticationStrategy.java | 1 + .../openmeetings/web/app/TestWebSession.java | 8 +- .../webservice/AbstractWebServiceTest.java | 2 +- .../webservice/TestUserService.java | 2 +- 15 files changed, 171 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java deleted file mode 100644 index f423854..0000000 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.core.remote; - -import org.apache.openmeetings.db.dao.calendar.AppointmentDao; -import org.apache.openmeetings.db.entity.calendar.Appointment; -import org.apache.openmeetings.db.entity.calendar.MeetingMember; -import org.apache.openmeetings.db.entity.room.Room; -import org.apache.openmeetings.db.entity.room.RoomGroup; -import org.apache.openmeetings.db.entity.user.GroupUser; -import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.util.OpenmeetingsVariables; -import org.red5.logging.Red5LoggerFactory; -import org.red5.server.api.service.IPendingServiceCall; -import org.red5.server.api.service.IPendingServiceCallback; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * - * @author swagner - * - */ -@Service -public class MainService implements IPendingServiceCallback { - private static final Logger log = Red5LoggerFactory.getLogger(MainService.class, OpenmeetingsVariables.getWebAppRootKey()); - - @Autowired - private AppointmentDao appointmentDao; - - // External User Types - public static final String EXTERNAL_USER_TYPE_LDAP = "LDAP"; - - public boolean isRoomAllowedToUser(Room r, User u) { - boolean allowed = false; - if (r != null) { - if (r.isAppointment()) { - Appointment a = appointmentDao.getByRoom(r.getId()); - if (a != null && !a.isDeleted()) { - allowed = a.getOwner().getId().equals(u.getId()); - log.debug("[loginWicket] appointed room, isOwner ? " + allowed); - if (!allowed) { - for (MeetingMember mm : a.getMeetingMembers()) { - if (mm.getUser().getId().equals(u.getId())) { - allowed = true; - break; - } - } - } - /* - TODO need to be reviewed - Calendar c = WebSession.getCalendar(); - if (c.getTime().after(a.getStart()) && c.getTime().before(a.getEnd())) { - allowed = true; - } else { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); //FIXME format - deniedMessage = Application.getString("error.hash.period") + String.format(" %s - %s", sdf.format(a.getStart()), sdf.format(a.getEnd())); - } - */ - } - } else { - allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId().equals(u.getId())); - log.debug("[loginWicket] public ? " + r.getIspublic() + ", ownedId ? " + r.getOwnerId() + " " + allowed); - if (!allowed && null != r.getGroups()) { - for (RoomGroup ro : r.getGroups()) { - for (GroupUser ou : u.getGroupUsers()) { - if (ro.getGroup().getId().equals(ou.getGroup().getId())) { - allowed = true; - break; - } - } - if (allowed) { - break; - } - } - } - } - } - return allowed; - } - - @Override - public void resultReceived(IPendingServiceCall arg0) { - log.debug("[resultReceived]" + arg0); - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java index 10ec198..b9c5557 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java @@ -41,6 +41,7 @@ import java.util.UUID; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.openmeetings.core.remote.ScopeApplicationAdapter.MessageSender; +import org.apache.openmeetings.core.service.MainService; import org.apache.openmeetings.core.util.IClientUtil; import org.apache.openmeetings.core.util.WebSocketHelper; import org.apache.openmeetings.db.dao.basic.ChatDao; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/MainService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/MainService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/MainService.java new file mode 100644 index 0000000..ab787f5 --- /dev/null +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/MainService.java @@ -0,0 +1,96 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License") + you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openmeetings.core.service; + +import org.apache.openmeetings.db.dao.calendar.AppointmentDao; +import org.apache.openmeetings.db.entity.calendar.Appointment; +import org.apache.openmeetings.db.entity.calendar.MeetingMember; +import org.apache.openmeetings.db.entity.room.Room; +import org.apache.openmeetings.db.entity.room.RoomGroup; +import org.apache.openmeetings.db.entity.user.GroupUser; +import org.apache.openmeetings.db.entity.user.User; +import org.apache.openmeetings.util.OpenmeetingsVariables; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * + * @author swagner + * + */ +@Service +public class MainService { + private static final Logger log = Red5LoggerFactory.getLogger(MainService.class, OpenmeetingsVariables.getWebAppRootKey()); + + @Autowired + private AppointmentDao appointmentDao; + + // External User Types + public static final String EXTERNAL_USER_TYPE_LDAP = "LDAP"; + + public boolean isRoomAllowedToUser(Room r, User u) { + boolean allowed = false; + if (r != null) { + if (r.isAppointment()) { + Appointment a = appointmentDao.getByRoom(r.getId()); + if (a != null && !a.isDeleted()) { + allowed = a.getOwner().getId().equals(u.getId()); + log.debug("[loginWicket] appointed room, isOwner ? " + allowed); + if (!allowed) { + for (MeetingMember mm : a.getMeetingMembers()) { + if (mm.getUser().getId().equals(u.getId())) { + allowed = true; + break; + } + } + } + /* + TODO need to be reviewed + Calendar c = WebSession.getCalendar(); + if (c.getTime().after(a.getStart()) && c.getTime().before(a.getEnd())) { + allowed = true; + } else { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); //FIXME format + deniedMessage = Application.getString("error.hash.period") + String.format(" %s - %s", sdf.format(a.getStart()), sdf.format(a.getEnd())); + } + */ + } + } else { + allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId().equals(u.getId())); + log.debug("[loginWicket] public ? " + r.getIspublic() + ", ownedId ? " + r.getOwnerId() + " " + allowed); + if (!allowed && null != r.getGroups()) { + for (RoomGroup ro : r.getGroups()) { + for (GroupUser ou : u.getGroupUsers()) { + if (ro.getGroup().getId().equals(ou.getGroup().getId())) { + allowed = true; + break; + } + } + if (allowed) { + break; + } + } + } + } + } + return allowed; + } +} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index d105238..7205139 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -49,9 +49,9 @@ import java.util.function.Predicate; import org.apache.directory.api.util.Strings; import org.apache.openmeetings.IApplication; -import org.apache.openmeetings.core.remote.MainService; import org.apache.openmeetings.core.remote.MobileService; import org.apache.openmeetings.core.remote.ScopeApplicationAdapter; +import org.apache.openmeetings.core.service.MainService; import org.apache.openmeetings.core.util.WebSocketHelper; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.label.LabelDao; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java index 057ed7a..269d102 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java @@ -213,7 +213,6 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS } public boolean signIn(String secureHash, boolean markUsed) { - //FIXME code is duplicated from MainService, need to be unified SOAPLoginDao soapDao = getBean(SOAPLoginDao.class); SOAPLogin soapLogin = soapDao.get(secureHash); if (soapLogin == null) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java index 5aebd72..2de82bb 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractJUnitDefaults.java @@ -43,7 +43,8 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest { private static final Logger log = Red5LoggerFactory.getLogger(AbstractJUnitDefaults.class); public static final int ONE_HOUR = 60 * 60 * 1000; - protected static final String username = "admin"; + protected static final String adminUsername = "admin"; + protected static final String regularUsername = "user"; protected static final String userpass = "12345"; private static final String group = "smoketest"; private static final String timeZone = "Europe/Berlin"; @@ -64,6 +65,10 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest { cfgDao.getCryptKey(); if (userDao.count() < 1) { makeDefaultScheme(); + User regular = getUser(); + regular.setLogin(regularUsername); + regular.updatePassword(cfgDao, userpass); + createUser(regular); log.info("Default scheme created successfully"); } else { log.info("Default scheme already created"); @@ -170,7 +175,7 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest { private void makeDefaultScheme() throws Exception { InstallationConfig cfg = new InstallationConfig(); - cfg.setUsername(username); + cfg.setUsername(adminUsername); cfg.setPassword(userpass); cfg.setEmail(email); cfg.setGroup(group); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java index ec4b817..bad76ac 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java @@ -51,12 +51,12 @@ public class AbstractWicketTester extends AbstractJUnitDefaults { if (login != null && password != null) { s.signIn(login, password, Type.user, null); } else { - s.signIn(username, userpass, Type.user, null); + s.signIn(adminUsername, userpass, Type.user, null); } } catch (OmException e) { fail(e.getMessage()); } - assertTrue("Web session is not signed in for user: " + (login != null ? login : username), s.isSignedIn()); + assertTrue("Web session is not signed in for user: " + (login != null ? login : adminUsername), s.isSignedIn()); } public <T extends Serializable> ButtonAjaxBehavior getButtonBehavior(String path, String name) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java index e0152b7..a8daaf0 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java @@ -43,7 +43,7 @@ public class TestInvitation extends AbstractWicketTester { @Test public void testSendInvitationLink() throws Exception { - User us = userDao.getByLogin(username, User.Type.user, null); + User us = userDao.getByLogin(adminUsername, User.Type.user, null); LocalDateTime from = LocalDateTime.now().plusDays(1).withHour(12).withMinute(0).withSecond(0); User invitee = userDao.getContact("[email protected]", "Testname", "Testlastname", us.getId()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java index 3f8ce5d..42251a7 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java @@ -34,7 +34,7 @@ public class TestLogin extends AbstractJUnitDefaults { @Test public void testTestLogin() throws OmException { - User us = userDao.login(username, userpass); + User us = userDao.login(adminUsername, userpass); assertNotNull("User is unable to login", us); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/web/LoginUI.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/LoginUI.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/LoginUI.java index addb44d..f4edab4 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/LoginUI.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/LoginUI.java @@ -39,7 +39,7 @@ public class LoginUI extends AbstractWicketTester { tester.assertRenderedPage(SignInPage.class); FormTester formTester = tester.newFormTester("signin:signin"); - formTester.setValue("login", username); + formTester.setValue("login", adminUsername); formTester.setValue("pass", userpass); formTester.submit("submit"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java new file mode 100644 index 0000000..d96869f --- /dev/null +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License") + you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openmeetings.web; + +import org.apache.openmeetings.AbstractWicketTester; +import org.apache.openmeetings.db.entity.user.User; +import org.apache.openmeetings.util.OmException; +import org.apache.openmeetings.web.app.WebSession; +import org.apache.openmeetings.web.pages.MainPage; +import org.apache.openmeetings.web.pages.auth.SignInPage; +import org.apache.openmeetings.web.user.dashboard.OmDashboardPanel; +import org.apache.wicket.behavior.AbstractAjaxBehavior; +import org.apache.wicket.protocol.ws.util.tester.WebSocketTester; +import org.junit.Assert; +import org.junit.Test; + +public class TestMainAreas extends AbstractWicketTester { + @Test + public void testSigninIsDisplayed() { + tester.startPage(MainPage.class); + tester.assertRenderedPage(SignInPage.class); + } + + @Test + public void testDashboard() throws OmException { + Assert.assertTrue(((WebSession)tester.getSession()).signIn(adminUsername, userpass, User.Type.user, null));; + MainPage page = tester.startPage(MainPage.class); + tester.assertRenderedPage(MainPage.class); + tester.executeBehavior((AbstractAjaxBehavior)tester.getLastRenderedPage().getBehaviors().get(0)); + tester.executeBehavior((AbstractAjaxBehavior)tester.getLastRenderedPage().get("main-container").getBehaviors().get(0)); + WebSocketTester webSocketTester = new WebSocketTester(tester, page); + webSocketTester.sendMessage("socketConnected"); + + //tester.assertComponentOnAjaxResponse("main-container:main:contents:child") + tester.assertComponent("main-container:main:contents:child", OmDashboardPanel.class); //main-container:main:contents:child:dashboard + //tester.getLastRenderedPage(). visitChildren(OmDashboardPanel.class, visitor) find(OmDashboardPanel.class) + } +} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java index c3643c2..826a3e5 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java @@ -44,6 +44,7 @@ public class TestOmAuthenticationStrategy extends AbstractWicketTester { assertEquals(4, s.decode("1-sep-2").length); assertEquals(4, s.decode("1-sep-2-sep-user").length); assertEquals(4, s.decode("1-sep-2-sep-user-sep-3").length); + assertEquals(4, s.decode("-sep--sep--sep-").length); } private void copyCookies() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java index 34f39d0..04000c0 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java @@ -34,15 +34,15 @@ public class TestWebSession extends AbstractWicketTester { assertFalse("Should not be signed in", ws.isSignedIn()); try { - ws.signIn(username, "", User.Type.contact, null); + ws.signIn(adminUsername, "", User.Type.contact, null); fail("Exception should be thrown"); } catch(OmException exc) { assertTrue("Expected exception", true); } - assertFalse(ws.signIn(username, "", User.Type.user, null)); - assertTrue(ws.signIn(username, userpass, User.Type.user, null)); + assertFalse(ws.signIn(adminUsername, "", User.Type.user, null)); + assertTrue(ws.signIn(adminUsername, userpass, User.Type.user, null)); try { - ws.signIn(username, userpass, User.Type.ldap, null); + ws.signIn(adminUsername, userpass, User.Type.ldap, null); fail("Exception should be thrown"); } catch(OmException exc) { assertTrue("Expected exception", true); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java index 1bf39a4..8bdaa2f 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java @@ -78,7 +78,7 @@ public class AbstractWebServiceTest extends AbstractJUnitDefaults { } public static ServiceResult login() { - return login(username, userpass); + return login(adminUsername, userpass); } public static ServiceResult loginNoCheck(String user, String pass) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/21ab100b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java index 7428c83..09d12b7 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java @@ -91,7 +91,7 @@ public class TestUserService extends AbstractWebServiceTest { assertEquals("OM Call should be successful", Type.SUCCESS.name(), r1.getType()); WebSession ws = WebSession.get(); - assertTrue(ws.signIn(username, userpass, User.Type.user, null)); + assertTrue(ws.signIn(adminUsername, userpass, User.Type.user, null)); Long userId0 = WebSession.getUserId(); ws.checkHashes(StringValue.valueOf(r1.getMessage()), StringValue.valueOf("")); assertTrue("Login via secure hash should be successful", ws.isSignedIn());
