From f5b5b9edea2ce4ba7c01075f38592bebbfc8db3f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 7 Sep 2018 13:18:56 +0300
Subject: fix remaining errors, now live

---
 .../java/com/juick/server/configuration/ApiAppConfiguration.java   | 2 ++
 .../main/java/com/juick/server/configuration/SecurityConfig.java   | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'juick-server/src/main/java/com/juick/server/configuration')

diff --git a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
index 001f72fe..d9c59aa2 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
+++ b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
@@ -26,6 +26,7 @@ import com.juick.server.xmpp.iq.MessageQuery;
 import com.juick.server.xmpp.s2s.BasicXmppSession;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.*;
+import org.springframework.core.Ordered;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -34,6 +35,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.BeanNameViewResolver;
 import org.springframework.web.servlet.view.feed.AbstractRssFeedView;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.ServletWebSocketHandlerRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
 import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
diff --git a/juick-server/src/main/java/com/juick/server/configuration/SecurityConfig.java b/juick-server/src/main/java/com/juick/server/configuration/SecurityConfig.java
index cd2ab13a..676de56b 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/SecurityConfig.java
+++ b/juick-server/src/main/java/com/juick/server/configuration/SecurityConfig.java
@@ -95,8 +95,6 @@ public class SecurityConfig {
         private String webDomain;
         @Resource
         private UserService userService;
-        @Inject
-        private HashParamAuthenticationFilter hashParamAuthenticationFilter;
         ApiConfig() {
             super(true);
         }
@@ -107,7 +105,6 @@ public class SecurityConfig {
 
         @Override
         protected void configure(HttpSecurity http) throws Exception {
-            http.addFilterAfter(hashParamAuthenticationFilter, BasicAuthenticationFilter.class);
             http.antMatcher("/api/**").authorizeRequests()
                     .antMatchers(HttpMethod.OPTIONS).permitAll()
                     .antMatchers("/api/", "/api/messages", "/api/users", "/api/thread", "/api/tags", "/api/tlgmbtwbhk", "/api/fbwbhk",
@@ -152,7 +149,7 @@ public class SecurityConfig {
         public void configure(WebSecurity web) {
             web.debug(false);
             web.ignoring().antMatchers("/api/v2/api-docs", "/api/configuration/ui", "/api/swagger-resources/**",
-                    "/api/configuration/**", "/swagger-ui.html", "/webjars/**", "/ws/**", "/rss/**", "/h2-console/**");
+                    "/api/configuration/**", "/swagger-ui.html", "/webjars/**", "/h2-console/**");
         }
     }
 
@@ -203,7 +200,7 @@ public class SecurityConfig {
         @Override
         public void configure(WebSecurity web) throws Exception {
             web.debug(false);
-            web.ignoring().antMatchers("/style.css*", "/scripts.js*", "/h2-console/**", "/.well-known/**");
+            web.ignoring().antMatchers("/style.css*", "/scripts.js*", "/h2-console/**", "/.well-known/**", "/ws/**", "/rss/**");
         }
     }
 }
-- 
cgit v1.2.3