svn commit: r1672260 - in /openmeetings: branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInPage.java trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java

[solomax]

Author: solomax
Date: Thu Apr  9 08:36:50 2015
New Revision: 1672260

URL: http://svn.apache.org/r1672260
Log:
[OPENMEETINGS-1133] direct sign-in via POST method should work as expected

Modified:
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1672260&r1=1672259&r2=1672260&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
 Thu Apr  9 08:36:50 2015
@@ -69,6 +69,7 @@ import org.apache.wicket.markup.head.Css
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.flow.RedirectToUrlException;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
@@ -123,6 +124,16 @@ public class SignInPage extends BaseInit
                                log.error("OAuth2 login error", e);
                        }
                }
+               //will try to login directly using parameters sent by POST
+               IRequestParameters pp = 
RequestCycle.get().getRequest().getPostParameters();
+               StringValue login = pp.getParameterValue("login"), password = 
pp.getParameterValue("password");
+               if (!login.isEmpty() && !password.isEmpty()) {
+                       if (WebSession.get().signIn(login.toString(), 
password.toString(), Type.user, null)) {
+                               
setResponsePage(Application.get().getHomePage());
+                       } else {
+                               log.error("Failed to login using POST 
parameters passed");
+                       }
+               }
                
                RegisterDialog r = new RegisterDialog("register");
                ForgetPasswordDialog f = new ForgetPasswordDialog("forget");

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1672260&r1=1672259&r2=1672260&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
 Thu Apr  9 08:36:50 2015
@@ -69,6 +69,7 @@ import org.apache.wicket.markup.head.Css
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.flow.RedirectToUrlException;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
@@ -123,6 +124,16 @@ public class SignInPage extends BaseInit
                                log.error("OAuth2 login error", e);
                        }
                }
+               //will try to login directly using parameters sent by POST
+               IRequestParameters pp = 
RequestCycle.get().getRequest().getPostParameters();
+               StringValue login = pp.getParameterValue("login"), password = 
pp.getParameterValue("password");
+               if (!login.isEmpty() && !password.isEmpty()) {
+                       if (WebSession.get().signIn(login.toString(), 
password.toString(), Type.user, null)) {
+                               
setResponsePage(Application.get().getHomePage());
+                       } else {
+                               log.error("Failed to login using POST 
parameters passed");
+                       }
+               }
                
                RegisterDialog r = new RegisterDialog("register");
                ForgetPasswordDialog f = new ForgetPasswordDialog("forget");