codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made determining TanProcedureType more robust; added PhotoTan

This commit is contained in:
dankito 2019-10-15 23:38:18 +02:00 committed by dankito
parent 62597274fc
commit c89960a3d8
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fints4javaLib/src/main/kotlin/net/dankito/fints/FinTsClient.kt
View File

@ -553,22 +553,32 @@ open class FinTsClient @JvmOverloads constructor(
} }
protected open fun mapToTanProcedure(parameters: TanProcedureParameters): TanProcedure? { protected open fun mapToTanProcedure(parameters: TanProcedureParameters): TanProcedure? {
val function = parameters.securityFunction
val procedureName = parameters.procedureName val procedureName = parameters.procedureName
val nameLowerCase = procedureName.toLowerCase()
// we filter out iTAN and Einschritt-Verfahren as they are not permitted anymore according to PSD2
if (procedureName.toLowerCase() == "itan") {
return null
}
return TanProcedure(procedureName, parameters.securityFunction,
mapToTanProcedureType(parameters) ?: TanProcedureType.EnterTan)
}
protected open fun mapToTanProcedureType(parameters: TanProcedureParameters): TanProcedureType? {
val nameLowerCase = parameters.procedureName.toLowerCase()
return when { return when {
nameLowerCase.contains("photo") -> TanProcedureType.PhotoTan
nameLowerCase.contains("chiptan") -> { nameLowerCase.contains("chiptan") -> {
if (nameLowerCase.contains("qr")) { return when {
TanProcedure(procedureName, function, TanProcedureType.ChipTanQrCode) nameLowerCase.contains("qr") -> TanProcedureType.ChipTanQrCode
} else -> TanProcedureType.ChipTan
else {
TanProcedure(procedureName, function, TanProcedureType.ChipTan)
} }
} }
nameLowerCase.contains("sms") -> TanProcedure(procedureName, function, TanProcedureType.SmsTan) nameLowerCase.contains("push") -> return TanProcedureType.PushTan
nameLowerCase.contains("push") -> TanProcedure(procedureName, function, TanProcedureType.PushTan) nameLowerCase.contains("sms") || nameLowerCase.contains("mobile") -> return TanProcedureType.SmsTan
// TODO: what about other tan procedures we're not aware of? // TODO: what about other tan procedures we're not aware of?
// we filter out iTAN and Einschritt-Verfahren as they are not permitted anymore according to PSD2 // we filter out iTAN and Einschritt-Verfahren as they are not permitted anymore according to PSD2

2
fints4javaLib/src/main/kotlin/net/dankito/fints/model/TanProcedureType.kt
View File

@ -9,6 +9,8 @@ enum class TanProcedureType {
ChipTanQrCode, ChipTanQrCode,
PhotoTan,
SmsTan, SmsTan,
PushTan PushTan