diff --git a/FinTs4jBankingClient/build.gradle.kts b/FinTs4jBankingClient/build.gradle.kts index bc7af90a..4fb972e7 100644 --- a/FinTs4jBankingClient/build.gradle.kts +++ b/FinTs4jBankingClient/build.gradle.kts @@ -9,11 +9,6 @@ plugins { } -repositories { - mavenLocal() -} - - kotlin { jvmToolchain(8) @@ -81,7 +76,7 @@ kotlin { dependencies { api(project(":BankingClient")) - api("net.codinux.banking:fints4k:1.0.0-Alpha-11") + api("net.codinux.banking:fints4k:1.0.0-Alpha-12-SNAPSHOT") api("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDateTimeVersion") } diff --git a/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/BridgeFintTsToBankingClientCallback.kt b/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/BridgeFintTsToBankingClientCallback.kt index 014226a6..397da3f9 100644 --- a/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/BridgeFintTsToBankingClientCallback.kt +++ b/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/BridgeFintTsToBankingClientCallback.kt @@ -1,11 +1,12 @@ package net.codinux.banking.client.fints4k import net.codinux.banking.client.BankingClientCallback -import net.dankito.banking.fints.callback.FinTsClientCallback -import net.dankito.banking.fints.messages.datenelemente.implementierte.tan.TanGeneratorTanMedium -import net.dankito.banking.fints.model.BankData -import net.dankito.banking.fints.model.EnterTanGeneratorAtcResult -import net.dankito.banking.fints.model.TanMethod +import net.codinux.banking.fints.callback.FinTsClientCallback +import net.codinux.banking.fints.messages.datenelemente.implementierte.tan.TanGeneratorTanMedium +import net.codinux.banking.fints.model.BankData +import net.codinux.banking.fints.model.EnterTanGeneratorAtcResult +import net.codinux.banking.fints.model.MessageLogEntry +import net.codinux.banking.fints.model.TanMethod open class BridgeFintTsToBankingClientCallback( protected val bankingClientCallback: BankingClientCallback, @@ -16,7 +17,7 @@ open class BridgeFintTsToBankingClientCallback( return suggestedTanMethod } - override suspend fun enterTan(tanChallenge: net.dankito.banking.fints.model.TanChallenge) { + override suspend fun enterTan(tanChallenge: net.codinux.banking.fints.model.TanChallenge) { bankingClientCallback.enterTan(mapper.mapTanChallenge(tanChallenge)) { enterTanResult -> if (enterTanResult.enteredTan != null) { tanChallenge.userEnteredTan(enterTanResult.enteredTan!!) @@ -29,4 +30,8 @@ open class BridgeFintTsToBankingClientCallback( override suspend fun enterTanGeneratorAtc(bank: BankData, tanMedium: TanGeneratorTanMedium): EnterTanGeneratorAtcResult { return EnterTanGeneratorAtcResult.userDidNotEnterAtc() } + + override fun messageLogAdded(messageLogEntry: MessageLogEntry) { + + } } \ No newline at end of file diff --git a/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kBankingClient.kt b/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kBankingClient.kt index c9c1b350..10bb9328 100644 --- a/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kBankingClient.kt +++ b/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kBankingClient.kt @@ -6,7 +6,7 @@ import net.codinux.banking.client.model.options.GetAccountDataOptions import net.codinux.banking.client.model.request.GetAccountDataRequest import net.codinux.banking.client.model.response.GetAccountDataResponse import net.codinux.banking.client.model.response.Response -import net.dankito.banking.fints.FinTsClient +import net.codinux.banking.fints.FinTsClient open class FinTs4kBankingClient( callback: BankingClientCallback diff --git a/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kMapper.kt b/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kMapper.kt index f1922704..58995c4a 100644 --- a/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kMapper.kt +++ b/FinTs4jBankingClient/src/commonMain/kotlin/net/codinux/banking/client/fints4k/FinTs4kMapper.kt @@ -15,8 +15,8 @@ import net.dankito.banking.client.model.BankAccountIdentifierImpl import net.dankito.banking.client.model.parameter.GetAccountDataParameter import net.dankito.banking.client.model.parameter.RetrieveTransactions import net.dankito.banking.client.model.response.ErrorCode -import net.dankito.banking.fints.mapper.FinTsModelMapper -import net.dankito.banking.fints.model.* +import net.codinux.banking.fints.mapper.FinTsModelMapper +import net.codinux.banking.fints.model.* import kotlin.io.encoding.Base64 import kotlin.io.encoding.ExperimentalEncodingApi @@ -105,7 +105,7 @@ open class FinTs4kMapper { private fun mapAmount(amount: Money) = Amount.fromString(amount.amount.string.replace(',', '.')) - fun mapTanChallenge(challenge: net.dankito.banking.fints.model.TanChallenge): TanChallenge { + fun mapTanChallenge(challenge: net.codinux.banking.fints.model.TanChallenge): TanChallenge { val type = mapTanChallengeType(challenge) val action = mapActionRequiringTan(challenge.forAction) val tanMethod = mapTanMethod(challenge.tanMethod) @@ -118,26 +118,26 @@ open class FinTs4kMapper { return TanChallenge(type, action, challenge.messageToShowToUser, tanMethod, tanImage, flickerCode, customer, account) } - private fun mapTanChallengeType(challenge: net.dankito.banking.fints.model.TanChallenge): TanChallengeType = when { + private fun mapTanChallengeType(challenge: net.codinux.banking.fints.model.TanChallenge): TanChallengeType = when { challenge is ImageTanChallenge -> TanChallengeType.Image challenge is FlickerCodeTanChallenge -> TanChallengeType.Flickercode else -> TanChallengeType.EnterTan } - private fun mapActionRequiringTan(action: net.dankito.banking.fints.model.ActionRequiringTan): ActionRequiringTan = + private fun mapActionRequiringTan(action: net.codinux.banking.fints.model.ActionRequiringTan): ActionRequiringTan = ActionRequiringTan.valueOf(action.name) - private fun mapTanMethod(method: net.dankito.banking.fints.model.TanMethod): TanMethod = TanMethod( + private fun mapTanMethod(method: net.codinux.banking.fints.model.TanMethod): TanMethod = TanMethod( method.displayName, mapTanMethodType(method.type), method.securityFunction.code, method.maxTanInputLength, mapAllowedTanFormat(method.allowedTanFormat) ) - private fun mapTanMethodType(type: net.dankito.banking.fints.model.TanMethodType): TanMethodType = + private fun mapTanMethodType(type: net.codinux.banking.fints.model.TanMethodType): TanMethodType = TanMethodType.valueOf(type.name) - private fun mapAllowedTanFormat(allowedTanFormat: net.dankito.banking.fints.messages.datenelemente.implementierte.tan.AllowedTanFormat?): AllowedTanFormat = + private fun mapAllowedTanFormat(allowedTanFormat: net.codinux.banking.fints.messages.datenelemente.implementierte.tan.AllowedTanFormat?): AllowedTanFormat = allowedTanFormat?.let { AllowedTanFormat.valueOf(it.name) } ?: AllowedTanFormat.Alphanumeric - private fun mapTanImage(image: net.dankito.banking.fints.tan.TanImage): TanImage = + private fun mapTanImage(image: net.codinux.banking.fints.tan.TanImage): TanImage = TanImage(image.mimeType, mapToBase64(image.imageBytes), mapException(image.decodingError)) @OptIn(ExperimentalEncodingApi::class) @@ -145,7 +145,7 @@ open class FinTs4kMapper { return Base64.Default.encode(bytes) } - private fun mapFlickerCode(flickerCode: net.dankito.banking.fints.tan.FlickerCode): FlickerCode = + private fun mapFlickerCode(flickerCode: net.codinux.banking.fints.tan.FlickerCode): FlickerCode = FlickerCode(flickerCode.challengeHHD_UC, flickerCode.parsedDataSet, mapException(flickerCode.decodingError)) diff --git a/build.gradle.kts b/build.gradle.kts index 794f4b26..89013294 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,6 +16,7 @@ allprojects { repositories { mavenCentral() + mavenLocal() maven { setUrl("https://maven.dankito.net/api/packages/codinux/maven") }