[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libeufin] branch master updated (a05943bd -> 60684afd)
|
From: |
gnunet |
|
Subject: |
[libeufin] branch master updated (a05943bd -> 60684afd) |
|
Date: |
Wed, 07 Jun 2023 17:04:02 +0200 |
This is an automated email from the git hooks/post-receive script.
ms pushed a change to branch master
in repository libeufin.
from a05943bd convenience scripts
new 939840d0 Fixing tests.
new 60684afd Tests.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nexus/src/test/kotlin/Iso20022Test.kt | 24 +--
nexus/src/test/kotlin/MakeEnv.kt | 181 ---------------------
.../src/main/kotlin/tech/libeufin/sandbox/Main.kt | 57 ++-----
3 files changed, 18 insertions(+), 244 deletions(-)
diff --git a/nexus/src/test/kotlin/Iso20022Test.kt
b/nexus/src/test/kotlin/Iso20022Test.kt
index 2827abf6..848e162a 100644
--- a/nexus/src/test/kotlin/Iso20022Test.kt
+++ b/nexus/src/test/kotlin/Iso20022Test.kt
@@ -1,6 +1,7 @@
package tech.libeufin.nexus
import CamtBankAccountEntry
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import io.ktor.client.plugins.*
import io.ktor.client.request.*
import io.ktor.http.*
import io.ktor.server.testing.*
@@ -8,7 +9,6 @@ import org.jetbrains.exposed.sql.transactions.transaction
import org.junit.Ignore
import org.junit.Test
import org.w3c.dom.Document
-import poFiCamt052
import poFiCamt054_2019_incoming
import poFiCamt054_2019_outgoing
import prepNexusDb
@@ -204,26 +204,4 @@ class Iso20022Test {
val doc = XMLUtil.parseStringIntoDom(pain001)
assert(XMLUtil.validateFromDom(doc))
}
-
- @Test
- fun parsePostFinanceCamt052() {
- withTestDatabase {
- prepNexusDb()
- // Adjusting the MakeEnv.kt values to PoFi
- val fooBankAccount = getBankAccount("foo")
- val fooConnection = getBankConnection("foo")
- transaction {
- fooBankAccount.iban = "CH9789144829733648596"
- fooConnection.dialect = "pf"
- }
- testApplication {
- application(nexusApp)
- client.post("/bank-accounts/foo/test-camt-ingestion/C52") {
- basicAuth("foo", "foo")
- contentType(ContentType.Application.Xml)
- setBody(poFiCamt052)
- }
- }
- }
- }
}
diff --git a/nexus/src/test/kotlin/MakeEnv.kt b/nexus/src/test/kotlin/MakeEnv.kt
index 76d88a85..be8102a7 100644
--- a/nexus/src/test/kotlin/MakeEnv.kt
+++ b/nexus/src/test/kotlin/MakeEnv.kt
@@ -757,185 +757,4 @@ val poFiCamt054_2019_incoming: String = """
</Ntfctn>
</BkToCstmrDbtCdtNtfctn>
</Document>
-""".trimIndent()
-
-val poFiCamt054_2013: String = """
- <?xml version="1.0" encoding="UTF-8"?>
- <Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.054.001.04"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:camt.054.001.04
camt.054.001.04.xsd">
- <BkToCstmrDbtCdtNtfctn>
- <GrpHdr>
- <MsgId>286494ADFK/132157/448798</MsgId>
- <CreDtTm>2023-05-10T13:21:57</CreDtTm>
- <MsgPgntn>
- <PgNb>1</PgNb>
- <LastPgInd>true</LastPgInd>
- </MsgPgntn>
- <AddtlInf>SPS/1.7/TEST</AddtlInf>
- </GrpHdr>
- <Ntfctn>
- <Id>286494ADFK/132157/448798</Id>
- <CreDtTm>2023-05-10T13:21:57</CreDtTm>
- <RptgSrc>
- <Prtry>OTHR</Prtry>
- </RptgSrc>
- <Acct>
- <Id>
- <IBAN>${FOO_USER_IBAN}</IBAN>
- </Id>
- </Acct>
- <Ntry>
- <Amt Ccy="CHF">5.00</Amt>
- <CdtDbtInd>DBIT</CdtDbtInd>
- <Sts>BOOK</Sts>
- <BookgDt>
- <Dt>2023-05-10</Dt>
- </BookgDt>
- <ValDt>
- <Dt>2023-05-10</Dt>
- </ValDt>
- <BkTxCd>
- <Domn>
- <Cd>PMNT</Cd>
- <Fmly>
- <Cd>ICDT</Cd>
- <SubFmlyCd>AUTT</SubFmlyCd>
- </Fmly>
- </Domn>
- </BkTxCd>
- <NtryDtls>
- <TxDtls>
- <Refs>
- <MsgId>478b-9e7e-2a16b35ed69c</MsgId>
- <PmtInfId>4f4-b65d-8aae7a2ded2f</PmtInfId>
- <InstrId>InstructionId</InstrId>
- <EndToEndId>4c3d-a74b-71cfbdaf901f</EndToEndId>
- </Refs>
- <Amt Ccy="CHF">5.00</Amt>
- <CdtDbtInd>DBIT</CdtDbtInd>
- <BkTxCd>
- <Domn>
- <Cd>PMNT</Cd>
- <Fmly>
- <Cd>ICDT</Cd>
- <SubFmlyCd>BOOK</SubFmlyCd>
- </Fmly>
- </Domn>
- </BkTxCd>
- <RltdPties>
- <DbtrAcct>
- <Id>
- <IBAN>CH0889144371988976754</IBAN>
- </Id>
- </DbtrAcct>
- <Cdtr>
- <Nm>Sample Creditor Name</Nm>
- </Cdtr>
- <CdtrAcct>
- <Id>
- <IBAN>CH9789144829733648596</IBAN>
- </Id>
- </CdtrAcct>
- </RltdPties>
- <RmtInf>
- <Ustrd>Unstructured remittance information</Ustrd>
- </RmtInf>
- </TxDtls>
- </NtryDtls>
- </Ntry>
- </Ntfctn>
- </BkToCstmrDbtCdtNtfctn>
- </Document>
-""".trimIndent()
-
-val poFiCamt052: String = """
- <?xml version="1.0"?>
- <Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.052.001.04"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:camt.052.001.04
camt.052.001.04.xsd">
- <BkToCstmrAcctRpt>
- <GrpHdr>
- <MsgId>2827403ADFJ/110409/997113</MsgId>
- <CreDtTm>2023-05-09T11:04:09</CreDtTm>
- <MsgPgntn>
- <PgNb>1</PgNb>
- <LastPgInd>true</LastPgInd>
- </MsgPgntn>
- <AddtlInf>SPS/1.7/TEST</AddtlInf>
- </GrpHdr>
- <Rpt>
- <Id>2827403ADFJ/110409/997113</Id>
- <ElctrncSeqNb>129</ElctrncSeqNb>
- <CreDtTm>2023-05-09T11:04:09</CreDtTm>
- <FrToDt>
- <FrDtTm>2023-05-09T00:00:00</FrDtTm>
- <ToDtTm>2023-05-09T10:00:00</ToDtTm>
- </FrToDt>
- <Acct>
- <Id>
- <IBAN>CH9789144829733648596</IBAN>
- </Id>
- <Ownr>
- <Nm>LibEuFin</Nm>
- </Ownr>
- </Acct>
- <Bal>
- <Tp>
- <CdOrPrtry>
- <Cd>OPBD</Cd>
- </CdOrPrtry>
- </Tp>
- <Amt Ccy="CHF">500000.00</Amt>
- <CdtDbtInd>CRDT</CdtDbtInd>
- <Dt>
- <Dt>2023-05-09</Dt>
- </Dt>
- </Bal>
- <Bal>
- <Tp>
- <CdOrPrtry>
- <Cd>CLBD</Cd>
- </CdOrPrtry>
- </Tp>
- <Amt Ccy="CHF">499998.00</Amt>
- <CdtDbtInd>CRDT</CdtDbtInd>
- <Dt>
- <Dt>2023-05-09</Dt>
- </Dt>
- </Bal>
- <Ntry>
- <Amt Ccy="CHF">2.00</Amt>
- <CdtDbtInd>DBIT</CdtDbtInd>
- <RvslInd>false</RvslInd>
- <Sts>BOOK</Sts>
- <BookgDt>
- <Dt>2023-05-09</Dt>
- </BookgDt>
- <ValDt>
- <Dt>2023-05-09</Dt>
- </ValDt>
- <BkTxCd>
- <Domn>
- <Cd>PMNT</Cd>
- <Fmly>
- <Cd>ICDT</Cd>
- <SubFmlyCd>AUTT</SubFmlyCd>
- </Fmly>
- </Domn>
- </BkTxCd>
- <NtryDtls>
- <TxDtls>
- <Refs>
- <MsgId>leuf-mp1-187ffc0f021-1-1</MsgId>
- <AcctSvcrRef>032663184998070600000003</AcctSvcrRef>
- <PmtInfId>Zufall</PmtInfId>
- <InstrId>leuf-i-187ffc0f021-1-1</InstrId>
- <EndToEndId>leuf-e-187ffc0f021-1-1</EndToEndId>
- </Refs>
- <Amt Ccy="CHF">2.00</Amt>
- <CdtDbtInd>DBIT</CdtDbtInd>
- </TxDtls>
- </NtryDtls>
- <AddtlNtryInf>EZAG ISO 20022 SAMMELAUFTRAG E-FINANCE Zufall
leuf-mp1-187ffc0f021-1-1</AddtlNtryInf>
- </Ntry>
- </Rpt>
- </BkToCstmrAcctRpt>
- </Document>
""".trimIndent()
\ No newline at end of file
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
index dfb20ffc..1f16da78 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
@@ -852,48 +852,25 @@ val sandboxApp: Application.() -> Unit = {
post("/admin/ebics/bank-accounts") {
call.request.basicAuth(onlyAdmin = true)
val body = call.receive<EbicsBankAccountRequest>()
- if (!validateBic(body.bic)) {
- throw SandboxError(HttpStatusCode.BadRequest, "invalid BIC
(${body.bic})")
- }
- transaction {
- val subscriber = getEbicsSubscriberFromDetails(
- body.subscriber.userID,
- body.subscriber.partnerID,
- body.subscriber.hostID
- )
- if (subscriber.bankAccount != null)
- throw conflict("subscriber has already a bank account:
${subscriber.bankAccount?.label}")
- val demobank = getDefaultDemobank()
- // Forbid institutional names for bank account.
- if (body.label == "admin" || body.label == "bank") throw
forbidden(
- "Requested bank account label '${body.label}' not allowed."
- )
+ val subscriber = getEbicsSubscriberFromDetails(
+ body.subscriber.userID,
+ body.subscriber.partnerID,
+ body.subscriber.hostID
+ )
+ val res = insertNewAccount(
+ username = body.label,
/**
- * Checking that the default demobank doesn't have already the
- * requested IBAN and bank account label.
+ * This value makes only happy the account creator helper.
+ * Logic using this OBSOLETE HTTP handler would NOT expect
+ * to use this password anyway. The reason is that such
obsolete
+ * tests access their banking data always through the EBICS
+ * subscriber, needing therefore no HTTP basic password to
operate.
*/
- val check = BankAccountEntity.find {
- BankAccountsTable.iban eq body.iban or (
- (BankAccountsTable.label eq body.label) and (
- BankAccountsTable.demoBank eq demobank.id
- )
- )
- }.count()
- if (check > 0) throw SandboxError(
- HttpStatusCode.BadRequest,
- "Either IBAN or account label were already taken; please
choose fresh ones"
- )
- subscriber.bankAccount = BankAccountEntity.new {
- iban = body.iban
- bic = body.bic
- label = body.label
- /* Current version invariant:
- owner's username == bank account label. */
- owner = body.label
- demoBank = demobank
- }
- }
- call.respondText("Bank account created")
+ password = "not-used",
+ iban = body.iban
+ )
+ transaction { subscriber.bankAccount = res.bankAccount }
+ call.respond({})
return@post
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libeufin] branch master updated (a05943bd -> 60684afd),
gnunet <=