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 2013/08/14 10:09:30 UTC
svn commit: r1513755 - in /openmeetings/trunk/singlewebapp:
WebContent/src/base/hibernate/ src/org/apache/openmeetings/data/user/
src/org/apache/openmeetings/remote/ src/org/apache/openmeetings/web/pages/
src/org/apache/openmeetings/web/pages/auth/
Author: solomax
Date: Wed Aug 14 08:09:30 2013
New Revision: 1513755
URL: http://svn.apache.org/r1513755
Log:
[OPENMEETINGS-764] secureHash works as expected in 3.0.0
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BaseInitedPage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1513755&r1=1513754&r2=1513755&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Wed Aug 14 08:09:30 2013
@@ -444,49 +444,46 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="secureLoginByRemote" activeErrorHandler="true"
- funcname="xmlcrm.secureLoginByRemote" >
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <netparam name="remoteSessionId"><method name="getValue">return canvas.secureHash;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- canvas.thishib.loaderVar.close();
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("secureLoginByRemote: ",value);
- if (value<0){
-
- } else {
-
- if (value == null) {
- new lz.errorPopup(canvas,{error:'Invalid Hash'});
- return;
- }
-
- canvas.showNickNameDialog = value.showNickNameDialog;
-
- if ($debug) Debug.write("markSessionAsLogedIn9 ",canvas.showNickNameDialog);
-
-
- canvas.initroomid = value.room_id;
- canvas.becomemoderator = value.becomemoderator;
- canvas.showAudioVideoTest = value.showAudioVideoTest;
- canvas.landingZone = value.landingZone;
-
- canvas.roomRecordingId = value.roomRecordingId;
-
- if (canvas.roomRecordingId == null) {
- canvas.roomRecordingId = 0;
- }
-
- if (canvas.showNickNameDialog) {
- new lz.chooseNickName(canvas);
- } else {
- parent.getCurrentRoomClient.doCall();
- }
- }
- ]]>
- </handler>
- </netRemoteCallHib>
+ <netRemoteCallHib name="secureLoginByRemote" activeErrorHandler="true" funcname="xmlcrm.secureLoginByRemote" >
+ <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
+ <netparam name="remoteSessionId"><method name="getValue">return canvas.secureHash;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.close();
+ }
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("secureLoginByRemote: ",value);
+ if (value < 0) {
+ } else {
+ if (value == null) {
+ new lz.errorPopup(canvas,{error:'Invalid Hash'});
+ return;
+ }
+
+ canvas.showNickNameDialog = value.showNickNameDialog;
+ if ($debug) Debug.write("markSessionAsLogedIn9 ",canvas.showNickNameDialog);
+
+ canvas.initroomid = value.room_id;
+ canvas.becomemoderator = value.becomemoderator;
+ canvas.showAudioVideoTest = value.showAudioVideoTest;
+ canvas.landingZone = value.landingZone;
+
+ canvas.roomRecordingId = value.roomRecordingId;
+
+ if (canvas.roomRecordingId == null) {
+ canvas.roomRecordingId = 0;
+ }
+
+ if (canvas.showNickNameDialog) {
+ new lz.chooseNickName(canvas);
+ } else {
+ parent.getCurrentRoomClient.doCall();
+ }
+ }
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<netRemoteCallHib name="loginUserByRemote" activeErrorHandler="true"
funcname="xmlcrm.loginUserByRemote" >
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java?rev=1513755&r1=1513754&r2=1513755&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java Wed Aug 14 08:09:30 2013
@@ -928,7 +928,7 @@ public class UserManager {
int status, String firstname, String login, String lastname,
long language_id, boolean emptyPass, String userpass, Address address, Date age,
String hash, String externalUserId, String externalUserType,
- boolean generateSipUserData, String email, String jNameTimeZone,
+ boolean generateSipUserData, String email, String iCalTz,
String pictureuri) {
try {
User users = new User();
@@ -953,7 +953,7 @@ public class UserManager {
users.setStarttime(new Date());
users.setActivatehash(hash);
users.setPictureuri(pictureuri);
- users.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jNameTimeZone).getID());
+ users.setTimeZoneId(timezoneUtil.getTimeZone(iCalTz).getID());
users.setExternalUserId(externalUserId);
users.setExternalUserType(externalUserType);
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1513755&r1=1513754&r2=1513755&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java Wed Aug 14 08:09:30 2013
@@ -379,7 +379,7 @@ public class MainService implements IPen
userObject.getExternalUserType());
if (user == null) {
- String jName_timeZone = configurationDao.getConfValue("default.timezone", String.class, "");
+ String iCalTz = configurationDao.getConfValue("default.timezone", String.class, "");
long userId = userManager
.addUserWithExternalKey(1, 0, 0,
@@ -391,7 +391,7 @@ public class MainService implements IPen
userObject.getExternalUserId(),
userObject.getExternalUserType(),
true, userObject.getEmail(),
- jName_timeZone,
+ iCalTz,
userObject.getPictureUrl());
currentClient.setUser_id(userId);
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BaseInitedPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BaseInitedPage.java?rev=1513755&r1=1513754&r2=1513755&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BaseInitedPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BaseInitedPage.java Wed Aug 14 08:09:30 2013
@@ -23,10 +23,21 @@ import static org.apache.openmeetings.we
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.string.StringValue;
public abstract class BaseInitedPage extends BasePage {
private static final long serialVersionUID = 5716753033219700254L;
+ public BaseInitedPage(PageParameters pp) {
+ if (pp != null) {
+ StringValue hash = pp.get("secureHash");
+ if (!hash.isEmpty()) {
+ setResponsePage(SwfPage.class, pp);
+ }
+ }
+ }
+
@Override
protected String getApplicationName() {
return getBean(ConfigurationDao.class).getAppName();
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?rev=1513755&r1=1513754&r2=1513755&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java Wed Aug 14 08:09:30 2013
@@ -47,6 +47,7 @@ import org.apache.wicket.protocol.ws.api
import org.apache.wicket.protocol.ws.api.message.ClosedMessage;
import org.apache.wicket.protocol.ws.api.message.ConnectedMessage;
import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -62,6 +63,11 @@ public class MainPage extends BaseInited
private DebugBar dev = null;
public MainPage() {
+ this(null);
+ }
+
+ public MainPage(PageParameters pp) {
+ super(pp);
contents = new WebMarkupContainer("contents");
add(contents.add(new WebMarkupContainer(CHILD_ID)).setOutputMarkupId(true).setMarkupId("contents"));
menu = new MenuPanel("menu");
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1513755&r1=1513754&r2=1513755&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java Wed Aug 14 08:09:30 2013
@@ -86,6 +86,7 @@ public class SignInPage extends BaseInit
}
public SignInPage(PageParameters p) {
+ super(p);
if (p != null) {
if (p.get("oauthid").toString() != null) { // oauth2 login
try {