From b49577804e4eee1025cfac35b6636fe1e04f0a4d Mon Sep 17 00:00:00 2001 From: francescods Date: Tue, 18 Mar 2025 15:48:08 +0100 Subject: [PATCH 1/3] porta server su file esterno --- src/main/kotlin/eu/maiora/Application.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/eu/maiora/Application.kt b/src/main/kotlin/eu/maiora/Application.kt index 80cf04c..ad67624 100644 --- a/src/main/kotlin/eu/maiora/Application.kt +++ b/src/main/kotlin/eu/maiora/Application.kt @@ -13,13 +13,15 @@ import java.io.FileInputStream import java.util.* fun main() { - embeddedServer(Netty, port = 8098, host = "0.0.0.0", module = Application::module) - .start(wait = true) + val properties = loadConfig() + val port = properties.getProperty("server.port").toInt() + embeddedServer(Netty, port = port, host = "0.0.0.0") { + module(properties) + }.start(wait = true) } -fun Application.module() { +fun Application.module(configFile: Properties) { val config = ApplicationConfig("application.conf") - val configFile = loadConfig() val dbUrl = configFile.getProperty("ktor.database.url") val username = configFile.getProperty("ktor.database.username") val password = configFile.getProperty("ktor.database.password") From 23733caca9efbbf7c4686441f47a22e9b8bf2d95 Mon Sep 17 00:00:00 2001 From: francescods Date: Wed, 19 Mar 2025 09:17:31 +0100 Subject: [PATCH 2/3] modifica nome folder properties usato nome generico backend_api --- src/main/kotlin/eu/maiora/Application.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/eu/maiora/Application.kt b/src/main/kotlin/eu/maiora/Application.kt index ad67624..70fd658 100644 --- a/src/main/kotlin/eu/maiora/Application.kt +++ b/src/main/kotlin/eu/maiora/Application.kt @@ -47,7 +47,7 @@ fun Application.module(configFile: Properties) { fun loadConfig(): Properties { val properties = Properties() - val inputStream = FileInputStream("/home/ristocloudadm/config.properties") + val inputStream = FileInputStream("/home/backend_api/config.properties") properties.load(inputStream) return properties } From 8a934dca5bd3773d9b1bf0ffec7bfa726c87de57 Mon Sep 17 00:00:00 2001 From: francescods Date: Thu, 20 Mar 2025 13:00:16 +0100 Subject: [PATCH 3/3] modifica path autenticazione pulizia codice --- src/main/kotlin/eu/maiora/Application.kt | 2 +- src/main/kotlin/eu/maiora/plugins/Routing.kt | 8 +------- src/main/kotlin/eu/maiora/routes/Auth.kt | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/eu/maiora/Application.kt b/src/main/kotlin/eu/maiora/Application.kt index 70fd658..4e693fc 100644 --- a/src/main/kotlin/eu/maiora/Application.kt +++ b/src/main/kotlin/eu/maiora/Application.kt @@ -28,7 +28,7 @@ fun Application.module(configFile: Properties) { val secret = config.property("ktor.jwt.secret").getString() configureDatabases(dbUrl, username, password) configureSecurity(secret) - configureRouting(dbUrl, username, password) + configureRouting() configureSerialization() install(CallLogging) diff --git a/src/main/kotlin/eu/maiora/plugins/Routing.kt b/src/main/kotlin/eu/maiora/plugins/Routing.kt index abfd7e4..7194be6 100644 --- a/src/main/kotlin/eu/maiora/plugins/Routing.kt +++ b/src/main/kotlin/eu/maiora/plugins/Routing.kt @@ -1,18 +1,12 @@ package eu.maiora.plugins -//import eu.maiora.model.LogScriptRepositoryImpl -//import eu.maiora.routes.analizzaURLRoute -//import eu.maiora.routes.eseguiScriptSQLRoute -//import eu.maiora.routes.logScriptRouting import eu.maiora.model.AccountsRepositoryImpl -import eu.maiora.model.ParametriRepositoryImpl import eu.maiora.routes.auth import io.ktor.server.application.* import io.ktor.server.response.* import io.ktor.server.routing.* -//fun Application.configureRouting(dbUrl : String, username : String, password : String, repository : LogScriptRepositoryImpl ) { -fun Application.configureRouting(dbUrl : String, username : String, password : String) { +fun Application.configureRouting() { routing { get("/") { call.respondText("Hello World!") diff --git a/src/main/kotlin/eu/maiora/routes/Auth.kt b/src/main/kotlin/eu/maiora/routes/Auth.kt index c6a2cbb..0443947 100644 --- a/src/main/kotlin/eu/maiora/routes/Auth.kt +++ b/src/main/kotlin/eu/maiora/routes/Auth.kt @@ -16,7 +16,7 @@ import java.util.* fun Route.auth(accountsRepository: AccountsRepositoryImpl) { - route("/auth") { + route("/api/auth") { post() { // Riceve il body della richiesta e lo deserializza in ReceivedResponse val receivedResponse = try {