Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	src/main/kotlin/eu/maiora/plugins/Routing.kt

src/main/kotlin/eu/maiora/Application.kt

@@ -13,20 +13,22 @@ import java.io.FileInputStream
 import java.util.*
 
 fun main() {
-    embeddedServer(Netty, port = 8098, host = "0.0.0.0", module = Application::module)
+    val properties  = loadConfig()
-        .start(wait = true)
+    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")
     val secret = config.property("ktor.jwt.secret").getString()
     configureDatabases(dbUrl, username, password)
     configureSecurity(secret)
-    configureRouting(dbUrl, username, password)
+    configureRouting()
     configureSerialization()
 
     install(CallLogging)
@@ -45,7 +47,7 @@ fun Application.module() {
 
 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
 }

src/main/kotlin/eu/maiora/plugins/Routing.kt

@@ -1,9 +1,5 @@
 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.MovimentiRepositoryImpl
 import eu.maiora.model.ParametriRepositoryImpl
@@ -15,8 +11,7 @@ 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() {
-fun Application.configureRouting(dbUrl : String, username : String, password : String) {
     routing {
         get("/") {
             call.respondText("Hello World!")

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 {