better error handling

api/src/main/scala/com/lbs/api/ApiBase.scala

@@ -42,10 +42,4 @@ trait ApiBase {
       .header(Authorization, session.accessToken)
     cookiesMaybe.map(cookies => req.cookies(cookies)).getOrElse(req.cookies(session.cookies))
   }
-
-  protected def httpNewApi(url: String, cookies: IndexedSeq[HttpCookie]): HttpRequest = {
-    ApiHttp(s"https://portalpacjenta.luxmed.pl/PatientPortal/$url")
-      .headers(CommonHeaders)
-      .cookies(cookies)
-  }
 }

api/src/main/scala/com/lbs/api/http/package.scala

@@ -21,7 +21,6 @@ package object http extends StrictLogging {
     val Host = "Host"
     val Origin = "Origin"
     val Accept = "Accept"
-    val Connection = "Connection"
     val `Accept-Encoding` = "Accept-Encoding"
     val `User-Agent` = "User-Agent"
     val `Custom-User-Agent` = "Custom-User-Agent"
@@ -80,11 +79,12 @@ package object http extends StrictLogging {
           Some(new InvalidLoginOrPasswordException)
         case _ if code >=  HttpURLConnection.HTTP_BAD_REQUEST =>
           Try(body.as[LuxmedErrorsList])
+            .orElse(Try(body.as[LuxmedErrorsMap]))
+            .orElse(Try(body.as[LuxmedError]))
             .map(error => luxmedErrorToApiException(code, error))
             .toOption
         case _ =>
           Try(body.as[LuxmedErrorsMap])
-            .orElse(Try(body.as[LuxmedError]))
             .map(error => luxmedErrorToApiException(code, error))
             .toOption
       }

api/src/main/scala/com/lbs/api/json/model/LuxmedError.scala

@@ -2,7 +2,6 @@ package com.lbs.api.json.model
 
 /**
  * {
-      "ErrorCode": 301,
       "Message": "Obecnie zainstalowana wersja aplikacji nie jest wspierana przez nowy system Portalu Pacjenta. Zaktualizuj aplikację do najnowszej wersji, aby móc z niej korzystać.",
       "AdditionalData": {
         "ShopUrl": "itms-apps://apps.apple.com/pl/app/id552592684",
@@ -11,4 +10,4 @@ package com.lbs.api.json.model
       }
     }
  */
-case class LuxmedError(errorCode: Int, message: String) extends SerializableJsonObject with LuxmedBaseError
+case class LuxmedError(message: String) extends SerializableJsonObject with LuxmedBaseError

api/src/main/scala/com/lbs/api/json/model/LuxmedErrorsList.scala

@@ -17,5 +17,5 @@ package com.lbs.api.json.model
  */
 
 case class LuxmedErrorsList(errors: List[LuxmedError]) extends SerializableJsonObject with LuxmedBaseError {
-  override def message: String = errors.map(e => s"ErrorCode: ${e.errorCode}. Message: ${e.message}").mkString("; ")
+  override def message: String = errors.map(e => s"Message: ${e.message}").mkString("; ")
 }