Fixed startup issues

xmppjingle · Jan 18, 2023 · bde4b82 · bde4b82
1 parent 5a433f5
commit bde4b82
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/kotlin/com/xmppjingle/bjomeliga/config/ApiKeyAuthFilter.kt b/src/main/kotlin/com/xmppjingle/bjomeliga/config/ApiKeyAuthFilter.kt
@@ -4,13 +4,15 @@ import io.lettuce.core.RedisClient
 import io.lettuce.core.api.StatefulRedisConnection
 import io.lettuce.core.api.sync.RedisCommands
 import io.lettuce.core.dynamic.RedisCommandFactory
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.redis.core.RedisTemplate
 import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.authentication.BadCredentialsException
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.security.core.Authentication
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
+import org.springframework.stereotype.Component
 import javax.annotation.PostConstruct
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse

diff --git a/src/main/kotlin/com/xmppjingle/bjomeliga/config/SecurityConfig.kt b/src/main/kotlin/com/xmppjingle/bjomeliga/config/SecurityConfig.kt
@@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpMethod
+import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.WebSecurity
@@ -22,8 +23,7 @@ import springfox.documentation.spring.web.plugins.Docket
 @Component
 internal class SecurityConfig : WebSecurityConfigurerAdapter() {
 
-    @Autowired
-    lateinit var apiKeyAuthFilter: ApiKeyAuthFilter
+    private lateinit var apiKeyAuthFilter: ApiKeyAuthFilter
 
     @Throws(Exception::class)
     override fun configure(web: WebSecurity) {
@@ -46,6 +46,7 @@ internal class SecurityConfig : WebSecurityConfigurerAdapter() {
 
     @Throws(java.lang.Exception::class)
     override fun configure(http: HttpSecurity) {
+        apiKeyAuthFilter = ApiKeyAuthFilter(authenticationManager())
         http.addFilterBefore(apiKeyAuthFilter, UsernamePasswordAuthenticationFilter::class.java)
             .authorizeRequests()
             // Whitelisted endpoints that do not require authentication
@@ -63,4 +64,9 @@ internal class SecurityConfig : WebSecurityConfigurerAdapter() {
             .paths(PathSelectors.any())
             .build()
     }
-}
+
+    @Bean
+    override fun authenticationManagerBean(): AuthenticationManager {
+        return super.authenticationManagerBean()
+    }
+}