Merge remote-tracking branch 'origin/develop' into feature/userAuth

Author: janniclas

app/authorization/AuthProvider.scala

@@ -20,7 +20,8 @@ import pdi.jwt.{Jwt, JwtAlgorithm, JwtClaim}
 import play.api.Configuration
 
   object AuthProvider {
-    var token = ""
+
+    var Token = "" // scalastyle:ignore
 
     /** This method generates JWT token for registering Delphi-Management at the Instance-Registry
       *
@@ -30,16 +31,16 @@ import play.api.Configuration
 
     def generateJwt(validFor: Long = 1)(implicit configuration: Configuration): String = {
       val jwtSecretKey = configuration.get[String]("play.http.secret.JWTkey")
-      if (token == "" || !Jwt.isValid(token, jwtSecretKey, Seq(JwtAlgorithm.HS256))) {
+      if (Token == "" || !Jwt.isValid(Token, jwtSecretKey, Seq(JwtAlgorithm.HS256))) {
         val claim = JwtClaim()
           .issuedNow
           .expiresIn(validFor * 300)
           .startsNow
           . +("user_id",  configuration.get[String]("play.http.instance"))
           . +("user_type", "Admin")
 
-        token = Jwt.encode(claim, jwtSecretKey, JwtAlgorithm.HS256)
+        Token = Jwt.encode(claim, jwtSecretKey, JwtAlgorithm.HS256)
       }
-      token
+      Token
     }
   }

app/controllers/ApiRouter.scala

@@ -43,6 +43,6 @@ class ApiRouter @Inject()(irController: InstanceRegistryController, sysControlle
     case POST(p"/pauseInstance" ? q"instanceID=$instanceID") => irController.handleRequest(action="/pause", instanceID)
     case POST(p"/resumeInstance" ? q"instanceID=$instanceID") => irController.handleRequest(action="/resume", instanceID)
     case POST(p"/deleteInstance" ? q"instanceID=$instanceID") => irController.handleRequest(action="/delete", instanceID)
-
+    case POST(p"/reconnectInstance" ? q"from=$from"& q"to=$to") => irController.reconnect(from.toInt, to.toInt)
   }
 }

app/controllers/InstanceRegistryController.scala

@@ -151,6 +151,21 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
       }(myExecutionContext)
   }
 
+  def reconnect(from: Int, to: Int): Action[AnyContent] = Action.async { request =>
+
+    ws.url(instanceRegistryUri + "/instances/" + from + "/assignInstance"
+    )
+      .withHttpHeaders(("Authorization", s"Bearer ${AuthProvider.generateJwt()}"))
+      .post(Json.obj("AssignedInstanceId" -> to))
+      .map { response =>
+        response.status match {
+          case 200 =>
+            Ok(response.body)
+          case x =>
+            new Status(x)
+        }
+      }(myExecutionContext)
+  }
   /**
     * This function is for handling an POST request for adding an instance to the Scala web server
     * (E.g. .../instances/deploy
@@ -190,4 +205,4 @@ class InstanceRegistryController @Inject()(implicit system: ActorSystem, mat: Ma
         }
       }
   }
-}
+}