From 3c687e93efbcb0d01187e6f383a518cdc0e2ed5b Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Tue, 1 Jul 2014 15:12:12 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    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
---
 .../web-scripts-application-context.xml       |  2 ++
 .../web/scripts/bean/AbstractLoginBean.java   | 24 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index 45de68804a..0b76195beb 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -428,10 +428,12 @@
    <!--  Authentication APIs -->
    <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="eventPublisher" ref="eventPublisher" />
    </bean>
    
    <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="eventPublisher" ref="eventPublisher" />
    </bean>
    
    <bean id="webscript.org.alfresco.repository.loginticket.get" class="org.alfresco.repo.web.scripts.bean.LoginTicket" parent="webscript">
diff --git a/source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java b/source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java
index b797cdf6e9..4cbb96e206 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java
@@ -18,11 +18,16 @@
  */
 package org.alfresco.repo.web.scripts.bean;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 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.AuthenticationUtil;
 import org.alfresco.service.cmr.security.AuthenticationService;
@@ -39,6 +44,7 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
 {
     // dependencies
     private AuthenticationService authenticationService;
+    protected EventPublisher eventPublisher;
     
     /**
      * @param authenticationService
@@ -48,6 +54,13 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
         this.authenticationService = authenticationService;
     }
 
+    /**
+     * @param eventPublisher
+     */
+    public void setEventPublisher(EventPublisher eventPublisher)
+    {
+        this.eventPublisher = eventPublisher;
+    }
     
     /* (non-Javadoc)
      * @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;
     }
     
-    protected Map<String, Object> login(String username, String password)
+    protected Map<String, Object> login(final String username, String password)
     {
         try
         {
             // get ticket
             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
             Map<String, Object> model = new HashMap<String, Object>(7, 1.0f);
             model.put("username", username);
@@ -82,4 +103,5 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
         }
     }
 
+
 }
\ No newline at end of file