From 077f7e10e62799be9d9e1a27a5fdc1fade0b2eb9 Mon Sep 17 00:00:00 2001 From: Bossanyi Tibor Date: Wed, 10 Jun 2020 17:26:47 +0200 Subject: [PATCH] authenticaction, registration, login fix --- data/db/update_0_0_3.sql | 1 + .../api/security/AuthenticationControllerAspect.kt | 8 +++++++- .../api/security/JwtAuthenticationController.kt | 4 ++++ .../com/aitrainer/api/test/ConfigurationTest.kt | 13 ------------- .../kotlin/com/aitrainer/api/test/PropertiesTest.kt | 6 ------ 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/data/db/update_0_0_3.sql b/data/db/update_0_0_3.sql index 4e4cbfb..99122d6 100644 --- a/data/db/update_0_0_3.sql +++ b/data/db/update_0_0_3.sql @@ -1 +1,2 @@ INSERT INTO `customer` (`name`, `firstname`, `email`, `password`, `sex`, `age`, `active`, `date_add`, `date_change`, `data_policy_allowed`, `admin`) VALUES ('Dummy User', NULL, 'bosi', '$2a$10$thOc8jS750c7xe9U9Qq3GuSPs/H0Pt2Ads05yzUlyzQBIj.Rk9QCy', 'm', 40, 'N', NULL, NULL, 1, 1); +UPDATE configuration set config_value = "0.0.3" WHERE config_key = "db_version"; diff --git a/src/main/kotlin/com/aitrainer/api/security/AuthenticationControllerAspect.kt b/src/main/kotlin/com/aitrainer/api/security/AuthenticationControllerAspect.kt index c106785..9393a90 100644 --- a/src/main/kotlin/com/aitrainer/api/security/AuthenticationControllerAspect.kt +++ b/src/main/kotlin/com/aitrainer/api/security/AuthenticationControllerAspect.kt @@ -23,9 +23,15 @@ class AuthenticationControllerAspect { private lateinit var properties: ApplicationProperties @Before("execution(* com.aitrainer.api.security.JwtAuthenticationController.*(..))") - fun customerControllerAspect(joinPoint: JoinPoint) { + fun authControllerAspect(joinPoint: JoinPoint) { println("auth controller join") Singleton.checkDBUpdate(configurationRepository, properties) } + @Before("execution(* com.aitrainer.api.security.JwtSecurityConfig.*(..))") + fun securityControllerAspect(joinPoint: JoinPoint) { + println("JwtSecurity config join") + Singleton.checkDBUpdate(configurationRepository, properties) + } + } diff --git a/src/main/kotlin/com/aitrainer/api/security/JwtAuthenticationController.kt b/src/main/kotlin/com/aitrainer/api/security/JwtAuthenticationController.kt index 9064b5a..4468cd0 100644 --- a/src/main/kotlin/com/aitrainer/api/security/JwtAuthenticationController.kt +++ b/src/main/kotlin/com/aitrainer/api/security/JwtAuthenticationController.kt @@ -40,10 +40,14 @@ class JwtAuthenticationController { private fun authenticate(username: String, password: String) { try { authenticationManager!!.authenticate(UsernamePasswordAuthenticationToken(username, password)) + println("authenticating....") } catch (e: DisabledException) { throw Exception("USER_DISABLED", e) } catch (e: BadCredentialsException) { throw Exception("INVALID_CREDENTIALS", e) + } catch( e: Exception) { + println("Auth exception " + e.message) + throw Exception("Other Exception", e) } } } diff --git a/src/test/kotlin/com/aitrainer/api/test/ConfigurationTest.kt b/src/test/kotlin/com/aitrainer/api/test/ConfigurationTest.kt index d7540b5..6f46c8f 100644 --- a/src/test/kotlin/com/aitrainer/api/test/ConfigurationTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/ConfigurationTest.kt @@ -15,17 +15,4 @@ class ConfigurationTest { private lateinit var configurationRepository: ConfigurationRepository private lateinit var configurationController: ConfigurationController - @Test - fun testUpdateConfig() { - val config: Configuration = configurationRepository.findByConfigKey("db_version") - config.configValue = "0.0.2" - - configurationController = ConfigurationController(configurationRepository) - val updatedConfig: Configuration = configurationController.updateConfiguration(config) - assertEquals(updatedConfig.configValue, "0.0.2") - - val foundConfig: Configuration = configurationRepository.findByConfigKey("db_version") - assertEquals(foundConfig.configValue, "0.0.2") - - } } \ No newline at end of file diff --git a/src/test/kotlin/com/aitrainer/api/test/PropertiesTest.kt b/src/test/kotlin/com/aitrainer/api/test/PropertiesTest.kt index 26130b1..b82a17a 100644 --- a/src/test/kotlin/com/aitrainer/api/test/PropertiesTest.kt +++ b/src/test/kotlin/com/aitrainer/api/test/PropertiesTest.kt @@ -12,12 +12,6 @@ class PropertiesTest { @Autowired private lateinit var properties: ApplicationProperties - @Test - fun testProperties() { - val version: String = properties.getVersion() - assertEquals(version, "0.0.2") - } - @Test fun testDatasourceUrl() { val url: String = properties.getDatasourceUrl()