[Skabacca-developer] SF.net SVN: skabacca:[19] trunk/gui/src/main/java/org/skabacca/gui
Status: Pre-Alpha
Brought to you by:
triathlon98
Menu
▾
▴
[Skabacca-developer] SF.net SVN: skabacca:[19] trunk/gui/src/main/java/org/skabacca/gui
|
From: <tri...@us...> - 2010-01-29 19:19:44
|
Revision: 19
http://skabacca.svn.sourceforge.net/skabacca/?rev=19&view=rev
Author: triathlon98
Date: 2010-01-29 19:19:09 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
try to fix login, no success yet
Modified Paths:
--------------
trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java
trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java
trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java
Modified: trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java 2010-01-24 20:28:34 UTC (rev 18)
+++ trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java 2010-01-29 19:19:09 UTC (rev 19)
@@ -66,8 +66,6 @@
@Persist
private int loginAttempts;
- private WebSessionUser tmpUser;
-
@Inject
private Cookies cookies;
@@ -86,9 +84,9 @@
{
logger.debug( "login validate start user = " + userName );
loginAttempts++;
- tmpUser = authenticationService.doAuthenticate( userName, password );
- logger.debug( "login validate start res = " + tmpUser );
- if ( tmpUser == null )
+ webSessionUser = authenticationService.doAuthenticate( userName, password );
+ logger.debug( "login validate start res = " + webSessionUser );
+ if ( webSessionUser == null )
{
validationTracker
.recordError( messages.format( ChenilleKitAccessConstants.NOT_AUTHENTICATED_ERROR_MESSAGE, userName ) );
@@ -98,9 +96,8 @@
void onSuccess()
{
// @todo return page handling should be implicit
- if ( null != tmpUser ) resources.discardPersistentFieldChanges();
+ if ( null != webSessionUser ) resources.discardPersistentFieldChanges();
logger.debug( "login successful" );
- webSessionUser = tmpUser;
cookies.writeCookieValue( ChenilleKitAccessConstants.LOGIN_SUCCESSFUL_COOKIE_NAME, "OK", 300 );
}
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java 2010-01-24 20:28:34 UTC (rev 18)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java 2010-01-29 19:19:09 UTC (rev 19)
@@ -24,6 +24,7 @@
import org.chenillekit.access.ChenilleKitAccessConstants;
import org.chenillekit.access.services.AppServerLoginService;
import org.chenillekit.access.services.AuthenticationServiceFilter;
+import org.equanda.t5gui.services.LoginInfoService;
import org.slf4j.Logger;
import java.io.IOException;
@@ -63,23 +64,18 @@
public static void contributeMetaDataLocator( MappedConfiguration<String, String> configuration )
{
+ System.out.println( "Contributing metaDataLocator" );
configuration.add( MetaDataConstants.SECURE_PAGE, "true" );
}
/* Contributes AppServerLoginFilter which handles appserver login */
- public static void contributePageRenderRequestHandler( OrderedConfiguration<PageRenderRequestFilter> configuration,
- final AppServerLoginFilter accessFilter )
+ public static void contributeComponentRequestHandler( OrderedConfiguration<ComponentRequestFilter> configuration,
+ final AppServerLoginFilter accessFilter )
{
- configuration.add( "AppServerLogin", accessFilter, "after:AccessControl" );
+ System.out.println( "adding AppServerLogin filter" );
+ configuration.add( "AppServerLogin", accessFilter, "after:CookieRedirect" );
}
- /* Contributes AppServerLoginFilter which handles appserver login */
- public static void contributeComponentEventRequestHandler(
- OrderedConfiguration<ComponentEventRequestFilter> configuration,
- final AppServerLoginFilter accessFilter )
- {
- configuration.add( "AppServerLogin", accessFilter, "after:AccessControl" );
- }
/**
* Contribute application defaults
@@ -108,10 +104,10 @@
configuration.add( ChenilleKitAccessConstants.LOGIN_PAGE, "login" );
}
- public static void contributeAuthenticationService(
- OrderedConfiguration<AuthenticationServiceFilter> configuration )
+ public static void contributeAuthenticationService( OrderedConfiguration<AuthenticationServiceFilter> configuration,
+ LoginInfoService loginInfoService )
{
- configuration.add( "CA", new EquandaAuthService() );
+ configuration.add( "CA", new EquandaAuthService(loginInfoService) );
}
/**
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java 2010-01-24 20:28:34 UTC (rev 18)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java 2010-01-29 19:19:09 UTC (rev 19)
@@ -28,7 +28,7 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class AppServerLoginFilter
- implements ComponentEventRequestFilter, PageRenderRequestFilter
+ implements ComponentRequestFilter
{
private final ApplicationStateManager asoManager;
private final AppServerLoginService appServerLoginService;
@@ -40,22 +40,26 @@
this.appServerLoginService = appServerLoginService;
}
- public void handle( ComponentEventRequestParameters componentEventRequestParameters,
- ComponentEventRequestHandler componentEventRequestHandler )
+ public void handleComponentEvent( ComponentEventRequestParameters componentEventRequestParameters,
+ ComponentRequestHandler componentRequestHandler )
throws IOException
{
+ System.out.println( "AppServerLoginFilter.handle compo" );
WebSessionUser wsu = asoManager.getIfExists( EquandaWebSessionUser.class );
+ System.out.println( "webSessionUser=" + wsu );
if ( null != wsu ) appServerLoginService.appServerLogin( wsu );
- componentEventRequestHandler.handle( componentEventRequestParameters );
+ componentRequestHandler.handleComponentEvent( componentEventRequestParameters );
}
- public void handle( PageRenderRequestParameters pageRenderRequestParameters,
- PageRenderRequestHandler pageRenderRequestHandler )
+ public void handlePageRender( PageRenderRequestParameters pageRenderRequestParameters,
+ ComponentRequestHandler componentRequestHandler )
throws IOException
{
+ System.out.println( "AppServerLoginFilter.handle page" );
WebSessionUser wsu = asoManager.getIfExists( EquandaWebSessionUser.class );
+ System.out.println( "webSessionUser=" + wsu );
if ( null != wsu ) appServerLoginService.appServerLogin( wsu );
- pageRenderRequestHandler.handle( pageRenderRequestParameters );
+ componentRequestHandler.handlePageRender( pageRenderRequestParameters );
}
}
Modified: trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java 2010-01-24 20:28:34 UTC (rev 18)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java 2010-01-29 19:19:09 UTC (rev 19)
@@ -16,10 +16,12 @@
package org.skabacca.gui.services;
import org.apache.log4j.Logger;
+import org.apache.tapestry5.ioc.annotations.Inject;
import org.chenillekit.access.WebSessionUser;
import org.chenillekit.access.services.AuthenticationService;
import org.chenillekit.access.services.AuthenticationServiceFilter;
import org.equanda.client.LoginInfo;
+import org.equanda.t5gui.services.LoginInfoService;
import org.skabacca.gui.data.EquandaWebSessionUser;
import org.skabacca.login.LoginCache;
@@ -33,6 +35,13 @@
{
private static final Logger log = Logger.getLogger( EquandaAuthService.class );
+ private LoginInfoService loginInfoService;
+
+ public EquandaAuthService( LoginInfoService loginInfoService )
+ {
+ this.loginInfoService = loginInfoService;
+ }
+
public WebSessionUser doAuthenticate( String userName, String password,
AuthenticationService authenticationService )
{
@@ -51,6 +60,7 @@
log.debug( "authentication succeeded for " + userName + " guiAP=" +
loginInfo.isGuiAccessProhibited() );
}
+ loginInfoService.setLoginInfo( loginInfo );
return new EquandaWebSessionUser( loginInfo );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
