artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 14:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/Enhance error handling in case of Direct Login

Browse Source
This commit is contained in:
Marko Milić 2023-03-15 10:47:04 +01:00
parent fe22713956
commit a77d7ed508
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
obp-api/src/main/scala/code/api/directlogin.scala
View File

@ -264,11 +264,11 @@ object DirectLogin extends RestHelper with MdcLoggable {
if (header.contains("DirectLogin"))
toMap(header)
else
Map("error" -> "header incorrect")
Map("error" -> ErrorMessages.InvalidDirectLoginHeader)
}
case _ => Map("error" -> "missing header")
case _ => Map("error" -> ErrorMessages.MissingDirectLoginHeader)
}
case _ => Map("error" -> "request incorrect")
case _ => Map("error" -> ErrorMessages.MissingDirectLoginHeader)
}
}
@ -380,7 +380,11 @@ object DirectLogin extends RestHelper with MdcLoggable {
for {
valid <- validF
} yield {
if (missingParams.nonEmpty) {
if (parameters.get("error").isDefined) {
message = parameters.get("error").getOrElse("")
httpCode = 400
}
else if (missingParams.nonEmpty) {
message = ErrorMessages.DirectLoginMissingParameters + missingParams.mkString(", ")
httpCode = 400
}

3
obp-api/src/main/scala/code/api/util/ErrorMessages.scala
View File

@ -199,7 +199,8 @@ object ErrorMessages {
val InvalidAuthorizationHeader = "OBP-20080: Authorization Header format is not supported at this instance."
val UserAttributeNotFound = "OBP-20081: User Attribute not found by USER_ATTRIBUTE_ID."
val MissingDirectLoginHeader = "OBP-20082: Missing DirectLogin or Authorization header."
val InvalidDirectLoginHeader = "OBP-20083: Missing DirectLogin word at the value of Authorization header."
val UserNotSuperAdminOrMissRole = "OBP-20101: Current User is not super admin or is missing entitlements:"
val CannotGetOrCreateUser = "OBP-20102: Cannot get or create user."

4
obp-api/src/test/scala/code/api/DirectLoginTest.scala
View File

@ -132,7 +132,7 @@ class DirectLoginTest extends ServerSetup with BeforeAndAfter {
Then("We should get a 400 - Bad Request")
response.code should equal(400)
assertResponse(response, ErrorMessages.DirectLoginMissingParameters)
assertResponse(response, ErrorMessages.MissingDirectLoginHeader)
}
scenario("Invalid credentials") {
@ -212,7 +212,7 @@ class DirectLoginTest extends ServerSetup with BeforeAndAfter {
Then("We should get a 400 - Bad Request")
response.code should equal(400)
assertResponse(response, ErrorMessages.DirectLoginMissingParameters)
assertResponse(response, ErrorMessages.MissingDirectLoginHeader)
}
scenario("Login without consumer key") {