#1612 Fixed tests, removed unused dependency

AbsaOSS · Dec 18, 2020 · 8cb6521 · 8cb6521
1 parent 17b19e1
commit 8cb6521
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/dao/src/test/scala/za/co/absa/enceladus/dao/rest/auth/AuthClientSuite.scala b/dao/src/test/scala/za/co/absa/enceladus/dao/rest/auth/AuthClientSuite.scala
@@ -44,17 +44,17 @@ abstract class AuthClientSuite() extends AnyWordSpec
 
   s"Calling authenticate()" should {
     "return authentication headers on 200 OK" in {
-      val sessionCookie = "session-cookie"
+      val jwt = "jwt"
       val csrfToken = "csrf-token"
 
       val responseHeaders = new LinkedMultiValueMap[String, String]
-      responseHeaders.add("set-cookie", sessionCookie)
+      responseHeaders.add("jwt", jwt)
       responseHeaders.add("x-csrf-token", csrfToken)
 
       setUpSuccessfulAuthRequest(responseHeaders)
 
       val expected = new HttpHeaders()
-      expected.add("cookie", sessionCookie)
+      expected.add("jwt", jwt)
       expected.add("x-csrf-token", csrfToken)
 
       val response = authClient.authenticate()

diff --git a/menas-web/pom.xml b/menas-web/pom.xml
@@ -37,11 +37,6 @@
             <artifactId>scala-library</artifactId>
             <version>${scala.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.scala-lang.modules</groupId>
-            <artifactId>scala-xml_${scala.compat.version}</artifactId>
-            <version>${scala.xml.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

diff --git a/...a/za/co/absa/enceladus/menas/integration/controllers/AuthenticationIntegrationSuite.scala b/...a/za/co/absa/enceladus/menas/integration/controllers/AuthenticationIntegrationSuite.scala
@@ -38,7 +38,7 @@ class AuthenticationIntegrationSuite extends BaseRestApiTest {
   @Autowired
   val jwtFactory: JwtFactory = null
 
-  private val jwtRegex = "JWT=([^;]+);?.*".r
+  private val jwtRegex = "([^;]+);?.*".r
 
   "Username and password authentication" should {
     "handle multiple users login in concurrently" in {
@@ -50,7 +50,7 @@ class AuthenticationIntegrationSuite extends BaseRestApiTest {
 
       val results = Await.result(futures, awaitDuration)
       val usernames = results.map { headers =>
-        headers.get("cookie").get(0) match {
+        headers.get("jwt").get(0) match {
           case jwtRegex(jwt) =>
             jwtFactory.jwtParser()
               .parseClaimsJws(jwt)

diff --git a/...s/src/test/scala/za/co/absa/enceladus/menas/integration/controllers/BaseRestApiTest.scala b/...s/src/test/scala/za/co/absa/enceladus/menas/integration/controllers/BaseRestApiTest.scala
@@ -70,10 +70,10 @@ abstract class BaseRestApiTest extends BaseRepositoryTest {
 
     val response = restTemplate.postForEntity(loginUrl, HttpEntity.EMPTY, classOf[String])
 
-    val cookie = response.getHeaders.get("set-cookie").get(0)
+    val jwtToken = response.getHeaders.get("jwt").get(0)
     val csrfToken = response.getHeaders.get("X-CSRF-TOKEN").get(0)
     val headers = new HttpHeaders()
-    headers.add("cookie", cookie)
+    headers.add("jwt", jwtToken)
     headers.add("X-CSRF-TOKEN", csrfToken)
     headers
   }