Add events for user login and signup (#181)

Co-authored-by: Luigi Marini <[email protected]>

Author: bodom0015

app/services/EventSinkService.scala

@@ -27,7 +27,7 @@ class EventSinkService {
   val userService: UserService = DI.injector.getInstance(classOf[UserService])
   val appConfig: AppConfigurationService = DI.injector.getInstance(classOf[AppConfigurationService])
 
-  // Fetch directly from config on demand
+  // UNUSED: Fetch directly from config on demand
   def getGoogleAnalytics(): String = Play.configuration.getString(EventSinkService.GA_CONFIG_KEY).getOrElse("")
   def getAmplitudeApiKey(): String = Play.configuration.getString(EventSinkService.AMPLITUDE_CONFIG_KEY).getOrElse("")
   def getMongoAuth(): String = Play.configuration.getString(EventSinkService.AMPLITUDE_CONFIG_KEY).getOrElse("")
@@ -51,14 +51,23 @@ class EventSinkService {
     messageService.submit(exchangeName, queueName, metadata, "fanout")
   }
 
-  // TODO: Call this when admin changes configuration via the UI
-  def syncAuthInfo() = {
-    Logger.info("Synchronizing event sink consumer auth")
-    logEvent("auth_sync", Json.obj(
-      "amplitude" -> getAmplitudeApiKey(),
-      "google_analytics" -> getGoogleAnalytics(),
-      "influx" -> getInfluxAuth(),
-      "mongo" -> getMongoAuth()
+  /** Log an event when user signs up */
+  def logUserSignupEvent(user: User) = {
+    Logger.info("New user signed up: " + user.id.stringify)
+    logEvent("user_activity", Json.obj(
+      "type" -> "signup",
+      "user_id" -> user.id,
+      "user_name" -> user.fullName
+    ))
+  }
+
+  /** Log an event when user logs in */
+  def logUserLoginEvent(user: User) = {
+    Logger.info("User logged in: " + user.id.stringify)
+    logEvent("user_activity", Json.obj(
+      "type" -> "login",
+      "user_id" -> user.id,
+      "user_name" -> user.fullName
     ))
   }
 

app/services/SecureSocialEventListener.scala

@@ -12,6 +12,7 @@ class SecureSocialEventListener(app: play.api.Application) extends EventListener
   override def id: String = "SecureSocialEventListener"
   lazy val userService: UserService = DI.injector.getInstance(classOf[UserService])
   lazy val spaceService: SpaceService = DI.injector.getInstance(classOf[SpaceService])
+  lazy val sinkService: EventSinkService = DI.injector.getInstance(classOf[EventSinkService])
   lazy val appConfig: AppConfigurationService = DI.injector.getInstance(classOf[AppConfigurationService])
 
   def onEvent(event: Event, request: RequestHeader, session: Session): Option[Session] = {
@@ -27,6 +28,7 @@ class SecureSocialEventListener(app: play.api.Application) extends EventListener
               case None => Logger.debug("No email found for user "+user.id.stringify)
             }
             userService.updateUserField(user.id, "lastLogin", new Date())
+            sinkService.logUserSignupEvent(user)
           }
           case None => {
             Logger.error(s"Could not find user ${event.user.fullName} in database")
@@ -47,6 +49,7 @@ class SecureSocialEventListener(app: play.api.Application) extends EventListener
               case None => Logger.debug("No email found for user "+user.id.stringify)
             }
             userService.updateUserField(user.id, "lastLogin", new Date())
+            sinkService.logUserLoginEvent(user)
           }
           case None => {
             Logger.error(s"Could not find user ${event.user.fullName} in database")