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 [3/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...
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java 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/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Fri May 27 12:43:41 2016
@@ -109,7 +109,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)));
@@ -135,7 +135,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 {
@@ -172,7 +172,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) {
@@ -209,7 +209,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);
@@ -273,7 +273,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) {
@@ -307,7 +307,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))) {
@@ -351,7 +351,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))) {
@@ -388,7 +388,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);
@@ -417,7 +417,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);
@@ -460,7 +460,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/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java (original)
+++ openmeetings/application/trunk/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/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1745748&r1=1745747&r2=1745748&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java 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();