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

Implemented that if a TAN procedure requires specifying TAN media name, that any tan media name gets supplied (in my tests it made absolutely no difference if the TAN media matches the TAN procedure)

This commit is contained in:
dankito 2020-08-12 15:08:54 +02:00
parent 4cbbbfbe48
commit 989bbd65aa
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fints4k/src/commonMain/kotlin/net/dankito/banking/fints/FinTsClient.kt
View File

@ -1137,7 +1137,8 @@ open class FinTsClient(
}
return TanProcedure(procedureName, parameters.securityFunction,
mapToTanProcedureType(parameters) ?: TanProcedureType.EnterTan, mapHhdVersion(parameters))
mapToTanProcedureType(parameters) ?: TanProcedureType.EnterTan, mapHhdVersion(parameters),
parameters.nameOfTanMediaRequired == BezeichnungDesTanMediumsErforderlich.BezeichnungDesTanMediumsMussAngegebenWerden)
}
protected open fun mapToTanProcedureType(parameters: TanProcedureParameters): TanProcedureType? {

33
fints4k/src/commonMain/kotlin/net/dankito/banking/fints/messages/MessageBuilder.kt
View File

@ -115,10 +115,10 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
)
if (segmentIdForTwoStepTanProcess != null) {
segments.add(ZweiSchrittTanEinreichung(generator.getNextSegmentNumber(), TanProcess.TanProcess4, segmentIdForTwoStepTanProcess))
segments.add(createTwoStepTanSegment(segmentIdForTwoStepTanProcess, dialogContext))
}
else if (dialogContext.customer.isTanProcedureSelected) {
segments.add(ZweiSchrittTanEinreichung(generator.getNextSegmentNumber(), TanProcess.TanProcess4, CustomerSegmentId.Identification))
segments.add(createTwoStepTanSegment(CustomerSegmentId.Identification, dialogContext))
}
if (dialogContext.customer.customerSystemId == KundensystemID.Anonymous) {
@ -133,7 +133,7 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
return createSignedMessageBuilderResult(dialogContext, listOf(
IdentifikationsSegment(generator.resetSegmentNumber(2), dialogContext),
Verarbeitungsvorbereitung(generator.getNextSegmentNumber(), dialogContext),
ZweiSchrittTanEinreichung(generator.getNextSegmentNumber(), TanProcess.TanProcess4, CustomerSegmentId.Identification),
createTwoStepTanSegment(CustomerSegmentId.Identification, dialogContext),
Synchronisierung(generator.getNextSegmentNumber(), Synchronisierungsmodus.NeueKundensystemIdZurueckmelden)
))
}
@ -407,7 +407,7 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
}
private fun encryptPayload(dialogContext: DialogContext, date: Int, time: Int,
protected open fun encryptPayload(dialogContext: DialogContext, date: Int, time: Int,
payload: List<Segment>): List<Segment> {
val encryptionHeader = PinTanVerschluesselungskopf(dialogContext, date, time)
@ -460,11 +460,24 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
protected open fun addTanSegmentIfRequired(segmentId: CustomerSegmentId, dialogContext: DialogContext, segments: MutableList<Segment>) {
if (isTanRequiredForJob(segmentId, dialogContext)) {
segments.add(ZweiSchrittTanEinreichung(
generator.getNextSegmentNumber(), TanProcess.TanProcess4, segmentId))
segments.add(createTwoStepTanSegment(segmentId, dialogContext))
}
}
protected open fun createTwoStepTanSegment(segmentId: CustomerSegmentId, dialogContext: DialogContext): ZweiSchrittTanEinreichung {
return ZweiSchrittTanEinreichung(generator.getNextSegmentNumber(), TanProcess.TanProcess4, segmentId, tanMediaIdentifier = getTanMediaIdentifierIfRequired(dialogContext))
}
protected open fun getTanMediaIdentifierIfRequired(dialogContext: DialogContext): String? {
val customer = dialogContext.customer
if (customer.isTanProcedureSelected && customer.selectedTanProcedure.nameOfTanMediaRequired) {
return customer.tanMedia.firstOrNull { it.mediumName != null }?.mediumName
}
return null
}
protected open fun isTanRequiredForJob(segmentId: CustomerSegmentId, dialogContext: DialogContext): Boolean {
return dialogContext.bank.pinInfo?.jobTanConfiguration?.first { it.segmentId == segmentId.id }?.tanRequired
?: false // TODO: actually in this case it's not allowed to execute job via PIN/TAN at all
@ -479,14 +492,6 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
.firstOrNull { it.contains(sepaDataFormat) }
}
// TODO: this implementation is in most cases wrong, try to get rid of
protected open fun getAllowedJobs(segmentId: CustomerSegmentId, customer: CustomerData): List<JobParameters> {
return customer.accounts.flatMap { account ->
return account.allowedJobs.filter { it.jobName == segmentId.id }
}
}
// TODO: move to a library
fun <T> Collection<T>.containsAny(otherCollection: Collection<T>): Boolean {

3
fints4k/src/commonMain/kotlin/net/dankito/banking/fints/model/TanProcedure.kt
View File

@ -7,7 +7,8 @@ open class TanProcedure(
val displayName: String,
val securityFunction: Sicherheitsfunktion,
val type: TanProcedureType,
val hhdVersion: HHDVersion? = null
val hhdVersion: HHDVersion? = null,
val nameOfTanMediaRequired: Boolean = false
) {