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/26 12:39:28 UTC

svn commit: r1745594 - in /openmeetings/application: branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ trunk/openmeetings-web/src/main/java/org/...

Author: solomax
Date: Thu May 26 12:39:27 2016
New Revision: 1745594

URL: http://svn.apache.org/viewvc?rev=1745594&view=rev
Log:
[OPENMEETINGS-1411] allowMultipleTimes secure hash seems to be fixed

Modified:
    openmeetings/application/branches/3.1.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/app/WebSession.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java

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=1745594&r1=1745593&r2=1745594&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 Thu May 26 12:39:27 2016
@@ -215,6 +215,7 @@ public class WebSession extends Abstract
 						user.setLogin(remoteUser.getUsername()); //FIXME check if login UNIQUE
 						user.setExternalId(remoteUser.getExternalUserId());
 						user.setExternalType(remoteUser.getExternalUserType());
+						user.getRights().clear();
 						user.getRights().add(Right.Room);
 						user.getAddress().setEmail(remoteUser.getEmail());
 						user.setPictureuri(remoteUser.getPictureUrl());

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1745594&r1=1745593&r2=1745594&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Thu May 26 12:39:27 2016
@@ -215,6 +215,7 @@ public class WebSession extends Abstract
 						user.setLogin(remoteUser.getUsername()); //FIXME check if login UNIQUE
 						user.setExternalId(remoteUser.getExternalUserId());
 						user.setExternalType(remoteUser.getExternalUserType());
+						user.getRights().clear();
 						user.getRights().add(Right.Room);
 						user.getAddress().setEmail(remoteUser.getEmail());
 						user.setPictureuri(remoteUser.getPictureUrl());

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=1745594&r1=1745593&r2=1745594&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 Thu May 26 12:39:27 2016
@@ -215,6 +215,7 @@ public class WebSession extends Abstract
 						user.setLogin(remoteUser.getUsername()); //FIXME check if login UNIQUE
 						user.setExternalId(remoteUser.getExternalUserId());
 						user.setExternalType(remoteUser.getExternalUserType());
+						user.getRights().clear();
 						user.getRights().add(Right.Room);
 						user.getAddress().setEmail(remoteUser.getEmail());
 						user.setPictureuri(remoteUser.getPictureUrl());