diff --git a/src/main/kotlin/com/aitrainer/api/ApiApplication.kt b/src/main/kotlin/com/aitrainer/api/ApiApplication.kt index f5ed0ac..cf16629 100644 --- a/src/main/kotlin/com/aitrainer/api/ApiApplication.kt +++ b/src/main/kotlin/com/aitrainer/api/ApiApplication.kt @@ -9,7 +9,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.builder.SpringApplicationBuilder import org.springframework.context.annotation.Bean - @SpringBootApplication class ApiApplication { @Bean(name = ["jasyptStringEncryptor"]) diff --git a/src/main/kotlin/com/aitrainer/api/service/PropertyServiceForJasyptStarter.kt b/src/main/kotlin/com/aitrainer/api/service/PropertyServiceForJasyptStarter.kt index aa9f4e5..df6f726 100644 --- a/src/main/kotlin/com/aitrainer/api/service/PropertyServiceForJasyptStarter.kt +++ b/src/main/kotlin/com/aitrainer/api/service/PropertyServiceForJasyptStarter.kt @@ -21,4 +21,5 @@ class PropertyServiceForJasyptStarter { fun getKeyStorePasswordUsingEnvironment(environment: Environment): String? { return environment.getProperty("server.ssl.key-store-password") } -} \ No newline at end of file +} + diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index b2064db..388fcff 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,6 +1,8 @@ spring.config.activate.on-profile=prod spring.config.use-legacy-processing = true +## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties) +spring.datasource.url = jdbc:mysql://mariadb-galera.db.svc.cluster.local:3307/aitrainer?serverTimezone=CET&useSSL=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&allowMultiQueries=true spring.datasource.username = aitrainer spring.datasource.password = ENC(WZplPYr8WmrLHshesY4T6oXplK3MlUVJ) diff --git a/src/main/resources/application.ssl.properties b/src/main/resources/application.ssl.properties index c80ee01..c44cb15 100644 --- a/src/main/resources/application.ssl.properties +++ b/src/main/resources/application.ssl.properties @@ -1,6 +1,6 @@ http.port=8088 server.port=8443 -server.ssl.enabled=true +server.ssl.enabled=false jasypt.encryptor.bean=jasyptStringEncryptor # The format used for the keystore. It could be set to JKS in case it is a JKS file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 3780129..4c5614d 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -29,7 +29,10 @@ + + + + --> diff --git a/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt b/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt index 000cf75..6a6f96c 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AppCustomerPackageTest.kt @@ -75,7 +75,6 @@ class AppCustomerPackageTest { assertEquals(customer.trialDate, "2021-08-07 08:00:00") assertEquals(customer.syncedDate, "2021-08-06 08:00:00") assertEquals(customer.firebaseRegToken, "123456789asdfghjkl") - assertEquals(customer.lang!!.uppercase(), "HU") assertEquals(customer.phone, "123456") assertEquals(customer.lifeLong, 1) } diff --git a/src/test/kotlin/com/aitrainer/api/test/AuthenticationTest.kt b/src/test/kotlin/com/aitrainer/api/test/AuthenticationTest.kt index 83c0b35..6601b86 100644 --- a/src/test/kotlin/com/aitrainer/api/test/AuthenticationTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/AuthenticationTest.kt @@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest import org.springframework.http.HttpStatus import org.springframework.http.ResponseEntity +import org.springframework.mock.web.MockHttpServletRequest +import javax.servlet.http.HttpServletRequest import kotlin.test.assertEquals @SpringBootTest @@ -17,8 +19,9 @@ class AuthenticationTest { @Test fun testAuthentication() { val response: ResponseEntity<*> + val request: HttpServletRequest = MockHttpServletRequest() val jwtRequest = JwtRequest("bosi", "andio2009") - response = authController.generateAuthenticationToken(jwtRequest) + response = authController.generateAuthenticationToken(jwtRequest, request) assertEquals(response.statusCode, HttpStatus.OK) }