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

Implemented calling getTanMediaList() only if retrieving TAN media is supported

This commit is contained in:
dankito 2020-10-04 21:07:51 +02:00
parent 63ec9e074a
commit 24dfe34c1f
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import net.dankito.banking.fints.messages.datenelemente.implementierte.signatur.
import net.dankito.banking.fints.messages.datenelemente.implementierte.signatur.VersionDesSicherheitsverfahrens import net.dankito.banking.fints.messages.datenelemente.implementierte.signatur.VersionDesSicherheitsverfahrens
import net.dankito.banking.fints.messages.datenelemente.implementierte.tan.* import net.dankito.banking.fints.messages.datenelemente.implementierte.tan.*
import net.dankito.banking.fints.messages.segmente.id.CustomerSegmentId import net.dankito.banking.fints.messages.segmente.id.CustomerSegmentId
import net.dankito.banking.fints.messages.segmente.id.ISegmentId
import net.dankito.banking.fints.model.* import net.dankito.banking.fints.model.*
import net.dankito.banking.fints.response.InstituteSegmentId import net.dankito.banking.fints.response.InstituteSegmentId
import net.dankito.banking.fints.response.BankResponse import net.dankito.banking.fints.response.BankResponse
@ -271,27 +272,37 @@ open class FinTsClient(
/* Second dialog: some banks require that in order to initialize a dialog with strong customer authorization TAN media is required */ /* Second dialog: some banks require that in order to initialize a dialog with strong customer authorization TAN media is required */
getTanMediaList(bank, TanMedienArtVersion.Alle, TanMediumKlasse.AlleMedien) { if (isJobSupported(bank, CustomerSegmentId.TanMediaList)) {
getTanMediaList(bank, TanMedienArtVersion.Alle, TanMediumKlasse.AlleMedien) {
/* Third dialog: Now we can initialize our first dialog with strong customer authorization. Use it to get UPD and customer's accounts */ addAccountGetAccountsAndTransactions(parameter, bank, didOverwriteUserUnselectedTanMethod, callback)
getAccounts(bank) { getAccountsResponse ->
if (getAccountsResponse.successful == false) {
callback(AddAccountResponse(getAccountsResponse, bank))
return@getAccounts
}
/* Fourth dialog (if requested): Try to retrieve account balances and transactions of last 90 days without TAN */
if (parameter.fetchBalanceAndTransactions) {
addAccountGetAccountBalancesAndTransactions(bank, getAccountsResponse, didOverwriteUserUnselectedTanMethod, callback)
}
else {
addAccountDone(bank, getAccountsResponse, didOverwriteUserUnselectedTanMethod, mapOf(), callback)
}
} }
} }
else {
addAccountGetAccountsAndTransactions(parameter, bank, didOverwriteUserUnselectedTanMethod, callback)
}
}
}
protected open fun addAccountGetAccountsAndTransactions(parameter: AddAccountParameter, bank: BankData, didOverwriteUserUnselectedTanMethod: Boolean,
callback: (AddAccountResponse) -> Unit) {
/* Third dialog: Now we can initialize our first dialog with strong customer authorization. Use it to get UPD and customer's accounts */
getAccounts(bank) { getAccountsResponse ->
if (getAccountsResponse.successful == false) {
callback(AddAccountResponse(getAccountsResponse, bank))
return@getAccounts
}
/* Fourth dialog (if requested): Try to retrieve account balances and transactions of last 90 days without TAN */
if (parameter.fetchBalanceAndTransactions) {
addAccountGetAccountBalancesAndTransactions(bank, getAccountsResponse, didOverwriteUserUnselectedTanMethod, callback)
}
else {
addAccountDone(bank, getAccountsResponse, didOverwriteUserUnselectedTanMethod, mapOf(), callback)
}
} }
} }
@ -1239,6 +1250,10 @@ open class FinTsClient(
} }
protected open fun isJobSupported(bank: BankData, segmentId: ISegmentId): Boolean {
return bank.supportedJobs.map { it.jobName }.contains(segmentId.id)
}
protected open fun isJobSupported(account: AccountData, supportedJob: JobParameters): Boolean { protected open fun isJobSupported(account: AccountData, supportedJob: JobParameters): Boolean {
for (allowedJobName in account.allowedJobNames) { for (allowedJobName in account.allowedJobNames) {
if (allowedJobName == supportedJob.jobName) { if (allowedJobName == supportedJob.jobName) {