Author: sebawagner
Date: Sat Jul 7 08:18:20 2012
New Revision: 1358520
URL: http://svn.apache.org/viewvc?rev=1358520&view=rev
Log:
Merge r1355937 to 2.0 branch
Modified:
incubator/openmeetings/branches/2.0/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/remote/MainService.java
Modified:
incubator/openmeetings/branches/2.0/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1358520&r1=1358519&r2=1358520&view=diff
==============================================================================
---
incubator/openmeetings/branches/2.0/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/branches/2.0/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Sat Jul 7 08:18:20 2012
@@ -469,12 +469,15 @@
canvas.setAttribute('firstName',value.firstname);
canvas.setAttribute('lastName',value.lastname);
+
+ hib.userobject.firstname = value.firstname;
+ hib.userobject.lastname = value.lastname;
+
canvas.setAttribute('mail','');
canvas.setAttribute('lastLogin','');
canvas.setAttribute('official_code','');
canvas.setAttribute('picture_uri',value.picture_uri);
canvas.setAttribute('language','');
- //canvas.setAttribute('currentuser',value.login);
if ($debug) Debug.write("canvas.landingZone ::
",canvas.landingZone);
Modified:
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/remote/MainService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/src/org/openmeetings/app/remote/MainService.java?rev=1358520&r1=1358519&r2=1358520&view=diff
==============================================================================
---
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/remote/MainService.java
(original)
+++
incubator/openmeetings/branches/2.0/src/org/openmeetings/app/remote/MainService.java
Sat Jul 7 08:18:20 2012
@@ -666,17 +666,26 @@ public class MainService implements IPen
}
/**
- * this function logs a user into if he enteres the app directly into a
room
+ * this function returns a user object with organization objects set
only
+ * the organization is not available for users that are using a HASH
mechanism
+ * cause the SOAP/REST API does not guarantee that the user connected
to the HASH
+ * has a valid user object set
*
* @param SID
*/
public Users markSessionAsLogedIn(String SID) {
try {
sessionManagement.updateUserWithoutSession(SID, -1L);
- Configuration conf = cfgManagement.getConfKey(3L,
- "default.rpc.userid");
- return userManagement.getUserById(Long.parseLong(conf
- .getConf_value()));
+
+ Long defaultRpcUserid = cfgManagement.getConfValue(
+ "default.rpc.userid", Long.class, "-1");
+ Users defaultRpcUser =
userManagement.getUserById(defaultRpcUserid);
+
+ Users user = new Users();
+
user.setOrganisation_users(defaultRpcUser.getOrganisation_users());
+
+ return user;
+
} catch (Exception err) {
log.error("[markSessionAsLogedIn]", err);
}
