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

Differentiate between createSignedMessage() and createMessage()

This commit is contained in:
dankl 2019-10-06 14:18:25 +02:00 committed by dankito
parent 5fc2c2ef5b
commit 37f73f54b5
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fints4javaLib/src/main/kotlin/net/dankito/fints/messages/MessageBuilder.kt
View File

@ -42,7 +42,7 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
val customer = CustomerData.Anonymous val customer = CustomerData.Anonymous
return createMessage(false, false, bank, customer, dialogData, listOf( return createMessage(bank, customer, dialogData, listOf(
IdentifikationsSegment(generator.resetSegmentNumber(1), bank, customer), IdentifikationsSegment(generator.resetSegmentNumber(1), bank, customer),
Verarbeitungsvorbereitung(generator.getNextSegmentNumber(), bank, customer, product) Verarbeitungsvorbereitung(generator.getNextSegmentNumber(), bank, customer, product)
)) ))
@ -52,7 +52,7 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
val customer = CustomerData.Anonymous val customer = CustomerData.Anonymous
return createMessage(false, false, bank, customer, dialogData, listOf( return createMessage(bank, customer, dialogData, listOf(
Dialogende(generator.resetSegmentNumber(1), dialogData) Dialogende(generator.resetSegmentNumber(1), dialogData)
)) ))
} }
@ -60,7 +60,7 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
open fun createInitDialogMessage(bank: BankData, customer: CustomerData, product: ProductData, dialogData: DialogData): String { open fun createInitDialogMessage(bank: BankData, customer: CustomerData, product: ProductData, dialogData: DialogData): String {
return createMessage(true, true, bank, customer, dialogData, listOf( return createSignedMessage(bank, customer, dialogData, listOf(
IdentifikationsSegment(generator.resetSegmentNumber(2), bank, customer), IdentifikationsSegment(generator.resetSegmentNumber(2), bank, customer),
Verarbeitungsvorbereitung(generator.getNextSegmentNumber(), bank, customer, product), Verarbeitungsvorbereitung(generator.getNextSegmentNumber(), bank, customer, product),
ZweiSchrittTanEinreichung(generator.getNextSegmentNumber(), TanProcess.TanProcess4, CustomerSegmentId.Identification.id) ZweiSchrittTanEinreichung(generator.getNextSegmentNumber(), TanProcess.TanProcess4, CustomerSegmentId.Identification.id)
@ -69,38 +69,39 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
open fun createSynchronizeCustomerSystemIdMessage(bank: BankData, customer: CustomerData, product: ProductData, dialogData: DialogData): String { open fun createSynchronizeCustomerSystemIdMessage(bank: BankData, customer: CustomerData, product: ProductData, dialogData: DialogData): String {
return createMessage(true, true, bank, customer, dialogData, listOf( return createSignedMessage(bank, customer, dialogData, listOf(
IdentifikationsSegment(generator.resetSegmentNumber(2), bank, customer), IdentifikationsSegment(generator.resetSegmentNumber(2), bank, customer),
Verarbeitungsvorbereitung(generator.getNextSegmentNumber(), bank, customer, product), Verarbeitungsvorbereitung(generator.getNextSegmentNumber(), bank, customer, product),
Synchronisierung(generator.getNextSegmentNumber(), Synchronisierungsmodus.NeueKundensystemIdZurueckmelden), ZweiSchrittTanEinreichung(generator.getNextSegmentNumber(), TanProcess.TanProcess4, CustomerSegmentId.Identification.id),
ZweiSchrittTanEinreichung(generator.getNextSegmentNumber(), TanProcess.TanProcess4, CustomerSegmentId.Identification.id) Synchronisierung(generator.getNextSegmentNumber(), Synchronisierungsmodus.NeueKundensystemIdZurueckmelden)
)) ))
} }
open fun createDialogEndMessage(bank: BankData, customer: CustomerData, dialogData: DialogData): String { open fun createDialogEndMessage(bank: BankData, customer: CustomerData, dialogData: DialogData): String {
return createMessage(true, true, bank, customer, dialogData, listOf( return createSignedMessage(bank, customer, dialogData, listOf(
Dialogende(generator.resetSegmentNumber(2), dialogData) Dialogende(generator.resetSegmentNumber(2), dialogData)
)) ))
} }
open fun createMessage(signMessage: Boolean, encryptMessage: Boolean, bank: BankData, customer: CustomerData, open fun createSignedMessage(bank: BankData, customer: CustomerData, dialogData: DialogData,
dialogData: DialogData, payloadSegments: List<Segment>): String { payloadSegments: List<Segment>): String {
var payload = payloadSegments
val date = utils.formatDateTodayAsInt() val date = utils.formatDateTodayAsInt()
val time = utils.formatTimeNowAsInt() val time = utils.formatTimeNowAsInt()
if (signMessage) { val signedPayload = signPayload(2, bank, customer, date, time, payloadSegments)
payload = signPayload(2, bank, customer, date, time, payload)
val encryptedPayload = encryptPayload(bank, customer, date, time, signedPayload)
return createMessage(bank, customer, dialogData, encryptedPayload)
} }
if (encryptMessage) { open fun createMessage(bank: BankData, customer: CustomerData, dialogData: DialogData,
payload = encryptPayload(bank, customer, date, time, payload) payloadSegments: List<Segment>): String {
}
val formattedPayload = formatPayload(payload) val formattedPayload = formatPayload(payloadSegments)
val messageSize = formattedPayload.length + MessageHeaderLength + MessageEndingLength + AddedSeparatorsLength val messageSize = formattedPayload.length + MessageHeaderLength + MessageEndingLength + AddedSeparatorsLength