Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1601669&r1=1601668&r2=1601669&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Tue Jun 10 15:46:38 2014 @@ -62,8 +62,8 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.RoomType; import org.apache.openmeetings.db.entity.user.User; +import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.db.util.TimezoneUtil; -import org.apache.openmeetings.util.AuthLevelUtil; import org.apache.openmeetings.util.CalendarPatterns; import org.apache.openmeetings.webservice.dto.RoomCountBean; import org.apache.openmeetings.webservice.dto.RoomReturn; @@ -140,12 +140,10 @@ public class RoomWebService { try { Long users_id = sessiondataDao.checkSession(SID); - Long User_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(User_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - List<Room> roomList = roomManager.getPublicRooms( - User_level, roomtypes_id); + List<Room> roomList = roomDao.getPublicRooms(roomtypes_id); // We need to re-marshal the Rooms object cause Axis2 cannot use // our objects if (roomList != null && roomList.size() != 0) { @@ -187,9 +185,8 @@ public class RoomWebService { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return flvRecordingDao.delete(flvRecordingId); } @@ -215,9 +212,8 @@ public class RoomWebService { String externalUserId, String externalUserType) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return flvRecordingDao.getFlvRecordingByExternalUserId(externalUserId, externalUserType); } @@ -246,9 +242,8 @@ public class RoomWebService { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { List<FlvRecording> recordingList = flvRecordingDao .getFlvRecordingByExternalRoomTypeAndCreator( externalRoomType, insertedBy); @@ -293,11 +288,9 @@ public class RoomWebService { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { - return flvRecordingDao - .getFlvRecordingByExternalRoomType(externalRoomType); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + return flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType); } @@ -323,11 +316,9 @@ public class RoomWebService { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { - List<FlvRecording> recordingList = flvRecordingDao - .getFlvRecordingByExternalRoomType(externalRoomType); + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + List<FlvRecording> recordingList = flvRecordingDao.getFlvRecordingByExternalRoomType(externalRoomType); // We need to re-marshal the Rooms object cause Axis2 cannot use // our objects @@ -371,9 +362,8 @@ public class RoomWebService { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { List<FlvRecording> recordingList = flvRecordingDao .getFlvRecordingByRoomId(roomId); @@ -433,9 +423,8 @@ public class RoomWebService { List<RoomCountBean> roomBeans = new ArrayList<RoomCountBean>(); try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { List<Integer> roomIds = new ArrayList<Integer>(); if (roomId != null) { @@ -492,11 +481,10 @@ public class RoomWebService { public RoomReturn getRoomWithClientObjectsById(String SID, long rooms_id) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - Room room = roomManager.getRoomById(user_level, rooms_id); + Room room = roomDao.get(rooms_id); RoomReturn roomReturn = new RoomReturn(); @@ -614,9 +602,8 @@ public class RoomWebService { Integer filesPanelWidth) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { - return roomManager.addRoom(3L, name, roomtypes_id, comment, + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + return roomManager.addRoom(name, roomtypes_id, comment, numberOfPartizipants, ispublic, null, false, false, null, false, null, true, false, false, false //isClosed , "", "", @@ -678,9 +665,8 @@ public class RoomWebService { Integer demoTime, Boolean isModeratedRoom) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { - return roomManager.addRoom(3L, name, roomtypes_id, comment, + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + return roomManager.addRoom(name, roomtypes_id, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, true, false, true, false //isClosed @@ -748,9 +734,8 @@ public class RoomWebService { Boolean allowUserQuestions) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { - return roomManager.addRoom(3L, name, roomtypes_id, comment, + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + return roomManager.addRoom(name, roomtypes_id, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, allowUserQuestions, false, true, false //isClosed @@ -821,9 +806,8 @@ public class RoomWebService { Boolean allowUserQuestions, Boolean isAudioOnly) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { - return roomManager.addRoom(3L, name, roomtypes_id, comment, + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + return roomManager.addRoom(name, roomtypes_id, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, allowUserQuestions, isAudioOnly, true, false //isClosed @@ -914,9 +898,8 @@ public class RoomWebService { Boolean hideWhiteboard) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { - return roomManager.addRoom(3L, name, roomtypes_id, comment, + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { + return roomManager.addRoom(name, roomtypes_id, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, null, allowUserQuestions, isAudioOnly, true, false //isClosed @@ -987,8 +970,7 @@ public class RoomWebService { String externalRoomType) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Room room = conferenceService.getRoomByExternalId(SID, externalRoomId, externalRoomType, roomtypes_id); Long roomId = null; @@ -1054,8 +1036,7 @@ public class RoomWebService { Integer filesPanelWidth, Boolean appointment) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return roomManager.updateRoomInternal(rooms_id, roomtypes_id, name, ispublic, comment, numberOfPartizipants, null, appointment, false, null, @@ -1120,8 +1101,7 @@ public class RoomWebService { Integer demoTime, Boolean isModeratedRoom) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return roomManager.updateRoomInternal(room_id, roomtypes_id, name, ispublic, comment, numberOfPartizipants, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1189,8 +1169,7 @@ public class RoomWebService { Boolean allowUserQuestions) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return roomManager.updateRoomInternal(room_id, roomtypes_id, name, ispublic, comment, numberOfPartizipants, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1281,8 +1260,7 @@ public class RoomWebService { Boolean hideWhiteboard) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return roomManager.updateRoomInternal(room_id, roomtypes_id, name, ispublic, comment, numberOfPartizipants, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1386,8 +1364,7 @@ public class RoomWebService { Integer demoTime, Boolean isModeratedRoom, String externalRoomType) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return roomManager.addExternalRoom(name, roomtypes_id, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1447,8 +1424,7 @@ public class RoomWebService { Boolean isAudioOnly) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return roomManager.addExternalRoom(name, roomtypes_id, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1513,8 +1489,7 @@ public class RoomWebService { Boolean waitForRecording, Boolean allowRecording) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return roomManager.addExternalRoom(name, roomtypes_id, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1586,8 +1561,7 @@ public class RoomWebService { Boolean allowRecording, Boolean hideTopBar) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return roomManager.addExternalRoom(name, roomtypes_id, comment, numberOfPartizipants, ispublic, null, appointment, isDemoRoom, demoTime, isModeratedRoom, @@ -1644,9 +1618,8 @@ public class RoomWebService { String validToTime) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Date dFrom = null; Date dTo = null; @@ -1771,9 +1744,8 @@ public class RoomWebService { Long language_id, Boolean sendMail) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Date dFrom = null; Date dTo = null; @@ -1898,9 +1870,8 @@ public class RoomWebService { Long language_id, Boolean sendMail) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Calendar calFrom = Calendar.getInstance(); calFrom.setTime(fromDate); @@ -2132,9 +2103,8 @@ public class RoomWebService { String redirectURL) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { int validFromHour = Integer.valueOf(validFromTime.substring(0, 2)).intValue(); int validFromMinute = Integer.valueOf(validFromTime.substring(3, 5)).intValue(); @@ -2259,14 +2229,12 @@ public class RoomWebService { * @throws ServiceException */ public Long addExternalMeetingMemberRemindToRoom(String SID, Long room_id, - String firstname, String lastname, String email, - Long language_id, String jNameTimeZone, String invitorName) + String firstname, String lastname, String email, Long language_id, String jNameTimeZone, String invitorName) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Appointment a = appointmentLogic.getAppointmentByRoom(room_id); if (email == null || a == null) { @@ -2315,11 +2283,10 @@ public class RoomWebService { throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); log.debug("closeRoom 1 " + room_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { log.debug("closeRoom 2 " + status); @@ -2358,8 +2325,7 @@ public class RoomWebService { throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { log.debug(String.format("modifyRoomParameter[%s]: %s = %s", room_id, paramName, paramValue)); Room r = roomDao.get(room_id); BeanWrapper rw = new BeanWrapperImpl(r); @@ -2388,10 +2354,9 @@ public class RoomWebService { public Long addRoomToOrg(String SID, Long rooms_id, Long organisation_id) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { if (null == roomManager.getRoomsOrganisationByOrganisationIdAndRoomId(organisation_id, rooms_id)) { - return roomManager.addRoomToOrganisation(user_level, rooms_id, organisation_id); + return roomManager.addRoomToOrganisation(rooms_id, organisation_id); } } } catch (Exception err) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1601669&r1=1601668&r2=1601669&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java Tue Jun 10 15:46:38 2014 @@ -28,9 +28,9 @@ import javax.ws.rs.core.MediaType; import org.apache.cxf.feature.Features; import org.apache.openmeetings.db.dao.server.ServerDao; import org.apache.openmeetings.db.dao.server.SessiondataDao; -import org.apache.openmeetings.db.dao.user.IUserManager; +import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.server.Server; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.webservice.dto.ServiceException; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -54,7 +54,7 @@ public class ServerWebService { @Autowired private SessiondataDao sessiondataDao; @Autowired - private IUserManager userManager; + private UserDao userDao; @Autowired private ServerDao serversDao; @@ -72,9 +72,8 @@ public class ServerWebService { public Server[] getServers(String SID, int start, int max) throws ServiceException { log.debug("getServers enter"); Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return serversDao.get(start, max).toArray(new Server[0]); } else { log.warn("Insuffisient permissions"); @@ -93,9 +92,8 @@ public class ServerWebService { public int getServerCount(String SID) throws ServiceException { log.debug("getServerCount enter"); Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { return (int) serversDao.count(); } else { log.warn("Insuffisient permissions"); @@ -135,9 +133,8 @@ public class ServerWebService { Boolean active, String comment) throws ServiceException { log.debug("saveServerCount enter"); Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Server s = serversDao.get(id); if (s == null) { s = new Server(); @@ -170,9 +167,8 @@ public class ServerWebService { public boolean deleteServer(String SID, long id) throws ServiceException { log.debug("saveServerCount enter"); Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManager.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Server s = serversDao.get(id); if (s != null) { serversDao.delete(s, users_id); Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1601669&r1=1601668&r2=1601669&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java Tue Jun 10 15:46:38 2014 @@ -37,8 +37,8 @@ import org.apache.openmeetings.db.dao.ba import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao; import org.apache.openmeetings.db.dao.server.SOAPLoginDao; import org.apache.openmeetings.db.dao.server.SessiondataDao; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dao.user.IUserManager; +import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dao.user.OrganisationDao; import org.apache.openmeetings.db.dao.user.OrganisationUserDao; import org.apache.openmeetings.db.dto.basic.ErrorResult; @@ -51,7 +51,9 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.user.Organisation; import org.apache.openmeetings.db.entity.user.Organisation_Users; import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.entity.user.User.Right; +import org.apache.openmeetings.db.util.AuthLevelUtil; +import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.webservice.dto.ServiceException; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -90,7 +92,7 @@ public class UserWebService { @Autowired private SOAPLoginDao soapLoginDao; @Autowired - private UserDao usersDao; + private UserDao userDao; @Autowired private MainService mainService; @Autowired @@ -122,20 +124,30 @@ public class UserWebService { */ public Long loginUser(String SID, String username, String userpass) { try { - Object obj = userManagement.loginUser(SID, username, userpass, null, null, false); - if (obj == null) { - return new Long(-1); + log.debug("Login user SID : " + SID); + User u = userDao.login(username, userpass); + if (u == null) { + return -1L; } - String objName = obj.getClass().getName(); - if (objName.equals("java.lang.Long")) { - return (Long) obj; - } else { - return new Long(1); + + Boolean bool = sessiondataDao.updateUser(SID, u.getUser_id(), false, u.getLanguage_id()); + if (bool == null) { + // Exception + return -1L; + } else if (!bool) { + // invalid Session-Object + return -35L; + } + + return u.getUser_id(); + } catch (OmException oe) { + if (oe.getCode() != null) { + return oe.getCode(); } } catch (Exception err) { log.error("[loginUser]", err); } - return new Long(-1); + return -1L; } /** @@ -177,7 +189,7 @@ public class UserWebService { } /** - * Adds a new Usre like through the Frontend, but also does activates the + * Adds a new User like through the Frontend, but also does activates the * Account To do SSO see the methods to create a hash and use those ones! * * @param SID @@ -217,9 +229,8 @@ public class UserWebService { throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { String jName_timeZone = configurationDao.getConfValue("default.timezone", String.class, ""); @@ -233,13 +244,15 @@ public class UserWebService { return user_id; } - User user = usersDao.get(user_id); + User user = userDao.get(user_id); // activate the User - user.setStatus(1); + user.getRights().add(Right.Dashboard); + user.getRights().add(Right.Login); + user.getRights().add(Right.Room); user.setUpdatetime(new Date()); - usersDao.update(user, users_id); + userDao.update(user, users_id); return user_id; @@ -291,13 +304,11 @@ public class UserWebService { public Long addNewUserWithTimeZone(String SID, String username, String userpass, String lastname, String firstname, String email, String additionalname, String street, String zip, String fax, - long states_id, String town, long language_id, - String jNameTimeZone) throws ServiceException { + long states_id, String town, long language_id, String jNameTimeZone) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Long user_id = userManagement.registerUser(username, userpass, lastname, firstname, email, new Date(), street, @@ -316,13 +327,13 @@ public class UserWebService { return user_id; } - User user = usersDao.get(user_id); + User user = userDao.get(user_id); // activate the User - user.setStatus(1); + user.getRights().add(Right.Login); user.setUpdatetime(new Date()); - usersDao.update(user, users_id); + userDao.update(user, users_id); return user_id; @@ -387,11 +398,10 @@ public class UserWebService { throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkAdminLevel(user_level)) { + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { - User testUser = usersDao.getExternalUser(externalUserId, externalUserType); + User testUser = userDao.getExternalUser(externalUserId, externalUserType); if (testUser != null) { throw new Exception("User does already exist!"); @@ -408,15 +418,15 @@ public class UserWebService { return user_id; } - User user = usersDao.get(user_id); + User user = userDao.get(user_id); // activate the User - user.setStatus(1); + user.getRights().add(Right.Login); user.setUpdatetime(new Date()); user.setExternalUserId(externalUserId); user.setExternalUserType(externalUserType); - usersDao.update(user, users_id); + userDao.update(user, users_id); return user_id; @@ -445,12 +455,11 @@ public class UserWebService { public Long deleteUserById(String SID, Long userId) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkAdminLevel(user_level)) { + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { // Setting user deleted - usersDao.deleteUserID(userId); + userDao.deleteUserID(userId); return userId; @@ -482,16 +491,15 @@ public class UserWebService { String externalUserId, String externalUserType) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkAdminLevel(user_level)) { + if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) { - User userExternal = usersDao.getExternalUser(externalUserId, externalUserType); + User userExternal = userDao.getExternalUser(externalUserId, externalUserType); Long userId = userExternal.getUser_id(); // Setting user deleted - usersDao.deleteUserID(userId); + userDao.deleteUserID(userId); return userId; @@ -544,8 +552,7 @@ public class UserWebService { throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { RemoteSessionObject remoteSessionObject = new RemoteSessionObject( username, firstname, lastname, profilePictureUrl, @@ -636,8 +643,7 @@ public class UserWebService { log.debug("UserService.setUserObjectAndGenerateRoomHashByURL"); try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { RemoteSessionObject remoteSessionObject = new RemoteSessionObject( username, firstname, lastname, profilePictureUrl, @@ -730,8 +736,7 @@ public class UserWebService { int showAudioVideoTestAsInt, int allowRecording) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { RemoteSessionObject remoteSessionObject = new RemoteSessionObject( username, firstname, lastname, profilePictureUrl, @@ -817,8 +822,7 @@ public class UserWebService { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { RemoteSessionObject remoteSessionObject = new RemoteSessionObject( username, firstname, lastname, profilePictureUrl, @@ -845,16 +849,12 @@ public class UserWebService { } } else { - - log.debug("Invalid access via SOAP " + SID + " UserD" - + users_id + " " + user_level); - - return "" + new Long(-26); + return "" + -26L; } } catch (Exception err) { log.error("setUserObjectWithAndGenerateRoomHash", err); } - return "" + new Long(-1); + return "" + -1L; } /** @@ -908,8 +908,7 @@ public class UserWebService { int showAudioVideoTestAsInt, int showNickNameDialogAsInt) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { RemoteSessionObject remoteSessionObject = new RemoteSessionObject( username, firstname, lastname, profilePictureUrl, @@ -984,8 +983,7 @@ public class UserWebService { String externalUserId, String externalUserType, Long recording_id) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { RemoteSessionObject remoteSessionObject = new RemoteSessionObject( username, firstname, "", "", "", externalUserId, @@ -1038,12 +1036,11 @@ public class UserWebService { Long organisation_id, Long insertedby) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { if (!orgUserDao.isUserInOrganization(organisation_id, user_id)) { - User u = usersDao.get(user_id); + User u = userDao.get(user_id); u.getOrganisation_users().add(new Organisation_Users(orgDao.get(organisation_id))); - usersDao.update(u, users_id); + userDao.update(u, users_id); } return user_id; } else { @@ -1077,10 +1074,9 @@ public class UserWebService { boolean asc) { try { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); SearchResult<User> result = new SearchResult<User>(); result.setObjectName(User.class.getName()); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { result.setRecords(orgUserDao.count(organisation_id)); result.setResult(new ArrayList<User>()); for (Organisation_Users ou : orgUserDao.get(organisation_id, null, start, max, orderby + " " + (asc ? "ASC" : "DESC"))) { @@ -1135,8 +1131,7 @@ public class UserWebService { */ public Long addOrganisation(String SID, String name) throws ServiceException { Long users_id = sessiondataDao.checkSession(SID); - Long user_level = userManagement.getUserLevelByID(users_id); - if (AuthLevelUtil.checkWebServiceLevel(user_level)) { + if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Organisation o = new Organisation(); o.setName(name); return orgDao.update(o, users_id).getOrganisation_id();
