#1712 Add a vuu server ID to login success message

Author: tanjjj

example/main-java/src/main/java/org/finos/vuu/VuuExampleMain.java

@@ -25,18 +25,18 @@
 import org.finos.vuu.state.VuiStateStore;
 import scala.Option;
 
+import java.util.UUID;
+
 /**
  * Example Java App using Vuu.
  *
  */
-public class VuuExampleMain
-{
+public class VuuExampleMain {
     /*
         //to allow self signed certs
         chrome://flags/#allow-insecure-localhost
     */
-    public static void main( String[] args )
-    {
+    public static void main(String[] args) {
         final MetricsProvider metrics = new MetricsProviderImpl();
         final Clock clock = new DefaultClock();
         final LifecycleContainer lifecycle = new LifecycleContainer(clock);
@@ -46,8 +46,9 @@ public static void main( String[] args )
 
         lifecycle.autoShutdownHook();
 
+        final String vuuServerId = UUID.randomUUID().toString();
         final Authenticator authenticator = new AlwaysHappyAuthenticator();
-        final LoggedInTokenValidator loginTokenValidator = new LoggedInTokenValidator();
+        final LoggedInTokenValidator loginTokenValidator = new LoggedInTokenValidator(vuuServerId);
 
         final String webRoot = "vuu-ui/deployed_apps/app-vuu-example";
         final String certPath = "example/main/src/main/resources/certs/cert.pem";
@@ -65,7 +66,7 @@ public static void main( String[] args )
                         .withBindAddress("0.0.0.0"),
                 VuuSecurityOptions.apply()
                         .withAuthenticator(authenticator)
-                        .withLoginValidator(new AlwaysHappyLoginValidator()),
+                        .withLoginValidator(new AlwaysHappyLoginValidator(vuuServerId)),
                 VuuThreadingOptions.apply()
                         .withTreeThreads(4)
                         .withViewPortThreads(4),

vuu/src/main/scala/org/finos/vuu/core/VuuServerOptions.scala

@@ -8,7 +8,7 @@ import org.finos.vuu.plugin.Plugin
 
 object VuuSecurityOptions{
   def apply(): VuuSecurityOptions = {
-    VuuSecurityOptionsImpl(new AlwaysHappyAuthenticator, new AlwaysHappyLoginValidator)
+    VuuSecurityOptionsImpl(new AlwaysHappyAuthenticator, new AlwaysHappyLoginValidator("vuuServer"))
   }
 }
 

vuu/src/main/scala/org/finos/vuu/net/LoginTokenValidator.scala

@@ -3,32 +3,32 @@ package org.finos.vuu.net
 import java.util.concurrent.{ConcurrentHashMap, ConcurrentMap}
 
 trait LoginTokenValidator {
-  def login(msg: LoginRequest): Either[ViewServerMessage, String]
+  def login(msg: LoginRequest): ViewServerMessage
 }
 
-class AlwaysHappyLoginValidator extends LoginTokenValidator {
+class AlwaysHappyLoginValidator(val vuuServerId: String = "vuuServer") extends LoginTokenValidator {
 
-  override def login(msg: LoginRequest): Either[ViewServerMessage, String] = {
-    Left(JsonViewServerMessage("", "", msg.token, msg.user, LoginSuccess(msg.token)))
+  override def login(msg: LoginRequest): ViewServerMessage = {
+    JsonViewServerMessage("", "", msg.token, msg.user, LoginSuccess(msg.token, vuuServerId))
   }
 }
 
-class ServerUserPrincipal(val token: String, val userName: String){
+class ServerUserPrincipal(val token: String, val userName: String) {
 }
 
-class LoggedInTokenValidator extends LoginTokenValidator {
+class LoggedInTokenValidator(val vuuServerId: String = "vuuServer") extends LoginTokenValidator {
 
   private val tokenUserMap: ConcurrentMap[String, ServerUserPrincipal] = new ConcurrentHashMap[String, ServerUserPrincipal]()
 
   def register(token: String, userPrincipal: ServerUserPrincipal): Unit = {
     tokenUserMap.put(token, userPrincipal)
   }
 
-  override def login(msg: LoginRequest): Either[ViewServerMessage, String] = {
-    if(tokenUserMap.containsKey(msg.token)){
-      Left(JsonViewServerMessage("", "", msg.token, msg.user, LoginSuccess(msg.token)))
-    }else{
-      Right("User token not found")
+  override def login(msg: LoginRequest): ViewServerMessage = {
+    if (tokenUserMap.containsKey(msg.token)) {
+      JsonViewServerMessage("", "", msg.token, msg.user, LoginSuccess(msg.token, vuuServerId))
+    } else {
+      JsonViewServerMessage("", "", msg.token, msg.user, LoginFailure(msg.token, "User token not found"))
     }
   }
 }

vuu/src/main/scala/org/finos/vuu/net/Messages.scala

@@ -48,7 +48,7 @@ case class AuthenticateFailure(msg: String) extends MessageBody
 
 case class LoginRequest(token: String, user: String) extends MessageBody
 
-case class LoginSuccess(token: String) extends MessageBody
+case class LoginSuccess(token: String, vuuServerId: String) extends MessageBody
 
 case class LoginFailure(token: String, errorMsg: String) extends MessageBody
 

vuu/src/main/scala/org/finos/vuu/net/RequestProcessor.scala

@@ -29,23 +29,27 @@ class RequestProcessor(authenticator: Authenticator,
 
   def handle(msg: ViewServerMessage, channel: Channel): Option[ViewServerMessage] = {
 
-
     msg.body match {
       case body: AuthenticateRequest =>
         authenticator.authenticate(body.username, body.password)
       case body: LoginRequest =>
-        tokenValidator.login(body) match {
-          case Left(accept) =>
-            createSession(msg.requestId, body, clientSessionContainer, channel)
-          case Right(errorMsg) =>
-            handleMessageWithNoSession(errorMsg, channel)
+        tokenValidator.login(body).body match {
+          case success: LoginSuccess =>
+            createSession(msg.requestId, body, clientSessionContainer, channel, success.vuuServerId)
+          case failure: LoginFailure =>
+            handleMessageWithNoSession(failure.errorMsg, channel)
             None
         }
       case body => handleViewServerMessage(msg, channel)
     }
   }
 
-  protected def createSession(requestId: String, request: LoginRequest, clientSessionContainer: ClientSessionContainer, channel: Channel): Option[ViewServerMessage] = {
+  protected def createSession(
+                               requestId: String,
+                               request: LoginRequest,
+                               clientSessionContainer: ClientSessionContainer,
+                               channel: Channel,
+                               vuuServerId: String): Option[ViewServerMessage] = {
 
     val session = SessionId.oneNew()
     val user = request.user
@@ -58,7 +62,7 @@ class RequestProcessor(authenticator: Authenticator,
 
     clientSessionContainer.register(id, handler)
 
-    Some(JsonViewServerMessage(requestId, session, request.token, request.user, LoginSuccess(request.token)))
+    Some(JsonViewServerMessage(requestId, session, request.token, request.user, LoginSuccess(request.token, vuuServerId)))
   }
 
 

vuu/src/test/scala/org/finos/vuu/json/JsonVsSerializerTest.scala

@@ -64,7 +64,7 @@ class JsonVsSerializerTest extends AnyFeatureSpec with Matchers{
       roundTrip(AuthenticateRequest("chris", "foobar"))
       roundTrip(AuthenticateSuccess("christoken"))
       roundTrip(LoginRequest("AAA11122233", "chris"))
-      roundTrip(LoginSuccess("AAA11122233"))
+      roundTrip(LoginSuccess("AAA11122233", "vuuServerId"))
       roundTrip(HeartBeat(123l))
       roundTrip(HeartBeatResponse(123l))
       roundTrip(RpcUpdate(ViewPortTable("orderEntry", "CORE"), "Foo", Map("Foo" -> 123, "Bar" -> true, "Whizzle" -> "TANG", "HooHa" -> 344567l)))