[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libeufin] 02/08: new API.
From: |
gnunet |
Subject: |
[libeufin] 02/08: new API. |
Date: |
Fri, 08 May 2020 20:04:46 +0200 |
This is an automated email from the git hooks/post-receive script.
ms pushed a commit to branch master
in repository libeufin.
commit 6aaa8b6aeac30c428443d68f3e17d5e331d45fa0
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri May 8 17:25:11 2020 +0200
new API.
Re- include Main2 into compilation.
---
nexus/build.gradle | 2 +-
nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt | 2 +-
nexus/src/main/kotlin/tech/libeufin/nexus/Main2.kt | 12 +++++++-----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/nexus/build.gradle b/nexus/build.gradle
index 6c31a96..f0cea46 100644
--- a/nexus/build.gradle
+++ b/nexus/build.gradle
@@ -16,7 +16,7 @@ plugins {
sourceSets {
main.kotlin.srcDirs = ["src/main/kotlin"]
- main.kotlin.excludes = ["**/Main2.kt"]
+ // main.kotlin.excludes = ["**/Main2.kt"]
}
task installToPrefix(type: Copy) {
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt
b/nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt
index e7663eb..fd4b267 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Helpers.kt
@@ -325,7 +325,7 @@ fun extractUserAndHashedPassword(authorizationHeader:
String): Pair<String, Byte
* and makes sure that the user exists in the system.
*
* @param authorization the Authorization:-header line.
- * @return subscriber id
+ * @return user id
*/
fun authenticateRequest(authorization: String?): String {
val headerLine = if (authorization == null) throw NexusError(
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main2.kt
b/nexus/src/main/kotlin/tech/libeufin/nexus/Main2.kt
index c8fb73a..8de652b 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main2.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main2.kt
@@ -59,13 +59,15 @@ import javax.crypto.EncryptedPrivateKeyInfo
import javax.sql.rowset.serial.SerialBlob
-data class NexusError(val statusCode: HttpStatusCode, val reason: String) :
Exception()
+/**
+ * Conflicts with current Main.kt
+data class NexusError(val statusCode: HttpStatusCode, val reason: String) :
Exception()
val logger: Logger = LoggerFactory.getLogger("tech.libeufin.nexus")
-
fun isProduction(): Boolean {
return System.getenv("NEXUS_PRODUCTION") != null
}
+ */
@ExperimentalIoApi
@KtorExperimentalAPI
@@ -185,7 +187,7 @@ fun main() {
* Queries list of transactions ALREADY downloaded from the bank.
*/
get("/bank-accounts/{accountid}/collected-transactions") {
- return@post
+ return@get
}
/**
* Adds a new bank transport.
@@ -208,7 +210,7 @@ fun main() {
return@post
}
}
- logger.info("Up and running")
- server.start(wait = true)
}
+ logger.info("Up and running")
+ server.start(wait = true)
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [libeufin] branch master updated (64b3929 -> f73bdad), gnunet, 2020/05/08
- [libeufin] 04/08: GET /user, gnunet, 2020/05/08
- [libeufin] 01/08: Comments., gnunet, 2020/05/08
- [libeufin] 06/08: POST /users, gnunet, 2020/05/08
- [libeufin] 02/08: new API.,
gnunet <=
- [libeufin] 05/08: admin authentication helper, gnunet, 2020/05/08
- [libeufin] 03/08: fix compilation, gnunet, 2020/05/08
- [libeufin] 07/08: add GET /bank-accounts, fix GET /user., gnunet, 2020/05/08
- [libeufin] 08/08: POST preapred-payments/submit, gnunet, 2020/05/08