inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
75046: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71977: Raise an event for logins: ACE-1709


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-07-01 15:12:12 +00:00
parent 91ca9dbe23
commit 3c687e93ef
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/web-scripts-application-context.xml
View File

@@ -428,10 +428,12 @@
<!-- Authentication APIs --> <!-- Authentication APIs -->
<bean id="webscript.org.alfresco.repository.login.get" class="org.alfresco.repo.web.scripts.bean.Login" parent="webscript"> <bean id="webscript.org.alfresco.repository.login.get" class="org.alfresco.repo.web.scripts.bean.Login" parent="webscript">
<property name="authenticationService" ref="AuthenticationService" /> <property name="authenticationService" ref="AuthenticationService" />
<property name="eventPublisher" ref="eventPublisher" />
</bean> </bean>
<bean id="webscript.org.alfresco.repository.login.post" class="org.alfresco.repo.web.scripts.bean.LoginPost" parent="webscript"> <bean id="webscript.org.alfresco.repository.login.post" class="org.alfresco.repo.web.scripts.bean.LoginPost" parent="webscript">
<property name="authenticationService" ref="AuthenticationService" /> <property name="authenticationService" ref="AuthenticationService" />
<property name="eventPublisher" ref="eventPublisher" />
</bean> </bean>
<bean id="webscript.org.alfresco.repository.loginticket.get" class="org.alfresco.repo.web.scripts.bean.LoginTicket" parent="webscript"> <bean id="webscript.org.alfresco.repository.loginticket.get" class="org.alfresco.repo.web.scripts.bean.LoginTicket" parent="webscript">

24
source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java
View File

@@ -18,11 +18,16 @@
*/ */
package org.alfresco.repo.web.scripts.bean; package org.alfresco.repo.web.scripts.bean;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.alfresco.events.types.Event;
import org.alfresco.events.types.RepositoryEventImpl;
import org.alfresco.repo.events.EventPreparator;
import org.alfresco.repo.events.EventPublisher;
import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.repo.security.authentication.AuthenticationException;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
@@ -39,6 +44,7 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
{ {
// dependencies // dependencies
private AuthenticationService authenticationService; private AuthenticationService authenticationService;
protected EventPublisher eventPublisher;
/** /**
* @param authenticationService * @param authenticationService
@@ -48,6 +54,13 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
this.authenticationService = authenticationService; this.authenticationService = authenticationService;
} }
/**
* @param eventPublisher
*/
public void setEventPublisher(EventPublisher eventPublisher)
{
this.eventPublisher = eventPublisher;
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse) * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
@@ -58,13 +71,21 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
return null; return null;
} }
protected Map<String, Object> login(String username, String password) protected Map<String, Object> login(final String username, String password)
{ {
try try
{ {
// get ticket // get ticket
authenticationService.authenticate(username, password.toCharArray()); authenticationService.authenticate(username, password.toCharArray());
eventPublisher.publishEvent(new EventPreparator(){
@Override
public Event prepareEvent(String user, String networkId, String transactionId)
{
return new RepositoryEventImpl("login", transactionId, networkId, new Date().getTime(), username);
}
});
// add ticket to model for javascript and template access // add ticket to model for javascript and template access
Map<String, Object> model = new HashMap<String, Object>(7, 1.0f); Map<String, Object> model = new HashMap<String, Object>(7, 1.0f);
model.put("username", username); model.put("username", username);
@@ -82,4 +103,5 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
} }
} }
} }