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

Added tanMediaIdentifier to TanChallenge; added toString()

This commit is contained in:
dankl 2020-01-02 13:57:50 +01:00 committed by dankito
parent 110fc59756
commit a589fc89e2
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -607,9 +607,7 @@ open class FinTsClient @JvmOverloads constructor(
protected open fun handleMayRequiredTan(response: Response, bank: BankData, customer: CustomerData, dialogData: DialogData): Response { protected open fun handleMayRequiredTan(response: Response, bank: BankData, customer: CustomerData, dialogData: DialogData): Response {
if (response.isStrongAuthenticationRequired) { if (response.isStrongAuthenticationRequired) {
response.tanResponse?.let { tanResponse -> response.tanResponse?.let { tanResponse ->
// TODO: is this true for all tan procedures? val enteredTanResult = callback.enterTan(customer, createTanChallenge(tanResponse, customer))
val enteredTanResult = callback.enterTan(customer, TanChallenge(tanResponse.challenge ?: "",
tanResponse.challengeHHD_UC ?: "", customer.selectedTanProcedure))
if (enteredTanResult.changeTanProcedureTo != null) { if (enteredTanResult.changeTanProcedureTo != null) {
return handleUserAsksToChangeTanProcedureAndResendLastMessage(enteredTanResult.changeTanProcedureTo, return handleUserAsksToChangeTanProcedureAndResendLastMessage(enteredTanResult.changeTanProcedureTo,
@ -640,6 +638,15 @@ open class FinTsClient @JvmOverloads constructor(
return response return response
} }
protected open fun createTanChallenge(tanResponse: TanResponse, customer: CustomerData): TanChallenge {
// TODO: is this true for all tan procedures?
val messageToShowToUser = tanResponse.challenge ?: ""
val challenge = tanResponse.challengeHHD_UC ?: ""
val tanProcedure = customer.selectedTanProcedure
return TanChallenge(messageToShowToUser, challenge, tanProcedure, tanResponse.tanMediaIdentifier)
}
protected open fun sendTanToBank(enteredTan: String, tanResponse: TanResponse, bank: BankData, protected open fun sendTanToBank(enteredTan: String, tanResponse: TanResponse, bank: BankData,
customer: CustomerData, dialogData: DialogData): Response { customer: CustomerData, dialogData: DialogData): Response {

13
fints4javaLib/src/main/kotlin/net/dankito/fints/model/TanChallenge.kt
View File

@ -3,6 +3,13 @@ package net.dankito.fints.model
open class TanChallenge( open class TanChallenge(
val messageToShowToUser: String, val messageToShowToUser: String,
val tanChallenge: String, val challenge: String,
val tanProcedure: TanProcedure val tanProcedure: TanProcedure,
) val tanMediaIdentifier: String?
) {
override fun toString(): String {
return "$tanProcedure (medium: $tanMediaIdentifier): $messageToShowToUser"
}
}