You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/05/27 12:43:42 UTC
svn commit: r1745748 [1/3] - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/
branches/3...
Author: solomax
Date: Fri May 27 12:43:41 2016
New Revision: 1745748
URL: http://svn.apache.org/viewvc?rev=1745748&view=rev
Log:
[OPENMEETINGS-1411] session is made permanent for multi-time hash
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java Fri May 27 12:43:41 2016
@@ -76,7 +76,7 @@ public class ConferenceLibrary implement
public LibraryPresentation getPresentationPreviewFileExplorer(String SID, String parentFolder) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
log.debug("#############users_id : " + users_id);
@@ -111,7 +111,7 @@ public class ConferenceLibrary implement
*/
public Long saveAsObject(String SID, Long room_id, String fileName, Object tObjectRef) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
// LinkedHashMap tObject = (LinkedHashMap)t;
// ArrayList tObject = (ArrayList)t;
@@ -156,7 +156,7 @@ public class ConferenceLibrary implement
@SuppressWarnings({ "rawtypes", "unchecked" })
public void loadWmlObject(String SID, Long room_id, Long fileId, Long whiteboardId) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
IConnection current = Red5.getConnectionLocal();
@@ -225,7 +225,7 @@ public class ConferenceLibrary implement
@SuppressWarnings("rawtypes")
public ArrayList loadChartObject(String SID, Long room_id, String fileName) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
return LibraryChartLoader.getInstance().loadChart(OmFileHelper.getUploadRoomDir(room_id.toString()), fileName);
}
@@ -242,7 +242,7 @@ public class ConferenceLibrary implement
*/
public Long copyFileToCurrentRoom(String SID, Long flvFileExplorerId) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Fri May 27 12:43:41 2016
@@ -68,7 +68,7 @@ public class ConferenceService {
public List<RoomGroup> getRoomsByGroupWithoutType(String SID, long groupId) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
log.debug("getRoomsByGroupWithoutType");
List<RoomGroup> roomGroupsList = roomManager.getRoomGroupByGroupId(groupId);
@@ -99,7 +99,7 @@ public class ConferenceService {
log.debug("getRoomsByGroup");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasModLevel(userDao.get(userId), groupId)) {
return roomManager.getRoomGroupByGroupId(groupId, start, max, orderby, asc);
}
@@ -117,7 +117,7 @@ public class ConferenceService {
try {
log.debug("getRoomsPublic");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
List<Room> roomList = roomDao.getPublicRooms(Room.Type.get(typeId));
@@ -144,7 +144,7 @@ public class ConferenceService {
public List<Room> getRoomsPublicWithoutType(String SID) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
List<Room> roomList = roomDao.getPublicRooms();
@@ -207,7 +207,7 @@ public class ConferenceService {
public List<Room> getAppointedMeetingRoomsWithoutType(String SID) {
log.debug("ConferenceService.getAppointedMeetings");
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
List<Appointment> appointments = appointmentDao.getForToday(userId);
@@ -236,7 +236,7 @@ public class ConferenceService {
public Room getRoomWithCurrentUsersById(String SID, long roomId) {
Room room = null;
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
room = roomDao.get(roomId);
room.setCurrentusers(sessionManager.getClientListByRoom(room.getId()));
@@ -257,7 +257,7 @@ public class ConferenceService {
public SearchResult<Room> getRooms(String SID, int start, int max, String orderby, boolean asc, String search) {
log.debug("getRooms");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRooms(start, max, orderby, asc, search);
}
@@ -267,7 +267,7 @@ public class ConferenceService {
public SearchResult<Room> getRoomsWithCurrentUsers(String SID, int start, int max, String orderby, boolean asc) {
log.debug("getRooms");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRoomsWithCurrentUsers(start, max, orderby, asc);
}
@@ -276,7 +276,7 @@ public class ConferenceService {
public List<RoomModerator> getRoomModeratorsByRoomId(String SID, Long roomId) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return roomModeratorDao.getByRoomId(roomId);
}
@@ -316,7 +316,7 @@ public class ConferenceService {
public List<Room> getRoomsWithCurrentUsersByList(String SID, int start, int max, String orderby, boolean asc) {
log.debug("getRoomsWithCurrentUsersByList");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRoomsWithCurrentUsersByList(start, max, orderby, asc);
}
@@ -326,7 +326,7 @@ public class ConferenceService {
public List<Room> getRoomsWithCurrentUsersByListAndType(String SID, int start, int max, String orderby, boolean asc, String externalType) {
log.debug("getRoomsWithCurrentUsersByListAndType");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRoomsWithCurrentUsersByListAndType(start, max, orderby, asc, externalType);
}
@@ -334,7 +334,7 @@ public class ConferenceService {
}
public Room getRoomByOwnerAndType(String SID, Long typeId, String roomName) {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return roomDao.getUserRoom(userId, Room.Type.get(typeId), roomName);
}
@@ -342,7 +342,7 @@ public class ConferenceService {
}
public Room getRoomById(String SID, Long roomId) {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return roomDao.get(roomId);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java Fri May 27 12:43:41 2016
@@ -102,7 +102,7 @@ public class InvitationService implement
Long languageId, String iCalTz, boolean sendMail) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
log.debug("sendInvitationHash: ");
@@ -142,7 +142,7 @@ public class InvitationService implement
}
public String sendInvitationByHash(String SID, String invitationHash, String message, String subject, Long languageId) throws Exception {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
Invitation inv = (Invitation)invitationManager.getInvitationByHashCode(invitationHash, false);
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Fri May 27 12:43:41 2016
@@ -108,7 +108,7 @@ public class MainService implements IPen
*/
public User getUser(String SID, long userId) {
User users = new User();
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
Set<Right> rights = userDao.getRights(users_id);
if (AuthLevelUtil.hasAdminLevel(rights) || AuthLevelUtil.hasWebServiceLevel(rights)) {
users = userDao.get(userId);
@@ -140,7 +140,7 @@ public class MainService implements IPen
* @return a unique session identifier
*/
public Sessiondata getsessiondata() {
- return sessiondataDao.startsession();
+ return sessiondataDao.create();
}
public Long setCurrentUserGroup(String SID, Long groupId) {
@@ -203,7 +203,7 @@ public class MainService implements IPen
public User loginWicket(String SID, String wicketSID, Long wicketroomid) {
log.debug("[loginWicket] SID: '{}'; wicketSID: '{}'; wicketroomid: '{}'", SID, wicketSID, wicketroomid);
- Long userId = sessiondataDao.checkSession(wicketSID);
+ Long userId = sessiondataDao.check(wicketSID);
User u = userId == null ? null : userDao.get(userId);
if (u != null && wicketroomid != null) {
log.debug("[loginWicket] user and roomid are not empty: " + userId + ", " + wicketroomid);
@@ -213,7 +213,7 @@ public class MainService implements IPen
Client currentClient = sessionManager.getClientByStreamId(streamId, null);
if (!u.getGroupUsers().isEmpty()) {
- u.setSessionData(sessiondataDao.getSessionByHash(wicketSID));
+ u.setSessionData(sessiondataDao.get(wicketSID));
currentClient.setUserId(u.getId());
currentClient.setRoomId(wicketroomid);
SessionVariablesUtil.setUserId(current.getClient(), u.getId());
@@ -356,9 +356,9 @@ public class MainService implements IPen
*/
public Long loginUserByRemote(String SID) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- Sessiondata sd = sessiondataDao.getSessionByHash(SID);
+ Sessiondata sd = sessiondataDao.get(SID);
if (sd == null || sd.getXml() == null) {
return -37L;
} else {
@@ -441,7 +441,7 @@ public class MainService implements IPen
*/
public Long logoutUser(String SID) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
IConnection current = Red5.getConnectionLocal();
Client currentClient = sessionManager.getClientByStreamId(current.getClient().getId(), null);
@@ -466,7 +466,7 @@ public class MainService implements IPen
}
public List<Userdata> getUserdata(String SID) {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
return userManager.getUserdataDashBoard(users_id);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Fri May 27 12:43:41 2016
@@ -188,7 +188,7 @@ public class MobileService {
private Map<String, Object> login(User u, Map<String, Object> result) {
if (u != null) {
- Sessiondata sd = sessionDao.startsession();
+ Sessiondata sd = sessionDao.create();
boolean bool = sessionDao.updateUser(sd.getSessionId(), u.getId(), false, u.getLanguageId());
if (!bool) {
// invalid Session-Object
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java Fri May 27 12:43:41 2016
@@ -49,7 +49,7 @@ public class PrintService {
public String addPrintList(String SID, @SuppressWarnings("rawtypes") List map, int width, int height) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
String hashRaw = ""+new Date();
String hash = MD5.checksum(hashRaw);
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java Fri May 27 12:43:41 2016
@@ -71,7 +71,7 @@ public class UserService implements IUse
* @return User with the id given
*/
public User getUserById(String SID, long userId) {
- Long authUserId = sessiondataDao.checkSession(SID);
+ Long authUserId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(authUserId))) {
return userDao.get(userId);
}
@@ -86,7 +86,7 @@ public class UserService implements IUse
*/
public String refreshSession(String SID) {
try {
- sessiondataDao.checkSession(SID);
+ sessiondataDao.check(SID);
return "ok";
} catch (Exception err) {
log.error("[refreshSession]", err);
@@ -104,7 +104,7 @@ public class UserService implements IUse
* @return whole user-list
*/
public List<User> getUserList(String SID, int start, int max, String orderby, boolean asc) {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return userDao.get("", start, max, orderby + (asc ? " ASC" : " DESC"));
}
@@ -125,7 +125,7 @@ public class UserService implements IUse
@Override
public boolean kickUserByStreamId(String SID, String streamid, long serverId) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
// admins only
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
if (serverId == 0) {
@@ -179,7 +179,7 @@ public class UserService implements IUse
*/
public boolean kickUserByPublicSID(String SID, String publicSID) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
// users only
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
Client rcl = sessionManager.getClientByPublicSID(publicSID, null);
@@ -210,7 +210,7 @@ public class UserService implements IUse
@Override
public boolean kickUserBySessionId(String SID, long userId, String sessionId) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
// admin only
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
((IApplication)Application.get(wicketApplicationName)).invalidateClient(userId, sessionId);
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java Fri May 27 12:43:41 2016
@@ -153,7 +153,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = sessionManager.getClientByStreamId(streamid, null);
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
if (currentClient.getIsMod()) {
@@ -183,7 +183,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = sessionManager.getClientByStreamId(streamid, null);
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
if (currentClient.getIsMod()) {
@@ -213,7 +213,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = sessionManager.getClientByStreamId(streamid, null);
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
if (currentClient.getIsMod()) {
@@ -244,7 +244,7 @@ public class WhiteBoardService implement
String streamid = current.getClient().getId();
Client currentClient = sessionManager.getClientByStreamId(streamid, null);
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
if (currentClient.getIsMod()) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java Fri May 27 12:43:41 2016
@@ -96,7 +96,7 @@ public class DownloadHandler extends Bas
}
log.debug("sid: " + sid);
- Long users_id = getBean(SessiondataDao.class).checkSession(sid);
+ Long users_id = getBean(SessiondataDao.class).check(sid);
Set<Right> rights = getBean(UserDao.class).getRights(users_id);
if (rights != null && !rights.isEmpty()) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java Fri May 27 12:43:41 2016
@@ -97,7 +97,7 @@ public class ExportToImage extends BaseH
exportType = "svg";
}
- Long users_id = getBean(SessiondataDao.class).checkSession(sid);
+ Long users_id = getBean(SessiondataDao.class).check(sid);
Set<Right> rights = getBean(UserDao.class).getRights(users_id);
log.debug("users_id: " + users_id);
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java Fri May 27 12:43:41 2016
@@ -39,8 +39,6 @@ import org.springframework.transaction.a
*
* @author swagner This Class handles all session management
*
- * TODO: Delete all inactive session by a scheduler
- *
*/
@Transactional
public class SessiondataDao {
@@ -56,27 +54,18 @@ public class SessiondataDao {
*
* @return
*/
- public Sessiondata startsession() {
- try {
- log.debug("startsession :: startsession");
-
- Sessiondata sessiondata = new Sessiondata();
- sessiondata.setSessionId(UUID.randomUUID().toString());
- sessiondata.setRefreshed(new Date());
- sessiondata.setCreated(new Date());
- sessiondata.setUserId(null);
-
- sessiondata = em.merge(sessiondata);
+ public Sessiondata create() {
+ log.debug("startsession :: startsession");
- return sessiondata;
- } catch (Exception ex2) {
- log.error("[startsession]: ", ex2);
- }
+ Sessiondata sd = new Sessiondata();
+ sd.setSessionId(UUID.randomUUID().toString());
+ sd.setCreated(new Date());
+ sd.setUserId(null);
- return null;
+ return update(sd);
}
- public Sessiondata getSessionByHash(String SID) {
+ public Sessiondata get(String SID) {
try {
log.debug("updateUser User SID: " + SID);
@@ -102,27 +91,27 @@ public class SessiondataDao {
* @param SID
* @return
*/
- public Long checkSession(String SID) {
+ public Long check(String SID) {
try {
TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
List<Sessiondata> sessions = query.getResultList();
- Sessiondata sessiondata = null;
+ Sessiondata sd = null;
if (sessions != null && sessions.size() > 0) {
- sessiondata = sessions.get(0);
+ sd = sessions.get(0);
}
// Update the Session Object
- if (sessiondata != null)
- updatesession(SID);
+ if (sd != null) {
+ update(sd);
+ }
// Checks if wether the Session or the User Object of that Session
// is set yet
- if (sessiondata == null || sessiondata.getUserId() == null
- || sessiondata.getUserId().equals(new Long(0))) {
+ if (sd == null || sd.getUserId() == null || sd.getUserId().equals(new Long(0))) {
return new Long(0);
} else {
- return sessiondata.getUserId();
+ return sd.getUserId();
}
} catch (Exception ex2) {
log.error("[checkSession]: ", ex2);
@@ -145,27 +134,19 @@ public class SessiondataDao {
List<Sessiondata> sessions = query.getResultList();
- Sessiondata sessiondata = null;
+ Sessiondata sd = null;
if (sessions != null && sessions.size() > 0) {
- sessiondata = sessions.get(0);
+ sd = sessions.get(0);
}
- if (sessiondata == null) {
+ if (sd == null) {
log.error("Could not find session to Update");
return false;
}
- log.debug("Found session to update: " + sessiondata.getSessionId()
- + " userId: " + userId);
+ log.debug("Found session to update: {}, userId: {}", sd.getSessionId(), userId);
- sessiondata.setRefreshed(new Date());
- sessiondata.setUserId(userId);
- if (sessiondata.getId() == null) {
- em.persist(sessiondata);
- } else {
- if (!em.contains(sessiondata)) {
- em.merge(sessiondata);
- }
- }
+ sd.setUserId(userId);
+ update(sd);
return true;
} catch (Exception ex2) {
log.error("[updateUser]: ", ex2);
@@ -180,28 +161,21 @@ public class SessiondataDao {
List<Sessiondata> sessions = query.getResultList();
- Sessiondata sessiondata = null;
+ Sessiondata sd = null;
if (sessions != null && sessions.size() > 0) {
- sessiondata = sessions.get(0);
+ sd = sessions.get(0);
}
- if (sessiondata == null) {
+ if (sd == null) {
log.error("Could not find session to Update");
return false;
}
- log.debug("Found session to update: " + sessiondata.getSessionId() + " userId: " + userId);
+ log.debug("Found session to update: {}, userId: {}", sd.getSessionId(), userId);
- sessiondata.setRefreshed(new Date());
- sessiondata.setUserId(userId);
- sessiondata.setPermanent(permanent);
- sessiondata.setLanguageId(languageId);
- if (sessiondata.getId() == null) {
- em.persist(sessiondata);
- } else {
- if (!em.contains(sessiondata)) {
- em.merge(sessiondata);
- }
- }
+ sd.setUserId(userId);
+ sd.setPermanent(permanent);
+ sd.setLanguageId(languageId);
+ update(sd);
return true;
} catch (Exception ex2) {
@@ -217,27 +191,19 @@ public class SessiondataDao {
List<Sessiondata> sessions = query.getResultList();
- Sessiondata sessiondata = null;
+ Sessiondata sd = null;
if (sessions != null && sessions.size() > 0) {
- sessiondata = sessions.get(0);
+ sd = sessions.get(0);
}
- if (sessiondata == null) {
+ if (sd == null) {
log.error("Could not find session to Update");
return false;
}
- log.debug("Found session to update: " + sessiondata.getSessionId()
- + " groupId: " + groupId);
+ log.debug("Found session to update: {}, groupId: {}", sd.getSessionId(), groupId);
- sessiondata.setRefreshed(new Date());
- sessiondata.setGroupId(groupId);
- if (sessiondata.getId() == null) {
- em.persist(sessiondata);
- } else {
- if (!em.contains(sessiondata)) {
- em.merge(sessiondata);
- }
- }
+ sd.setGroupId(groupId);
+ update(sd);
return true;
} catch (Exception ex2) {
log.error("[updateUser]: ", ex2);
@@ -252,27 +218,19 @@ public class SessiondataDao {
List<Sessiondata> sessions = query.getResultList();
- Sessiondata sessiondata = null;
+ Sessiondata sd = null;
if (sessions != null && sessions.size() > 0) {
- sessiondata = sessions.get(0);
+ sd = sessions.get(0);
}
- if (sessiondata == null) {
+ if (sd == null) {
log.error("Could not find session to Update");
return false;
}
- log.debug("Found session to update: " + sessiondata.getSessionId()
- + " userId: " + userId);
+ log.debug("Found session to update: {}, userId: {}", sd.getSessionId(), userId);
- sessiondata.setRefreshed(new Date());
- sessiondata.setUserId(userId);
- if (sessiondata.getId() == null) {
- em.persist(sessiondata);
- } else {
- if (!em.contains(sessiondata)) {
- em.merge(sessiondata);
- }
- }
+ sd.setUserId(userId);
+ update(sd);
return true;
} catch (Exception ex2) {
log.error("[updateUser]: ", ex2);
@@ -280,69 +238,6 @@ public class SessiondataDao {
return false;
}
- public boolean updateUserRemoteSession(String SID, String sessionXml) {
- try {
- log.debug("updateUser User SID: " + SID);
-
- TypedQuery<Sessiondata> q = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
- List<Sessiondata> fullList = q.getResultList();
-
- if (fullList.size() == 0) {
- log.error("Could not find session to update: " + SID);
- return false;
- } else {
- // log.error("Found session to update: "+SID);
- }
- Sessiondata sd = fullList.get(0);
- sd.setRefreshed(new Date());
- sd.setXml(sessionXml);
-
- if (sd.getId() == null) {
- em.persist(sd);
- } else {
- if (!em.contains(sd)) {
- em.merge(sd);
- }
- }
- return true;
- } catch (Exception ex2) {
- log.error("[updateUserRemoteSession]: ", ex2);
- }
- return false;
- }
-
- /**
- * update the session every time a user makes a request
- *
- * @param SID
- */
- private void updatesession(String SID) {
- try {
- TypedQuery<Sessiondata> q = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
-
- List<Sessiondata> fullList = q.getResultList();
- if (fullList.size() == 0) {
- log.error("Found NO session to updateSession: ");
-
- } else {
- // log.debug("Found session to updateSession: ");
- Sessiondata sd = fullList.iterator().next();
- sd.setRefreshed(new Date());
-
- if (sd.getId() == null) {
- em.persist(sd);
- } else {
- if (!em.contains(sd)) {
- em.merge(sd);
- }
- }
- }
-
- } catch (Exception ex2) {
- log.error("[updatesession]: ", ex2);
- }
- }
-
/**
*
* @param date
@@ -393,7 +288,7 @@ public class SessiondataDao {
}
String SID = aux.substring(init_pos, end_pos);
- Sessiondata sData = getSessionByHash(SID);
+ Sessiondata sData = get(SID);
if (sData != null) {
em.remove(sData);
}
@@ -402,4 +297,15 @@ public class SessiondataDao {
log.error("clearSessionByRoomId", err);
}
}
+
+ public Sessiondata update(Sessiondata sd) {
+ sd.setRefreshed(new Date());
+
+ if (sd.getId() == null) {
+ em.persist(sd);
+ } else {
+ sd = em.merge(sd);
+ }
+ return sd;
+ }
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java Fri May 27 12:43:41 2016
@@ -34,10 +34,8 @@ import javax.xml.bind.annotation.XmlRoot
@Entity
@NamedQueries({
- @NamedQuery(name = "getSessionById", query = "select c from Sessiondata as c "
- + "where c.sessionId LIKE :sessionId"),
- @NamedQuery(name = "getSessionToDelete", query = "Select c from Sessiondata c "
- + "WHERE c.refreshed < :refreshed AND c.permanent = false")
+ @NamedQuery(name = "getSessionById", query = "SELECT s FROM Sessiondata s WHERE s.sessionId LIKE :sessionId"),
+ @NamedQuery(name = "getSessionToDelete", query = "SELECT s FROM Sessiondata s WHERE s.refreshed < :refreshed AND s.permanent = false")
})
@Table(name = "sessiondata")
@XmlRootElement
Modified: openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Fri May 27 12:43:41 2016
@@ -145,7 +145,7 @@ public class UserManager implements IUse
try {
Sessiondata sessionData = sessiondataDao
- .getSessionByHash(remoteHash);
+ .get(remoteHash);
if (sessionData != null) {
@@ -424,7 +424,7 @@ public class UserManager implements IUse
@Override
public boolean kickUserByStreamId(String SID, Long room_id) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
// admins only
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
@@ -457,7 +457,7 @@ public class UserManager implements IUse
@Override
public boolean kickUserByPublicSID(String SID, String publicSID) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
// admins only
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Fri May 27 12:43:41 2016
@@ -202,7 +202,7 @@ public class WebSession extends Abstract
}
if (!soapLogin.isUsed() || soapLogin.getAllowSameURLMultipleTimes()) {
SessiondataDao sessionDao = getBean(SessiondataDao.class);
- Sessiondata sd = sessionDao.getSessionByHash(soapLogin.getSessionHash());
+ Sessiondata sd = sessionDao.get(soapLogin.getSessionHash());
if (sd != null && sd.getXml() != null) {
RemoteSessionObject remoteUser = RemoteSessionObject.fromXml(sd.getXml());
if (remoteUser != null && !Strings.isEmpty(remoteUser.getExternalUserId())) {
@@ -293,7 +293,7 @@ public class WebSession extends Abstract
}
public boolean signIn(User u) {
- Sessiondata sessData = getBean(SessiondataDao.class).startsession();
+ Sessiondata sessData = getBean(SessiondataDao.class).create();
SID = sessData.getSessionId();
if (u == null) {
return false;
@@ -330,11 +330,11 @@ public class WebSession extends Abstract
public String getValidatedSid() {
SessiondataDao sessionDao = getBean(SessiondataDao.class);
- Long _userId = sessionDao.checkSession(SID);
+ Long _userId = sessionDao.check(SID);
if (_userId == null || !_userId.equals(userId)) {
- Sessiondata sessionData = sessionDao.getSessionByHash(SID);
+ Sessiondata sessionData = sessionDao.get(SID);
if (sessionData == null) {
- sessionData = sessionDao.startsession();
+ sessionData = sessionDao.create();
}
if (!sessionDao.updateUser(sessionData.getSessionId(), userId, false, languageId)) {
//something bad, force user to re-login
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Fri May 27 12:43:41 2016
@@ -163,7 +163,7 @@ public class RoomPanel extends BasePanel
@Override
protected void onTimer(AjaxRequestTarget target) {
- getBean(SessiondataDao.class).checkSession(WebSession.getSid()); //keep SID alive
+ getBean(SessiondataDao.class).check(WebSession.getSid()); //keep SID alive
}
});
add(invite = new InvitationDialog("invite", roomId));
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java Fri May 27 12:43:41 2016
@@ -31,7 +31,7 @@ public class TestAuth extends AbstractJU
@Test
public void testTestAuth() {
- Sessiondata sessionData = sessionDao.startsession();
+ Sessiondata sessionData = sessionDao.create();
System.out.println("sessionData: " + sessionData.getSessionId());
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Fri May 27 12:43:41 2016
@@ -92,7 +92,7 @@ public class CalendarWebService {
{
log.debug("range : startdate - " + start.getTime() + ", enddate - " + end.getTime());
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return AppointmentDTO.list(appointmentDao.getInRange(userId, start.getTime(), end.getTime()));
} else {
@@ -132,7 +132,7 @@ public class CalendarWebService {
{
log.debug("rangeForUser : startdate - " + start.getTime() + ", enddate - " + end.getTime());
try {
- Long authUserId = sessionDao.checkSession(sid);
+ Long authUserId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
return AppointmentDTO.list(appointmentDao.getInRange(userid, start.getTime(), end.getTime()));
} else {
@@ -158,7 +158,7 @@ public class CalendarWebService {
@Path("/next")
public AppointmentDTO next(@QueryParam("sid") @WebParam(name="sid") String sid) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
Appointment a = appointmentDao.getNext(userId, new Date());
return a == null ? null : new AppointmentDTO(a);
@@ -188,7 +188,7 @@ public class CalendarWebService {
@Path("/next/{userid}")
public AppointmentDTO nextForUser(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("userid") @WebParam(name="userid") long userid) throws ServiceException {
try {
- Long authUserId = sessionDao.checkSession(sid);
+ Long authUserId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
Appointment a = appointmentDao.getNext(userid, new Date());
return a == null ? null : new AppointmentDTO(a);
@@ -216,7 +216,7 @@ public class CalendarWebService {
@Path("/room/{roomid}")
public AppointmentDTO getByRoom(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("roomid") @WebParam(name="roomid") long roomid) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
Appointment app = appointmentDao.getByRoom(userId, roomid);
if (app != null) {
@@ -249,7 +249,7 @@ public class CalendarWebService {
@Path("/title/{title}")
public List<AppointmentDTO> getByTitle(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("title") @WebParam(name="title") String title) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return AppointmentDTO.list(appointmentDao.searchAppointmentsByTitle(userId, title));
} else {
@@ -281,7 +281,7 @@ public class CalendarWebService {
log.debug("save SID:" + sid);
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
log.debug("save userId:" + userId);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
@@ -318,7 +318,7 @@ public class CalendarWebService {
@Path("/{id}")
public void delete(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("id") @WebParam(name="id") Long id) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
Set<Right> rights = userDao.getRights(userId);
Appointment a = appointmentDao.get(id);
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java Fri May 27 12:43:41 2016
@@ -106,7 +106,7 @@ public class ErrorWebService {
@Path("/report/")
public void report(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="message") @QueryParam("message") String message) {
if (sid != null && message != null) {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (userId != null && userId != 0) {
log.error("[CLIENT MESSAGE] " + message);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java Fri May 27 12:43:41 2016
@@ -103,7 +103,7 @@ public class FileWebService {
@Path("/{id}")
public ServiceResult delete(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("id") @WebParam(name="id") Long id) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
FileExplorerItem f = fileDao.get(id);
if (f == null) {
@@ -145,7 +145,7 @@ public class FileWebService {
) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
FileExplorerItem f = fileDao.get(externalId, externalType);
@@ -181,7 +181,7 @@ public class FileWebService {
) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
FileExplorerItem f = file == null ? null : file.get();
if (f == null || f.getId() != null) {
@@ -230,7 +230,7 @@ public class FileWebService {
try {
- Long userId = sessionDao.checkSession(SID);
+ Long userId = sessionDao.check(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -282,7 +282,7 @@ public class FileWebService {
) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
log.debug("roomId " + roomId);
@@ -331,7 +331,7 @@ public class FileWebService {
) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
log.debug("getRoomByParent " + parentId);
@@ -379,7 +379,7 @@ public class FileWebService {
, @WebParam(name="name") @PathParam("name") String name) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
// FIXME TODO: check if this user is allowed to change this file
@@ -419,7 +419,7 @@ public class FileWebService {
, @WebParam(name="parentid") @PathParam("parentid") long parentId) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
// FIXME TODO A test is required that checks if the user is allowed to move the file
log.debug("move " + id);
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java Fri May 27 12:43:41 2016
@@ -97,7 +97,7 @@ public class GroupWebService {
@POST
@Path("/")
public ServiceResult add(@QueryParam("sid") @WebParam(name="sid") String sid, @QueryParam("name") @WebParam(name="name") String name) throws ServiceException {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Group o = new Group();
o.setName(name);
@@ -119,7 +119,7 @@ public class GroupWebService {
@GET
@Path("/")
public List<Group> get(@QueryParam("sid") @WebParam(name="sid") String sid) throws ServiceException {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
return groupDao.get(0, Integer.MAX_VALUE);
} else {
@@ -149,7 +149,7 @@ public class GroupWebService {
) throws ServiceException
{
try {
- Long authUserId = sessionDao.checkSession(sid);
+ Long authUserId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
if (!groupUserDao.isUserInGroup(id, userid)) {
User u = userDao.get(userid);
@@ -187,7 +187,7 @@ public class GroupWebService {
) throws ServiceException
{
try {
- Long authUserId = sessionDao.checkSession(sid);
+ Long authUserId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
if (groupUserDao.isUserInGroup(id, userid)) {
User u = userDao.get(userid);
@@ -227,7 +227,7 @@ public class GroupWebService {
) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Room r = roomDao.get(roomid);
if (r != null) {
@@ -285,7 +285,7 @@ public class GroupWebService {
) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
SearchResult<User> result = new SearchResult<User>();
result.setObjectName(User.class.getName());
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -320,7 +320,7 @@ public class GroupWebService {
@Path("/{id}")
public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException {
try {
- Long authUserId = sessionDao.checkSession(sid);
+ Long authUserId = sessionDao.check(sid);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(authUserId))) {
groupDao.delete(groupDao.get(id), authUserId);
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java Fri May 27 12:43:41 2016
@@ -79,7 +79,7 @@ public class RecordingWebService {
@Path("/{id}")
public void delete(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("id") @WebParam(name="id") Long id) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
recordingDao.delete(recordingDao.get(id));
@@ -111,7 +111,7 @@ public class RecordingWebService {
, @PathParam("externaltype") @WebParam(name="externaltype") String externalType
, @PathParam("externalid") @WebParam(name="externalid") String externalId) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
return RecordingDTO.list(recordingDao.getByExternalId(externalId, externalType));
@@ -142,7 +142,7 @@ public class RecordingWebService {
public List<RecordingDTO> getExternalByType(@WebParam(name="sid") @QueryParam("sid") String sid
, @PathParam("externaltype") @WebParam(name="externaltype") String externalType) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
return RecordingDTO.list(recordingDao.getByExternalType(externalType));
@@ -173,7 +173,7 @@ public class RecordingWebService {
public List<RecordingDTO> getExternalByRoom(@WebParam(name="sid") @QueryParam("sid") String sid
, @PathParam("roomid") @WebParam(name="roomid") Long roomId) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
return RecordingDTO.list(recordingDao.getByRoomId(roomId));
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Fri May 27 12:43:41 2016
@@ -110,7 +110,7 @@ public class RoomWebService {
@Path("/public/{type}")
public List<RoomDTO> getPublic(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("type") @WebParam(name="type") String type) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return RoomDTO.list(roomDao.getPublicRooms(Room.Type.valueOf(type)));
@@ -136,7 +136,7 @@ public class RoomWebService {
@GET
@Path("/{id}")
public RoomDTO getRoomById(@QueryParam("sid") @WebParam(name="sid") String sid, @PathParam("id") @WebParam(name="id") Long id) throws ServiceException {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return new RoomDTO(roomDao.get(id));
} else {
@@ -173,7 +173,7 @@ public class RoomWebService {
, @PathParam("externalid") @WebParam(name="externalid") Long externalId
, @WebParam(name="room") @QueryParam("room") RoomDTO room) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Room r = roomDao.getExternal(Room.Type.valueOf(type), externalType, externalId);
if (r == null) {
@@ -210,7 +210,7 @@ public class RoomWebService {
@Path("/")
public RoomDTO add(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="room") @FormParam("room") RoomDTO room) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Room r = room.get();
r = roomDao.update(r, userId);
@@ -274,7 +274,7 @@ public class RoomWebService {
@DELETE
@Path("/{id}")
public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Room r = roomDao.get(id);
if (r != null) {
@@ -308,7 +308,7 @@ public class RoomWebService {
@Path("/close/{id}")
public ServiceResult close(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
log.debug("close " + id);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -354,7 +354,7 @@ public class RoomWebService {
@Path("/open/{id}")
public ServiceResult open(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
log.debug("open " + id);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -391,7 +391,7 @@ public class RoomWebService {
@Path("/kick/{id}")
public ServiceResult kick(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
boolean result = userManager.kickUserByStreamId(sid, id);
return new ServiceResult(result ? 1L : 0L, "Kicked", Type.SUCCESS);
@@ -420,7 +420,7 @@ public class RoomWebService {
public List<RoomCountBean> counters(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @QueryParam("id") List<Long> ids) throws ServiceException {
List<RoomCountBean> roomBeans = new ArrayList<RoomCountBean>();
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
List<Room> rooms = roomDao.get(ids);
@@ -463,7 +463,7 @@ public class RoomWebService {
) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Invitation i = invite.get(userId, userDao, roomDao);
i = invitationDao.update(i);
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java Fri May 27 12:43:41 2016
@@ -90,7 +90,7 @@ public class ServerWebService {
) throws ServiceException
{
log.debug("getServers enter");
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
return ServerDTO.list(serverDao.get(start, max));
@@ -113,7 +113,7 @@ public class ServerWebService {
@Path("/count")
public long count(@QueryParam("sid") @WebParam(name="sid") String sid) throws ServiceException {
log.debug("getServerCount enter");
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
return serverDao.count();
@@ -136,7 +136,7 @@ public class ServerWebService {
@Path("/")
public ServerDTO add(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="server") @QueryParam("server") ServerDTO server) throws ServiceException {
log.debug("saveServerCount enter");
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Server s = server.get();
return new ServerDTO(serverDao.update(s, userId));
@@ -160,7 +160,7 @@ public class ServerWebService {
@Path("/{id}")
public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException {
log.debug("saveServerCount enter");
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Server s = serverDao.get(id);
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java Fri May 27 12:43:41 2016
@@ -108,7 +108,7 @@ public class UserWebService implements U
return new ServiceResult(-1L, "Login failed", Type.ERROR);
}
- Sessiondata sd = sessionDao.startsession();
+ Sessiondata sd = sessionDao.create();
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);
@@ -132,7 +132,7 @@ public class UserWebService implements U
@Path("/")
public List<UserDTO> get(@WebParam(name="sid") @QueryParam("sid") String sid) throws ServiceException {
try {
- Long authUserId = sessionDao.checkSession(sid);
+ Long authUserId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
return UserDTO.list(userDao.getAllUsers());
@@ -159,7 +159,7 @@ public class UserWebService implements U
) throws ServiceException
{
try {
- Long authUserId = sessionDao.checkSession(sid);
+ Long authUserId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
User testUser = userDao.getExternalUser(user.getExternalId(), user.getExternalType());
@@ -223,7 +223,7 @@ public class UserWebService implements U
@Path("/{id}")
public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @PathParam("id") long id) throws ServiceException {
try {
- Long authUserId = sessionDao.checkSession(sid);
+ Long authUserId = sessionDao.check(sid);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(authUserId))) {
userDao.delete(userDao.get(id), authUserId);
@@ -251,7 +251,7 @@ public class UserWebService implements U
) throws ServiceException
{
try {
- Long authUserId = sessionDao.checkSession(sid);
+ Long authUserId = sessionDao.check(sid);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(authUserId))) {
User user = userDao.getExternalUser(externalId, externalType);
@@ -283,7 +283,7 @@ public class UserWebService implements U
) throws ServiceException
{
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
user.getLogin(), user.getFirstname(), user.getLastname()
@@ -296,8 +296,6 @@ public class UserWebService implements U
log.debug("xmlString " + xmlString);
- sessionDao.updateUserRemoteSession(sid, xmlString);
-
//TODO LandingZone are not configurable for now
String hash = soapLoginDao.addSOAPLogin(sid, options.getRoomId(),
options.isModerator(), options.isShowAudioVideoTest(), options.isAllowSameURLMultipleTimes(),
@@ -308,6 +306,12 @@ public class UserWebService implements U
);
if (hash != null) {
+ Sessiondata sd = sessionDao.get(sid);
+ if (options.isAllowSameURLMultipleTimes()) {
+ sd.setPermanent(true);
+ }
+ sd.setXml(xmlString);
+ sessionDao.update(sd);
return new ServiceResult(0, hash, Type.SUCCESS);
}
} else {
@@ -329,7 +333,7 @@ public class UserWebService implements U
@Path("/kick/{publicsid}")
public ServiceResult kick(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="publicsid") @PathParam("publicsid") String publicSID) throws ServiceException {
try {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Boolean success = userManagement.kickUserByPublicSID(sid, publicSID);
@@ -351,7 +355,7 @@ public class UserWebService implements U
@GET
@Path("/count/{roomid}")
public int count(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="roomid") @PathParam("roomid") Long roomId) {
- Long userId = sessionDao.checkSession(sid);
+ Long userId = sessionDao.check(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return conferenceService.getRoomClientsListByRoomId(roomId).size();
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java Fri May 27 12:43:41 2016
@@ -74,7 +74,7 @@ public class ConferenceLibrary implement
public LibraryPresentation getPresentationPreviewFileExplorer(String SID, String parentFolder) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
log.debug("#############users_id : " + users_id);
@@ -109,7 +109,7 @@ public class ConferenceLibrary implement
*/
public Long saveAsObject(String SID, Long roomId, String fileName, Object tObjectRef) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
// LinkedHashMap tObject = (LinkedHashMap)t;
// ArrayList tObject = (ArrayList)t;
@@ -146,7 +146,7 @@ public class ConferenceLibrary implement
@SuppressWarnings({ "rawtypes", "unchecked" })
public void loadWmlObject(String SID, Long room_id, Long fileId, Long whiteboardId) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
IConnection current = Red5.getConnectionLocal();
@@ -215,7 +215,7 @@ public class ConferenceLibrary implement
@SuppressWarnings("rawtypes")
public ArrayList loadChartObject(String SID, Long room_id, String fileName) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
return LibraryChartLoader.getInstance().loadChart(OmFileHelper.getUploadRoomDir(room_id.toString()), fileName);
}
@@ -232,7 +232,7 @@ public class ConferenceLibrary implement
*/
public Long copyFileToCurrentRoom(String SID, Long flvFileExplorerId) {
try {
- Long users_id = sessiondataDao.checkSession(SID);
+ Long users_id = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java Fri May 27 12:43:41 2016
@@ -68,7 +68,7 @@ public class ConferenceService {
public List<RoomGroup> getRoomsByGroupWithoutType(String SID, long groupId) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
log.debug("getRoomsByGroupWithoutType");
List<RoomGroup> roomGroupsList = roomManager.getRoomGroupByGroupId(groupId);
@@ -99,7 +99,7 @@ public class ConferenceService {
log.debug("getRoomsByGroup");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasModLevel(userDao.get(userId), groupId)) {
return roomManager.getRoomGroupByGroupId(groupId, start, max, orderby, asc);
}
@@ -117,7 +117,7 @@ public class ConferenceService {
try {
log.debug("getRoomsPublic");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
List<Room> roomList = roomDao.getPublicRooms(Room.Type.get(typeId));
@@ -144,7 +144,7 @@ public class ConferenceService {
public List<Room> getRoomsPublicWithoutType(String SID) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
List<Room> roomList = roomDao.getPublicRooms();
@@ -179,7 +179,7 @@ public class ConferenceService {
public List<Room> getAppointedMeetingRoomsWithoutType(String SID) {
log.debug("ConferenceService.getAppointedMeetings");
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
List<Appointment> appointments = appointmentDao.getForToday(userId);
@@ -208,7 +208,7 @@ public class ConferenceService {
public Room getRoomWithCurrentUsersById(String SID, long roomId) {
Room room = null;
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
room = roomDao.get(roomId);
room.setCurrentusers(sessionManager.getClientListByRoom(room.getId()));
@@ -229,7 +229,7 @@ public class ConferenceService {
public SearchResult<Room> getRooms(String SID, int start, int max, String orderby, boolean asc, String search) {
log.debug("getRooms");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRooms(start, max, orderby, asc, search);
}
@@ -239,7 +239,7 @@ public class ConferenceService {
public SearchResult<Room> getRoomsWithCurrentUsers(String SID, int start, int max, String orderby, boolean asc) {
log.debug("getRooms");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRoomsWithCurrentUsers(start, max, orderby, asc);
}
@@ -248,7 +248,7 @@ public class ConferenceService {
public List<RoomModerator> getRoomModeratorsByRoomId(String SID, Long roomId) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return roomModeratorDao.getByRoomId(roomId);
}
@@ -271,7 +271,7 @@ public class ConferenceService {
public List<Room> getRoomsWithCurrentUsersByList(String SID, int start, int max, String orderby, boolean asc) {
log.debug("getRoomsWithCurrentUsersByList");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRoomsWithCurrentUsersByList(start, max, orderby, asc);
}
@@ -281,7 +281,7 @@ public class ConferenceService {
public List<Room> getRoomsWithCurrentUsersByListAndType(String SID, int start, int max, String orderby, boolean asc, String externalType) {
log.debug("getRoomsWithCurrentUsersByListAndType");
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasAdminLevel(userDao.getRights(userId))) {
return roomManager.getRoomsWithCurrentUsersByListAndType(start, max, orderby, asc, externalType);
}
@@ -289,7 +289,7 @@ public class ConferenceService {
}
public Room getRoomByOwnerAndType(String SID, Long typeId, String roomName) {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return roomDao.getUserRoom(userId, Room.Type.get(typeId), roomName);
}
@@ -297,7 +297,7 @@ public class ConferenceService {
}
public Room getRoomById(String SID, Long roomId) {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return roomDao.get(roomId);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java Fri May 27 12:43:41 2016
@@ -102,7 +102,7 @@ public class InvitationService implement
Long languageId, String iCalTz, boolean sendMail) {
try {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
log.debug("sendInvitationHash: ");
@@ -142,7 +142,7 @@ public class InvitationService implement
}
public String sendInvitationByHash(String SID, String invitationHash, String message, String subject, Long languageId) throws Exception {
- Long userId = sessiondataDao.checkSession(SID);
+ Long userId = sessiondataDao.check(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
Invitation inv = (Invitation)invitationManager.getInvitationByHashCode(invitationHash, false);