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

Refactored handling TAN required methods

This commit is contained in:
dankito 2020-07-21 00:33:00 +02:00
parent d18e939818
commit 2889d1b0ce
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -752,31 +752,13 @@ open class FinTsClient(
callback(response) callback(response)
return return
} }
else if (response.tanResponse != null) {
response.tanResponse?.let { tanResponse -> response.tanResponse?.let { tanResponse ->
val customer = dialogContext.customer handleEnteringTanRequired(tanResponse, response, dialogContext, callback)
val enteredTanResult = this.callback.enterTan(customer, createTanChallenge(tanResponse, customer)) }
if (enteredTanResult.changeTanProcedureTo != null) {
handleUserAsksToChangeTanProcedureAndResendLastMessage(enteredTanResult.changeTanProcedureTo,
dialogContext, callback)
return return
} }
else if (enteredTanResult.changeTanMediumTo is TanGeneratorTanMedium) {
handleUserAsksToChangeTanMediumAndResendLastMessage(enteredTanResult.changeTanMediumTo,
dialogContext, enteredTanResult.changeTanMediumResultCallback, callback)
return
}
else if (enteredTanResult.enteredTan == null) {
// i tried to send a HKTAN with cancelJob = true but then i saw there are no tan procedures that support cancellation (at least not at my bank)
// but it's not required anyway, tan times out after some time. Simply don't respond anything and close dialog
response.tanRequiredButUserDidNotEnterOne = true
}
else {
sendTanToBank(enteredTanResult.enteredTan, tanResponse, dialogContext, callback)
return
}
}
} }
// TODO: check if response contains '3931 TAN-Generator gesperrt, Synchronisierung erforderlich' or // TODO: check if response contains '3931 TAN-Generator gesperrt, Synchronisierung erforderlich' or
@ -789,6 +771,15 @@ open class FinTsClient(
callback(response) callback(response)
} }
protected open fun handleEnteringTanRequired(tanResponse: TanResponse, response: Response, dialogContext: DialogContext, callback: (Response) -> Unit) {
val customer = dialogContext.customer // TODO: copy required data to TanChallenge
val tanChallenge = createTanChallenge(tanResponse, customer)
val enteredTanResult = this.callback.enterTan(customer, tanChallenge) // TODO: add callback to be more flexible in regard to thread handling
handleEnterTanResult(enteredTanResult, tanResponse, response, dialogContext, callback)
}
protected open fun createTanChallenge(tanResponse: TanResponse, customer: CustomerData): TanChallenge { protected open fun createTanChallenge(tanResponse: TanResponse, customer: CustomerData): TanChallenge {
// TODO: is this true for all tan procedures? // TODO: is this true for all tan procedures?
val messageToShowToUser = tanResponse.challenge ?: "" val messageToShowToUser = tanResponse.challenge ?: ""
@ -808,6 +799,28 @@ open class FinTsClient(
} }
} }
protected open fun handleEnterTanResult(enteredTanResult: EnterTanResult, tanResponse: TanResponse, response: Response,
dialogContext: DialogContext, callback: (Response) -> Unit) {
if (enteredTanResult.changeTanProcedureTo != null) {
handleUserAsksToChangeTanProcedureAndResendLastMessage(enteredTanResult.changeTanProcedureTo, dialogContext, callback)
}
else if (enteredTanResult.changeTanMediumTo is TanGeneratorTanMedium) {
handleUserAsksToChangeTanMediumAndResendLastMessage(enteredTanResult.changeTanMediumTo, dialogContext,
enteredTanResult.changeTanMediumResultCallback, callback)
}
else if (enteredTanResult.enteredTan == null) {
// i tried to send a HKTAN with cancelJob = true but then i saw there are no tan procedures that support cancellation (at least not at my bank)
// but it's not required anyway, tan times out after some time. Simply don't respond anything and close dialog
response.tanRequiredButUserDidNotEnterOne = true
callback(response)
}
else {
sendTanToBank(enteredTanResult.enteredTan, tanResponse, dialogContext, callback)
}
}
protected open fun sendTanToBank(enteredTan: String, tanResponse: TanResponse, dialogContext: DialogContext, callback: (Response) -> Unit) { protected open fun sendTanToBank(enteredTan: String, tanResponse: TanResponse, dialogContext: DialogContext, callback: (Response) -> Unit) {
val message = messageBuilder.createSendEnteredTanMessage(enteredTan, tanResponse, dialogContext) val message = messageBuilder.createSendEnteredTanMessage(enteredTan, tanResponse, dialogContext)