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

Added tanExpirationTime to TanChallenge

This commit is contained in:
dankito 2024-09-08 22:40:05 +02:00
parent 0848586894
commit c4f504dd0a
5 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/FinTsJobExecutor.kt
View File

@ -388,7 +388,7 @@ open class FinTsJobExecutor(
delay(500) delay(500)
// most TANs a valid 5 - 15 minutes. So terminate wait process after that time // most TANs a valid 5 - 15 minutes. So terminate wait process after that time
if (Instant.nowExt() > tanChallenge.timestamp.plusMinutes(15)) { if (Instant.nowExt() > tanChallenge.challengeCreationTimestamp.plusMinutes(15)) {
if (tanChallenge.isEnteringTanDone == false) { if (tanChallenge.isEnteringTanDone == false) {
tanChallenge.userDidNotEnterTan() tanChallenge.userDidNotEnterTan()
} }
@ -412,13 +412,13 @@ open class FinTsJobExecutor(
TanMethodType.ChipTanFlickercode -> TanMethodType.ChipTanFlickercode ->
FlickerCodeTanChallenge( FlickerCodeTanChallenge(
FlickerCodeDecoder().decodeChallenge(challenge, tanMethod.hhdVersion ?: HHDVersion.HHD_1_4), // HHD 1.4 is currently the most used version FlickerCodeDecoder().decodeChallenge(challenge, tanMethod.hhdVersion ?: HHDVersion.HHD_1_4), // HHD 1.4 is currently the most used version
forAction, messageToShowToUser, challenge, tanMethod, tanResponse.tanMediaIdentifier, bank, account) forAction, messageToShowToUser, challenge, tanMethod, tanResponse.tanMediaIdentifier, bank, account, tanResponse.tanExpirationTime)
TanMethodType.ChipTanQrCode, TanMethodType.ChipTanPhotoTanMatrixCode, TanMethodType.ChipTanQrCode, TanMethodType.ChipTanPhotoTanMatrixCode,
TanMethodType.QrCode, TanMethodType.photoTan -> TanMethodType.QrCode, TanMethodType.photoTan ->
ImageTanChallenge(TanImageDecoder().decodeChallenge(challenge), forAction, messageToShowToUser, challenge, tanMethod, tanResponse.tanMediaIdentifier, bank, account) ImageTanChallenge(TanImageDecoder().decodeChallenge(challenge), forAction, messageToShowToUser, challenge, tanMethod, tanResponse.tanMediaIdentifier, bank, account, tanResponse.tanExpirationTime)
else -> TanChallenge(forAction, messageToShowToUser, challenge, tanMethod, tanResponse.tanMediaIdentifier, bank, account) else -> TanChallenge(forAction, messageToShowToUser, challenge, tanMethod, tanResponse.tanMediaIdentifier, bank, account, tanResponse.tanExpirationTime)
} }
} }

6
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/model/FlickerCodeTanChallenge.kt
View File

@ -1,5 +1,6 @@
package net.codinux.banking.fints.model package net.codinux.banking.fints.model
import kotlinx.datetime.LocalDateTime
import net.codinux.banking.fints.tan.FlickerCode import net.codinux.banking.fints.tan.FlickerCode
@ -11,8 +12,9 @@ open class FlickerCodeTanChallenge(
tanMethod: TanMethod, tanMethod: TanMethod,
tanMediaIdentifier: String?, tanMediaIdentifier: String?,
bank: BankData, bank: BankData,
account: AccountData? = null account: AccountData? = null,
) : TanChallenge(forAction, messageToShowToUser, challenge, tanMethod, tanMediaIdentifier, bank, account) { tanExpirationTime: LocalDateTime? = null
) : TanChallenge(forAction, messageToShowToUser, challenge, tanMethod, tanMediaIdentifier, bank, account, tanExpirationTime) {
override fun toString(): String { override fun toString(): String {
return "$tanMethod (medium: $tanMediaIdentifier) $flickerCode: $messageToShowToUser" return "$tanMethod (medium: $tanMediaIdentifier) $flickerCode: $messageToShowToUser"

6
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/model/ImageTanChallenge.kt
View File

@ -1,5 +1,6 @@
package net.codinux.banking.fints.model package net.codinux.banking.fints.model
import kotlinx.datetime.LocalDateTime
import net.codinux.banking.fints.tan.TanImage import net.codinux.banking.fints.tan.TanImage
@ -11,8 +12,9 @@ open class ImageTanChallenge(
tanMethod: TanMethod, tanMethod: TanMethod,
tanMediaIdentifier: String?, tanMediaIdentifier: String?,
bank: BankData, bank: BankData,
account: AccountData? = null account: AccountData? = null,
) : TanChallenge(forAction, messageToShowToUser, challenge, tanMethod, tanMediaIdentifier, bank, account) { tanExpirationTime: LocalDateTime? = null
) : TanChallenge(forAction, messageToShowToUser, challenge, tanMethod, tanMediaIdentifier, bank, account, tanExpirationTime) {
override fun toString(): String { override fun toString(): String {
return "$tanMethod (medium: $tanMediaIdentifier) $image: $messageToShowToUser" return "$tanMethod (medium: $tanMediaIdentifier) $image: $messageToShowToUser"

7
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/model/TanChallenge.kt
View File

@ -1,6 +1,7 @@
package net.codinux.banking.fints.model package net.codinux.banking.fints.model
import kotlinx.datetime.Instant import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDateTime
import net.codinux.banking.fints.extensions.nowExt import net.codinux.banking.fints.extensions.nowExt
import net.codinux.banking.fints.messages.datenelemente.implementierte.tan.TanMedium import net.codinux.banking.fints.messages.datenelemente.implementierte.tan.TanMedium
import net.codinux.banking.fints.response.BankResponse import net.codinux.banking.fints.response.BankResponse
@ -15,6 +16,12 @@ open class TanChallenge(
val tanMediaIdentifier: String?, val tanMediaIdentifier: String?,
val bank: BankData, val bank: BankData,
val account: AccountData? = null, val account: AccountData? = null,
/**
* Datum und Uhrzeit, bis zu welchem Zeitpunkt eine TAN auf Basis der gesendeten Challenge gültig ist. Nach Ablauf der Gültigkeitsdauer wird die entsprechende TAN entwertet.
*
* In server's time zone, that is Europe/Berlin.
*/
val tanExpirationTime: LocalDateTime? = null,
val challengeCreationTimestamp: Instant = Instant.nowExt() val challengeCreationTimestamp: Instant = Instant.nowExt()
) { ) {

8
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/response/segments/TanResponse.kt
View File

@ -31,7 +31,13 @@ open class TanResponse(
val challenge: String?, // M: bei TAN-Prozess=1, 3, 4. O: bei TAN-Prozess=2 val challenge: String?, // M: bei TAN-Prozess=1, 3, 4. O: bei TAN-Prozess=2
val challengeHHD_UC: String?, val challengeHHD_UC: String?,
val validityDateTimeForChallenge: LocalDateTime?,
/**
* Datum und Uhrzeit, bis zu welchem Zeitpunkt eine TAN auf Basis der gesendeten Challenge gültig ist. Nach Ablauf der Gültigkeitsdauer wird die entsprechende TAN entwertet.
*
* In server's time zone, that is Europe/Berlin.
*/
val tanExpirationTime: LocalDateTime?,
val tanMediaIdentifier: String? = null, // M: bei TAN-Prozess=1, 3, 4 und „Anzahl unterstützter aktiver TAN-Medien“ nicht vorhanden. O: sonst val tanMediaIdentifier: String? = null, // M: bei TAN-Prozess=1, 3, 4 und „Anzahl unterstützter aktiver TAN-Medien“ nicht vorhanden. O: sonst
segmentString: String segmentString: String