Revize a47418af

#10228 Implementování odhlášení uživatele a invalidace tokenu

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/security/WebSecurityConfig.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.v2.security;
 
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.service.AuthProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -9 +10 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.web.client.RestTemplate;
 
 @EnableWebSecurity
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@@ -21 +24 @@
         auth.userDetailsService(userService);
     }
 
+    @Bean
+    public AuthenticationProvider provider() {
+        return new AuthProvider(template());
+    }
+
+    @Bean
+    public RestTemplate template() {
+        return new RestTemplate();
+    }
 
     @Bean
     public UserDetailsService userDetailsService() {
         return super.userDetailsService();
     }
 
+
+
     @Override
     @Bean
     public AuthenticationManager authenticationManagerBean() throws Exception {
         return super.authenticationManagerBean();
     }
 
+
     @Override
     protected void configure(HttpSecurity httpSecurity) throws Exception {
-        httpSecurity.csrf().disable()
-                .authorizeRequests().antMatchers("/v2/user/register","/v2/user/login").permitAll().
-                anyRequest().authenticated().and().
-                exceptionHandling().and().sessionManagement()
+        httpSecurity
+                .csrf()
+                .disable()
+                .authorizeRequests()
+                .antMatchers("/v2/user/register", "/v2/user/login").permitAll()
+                .anyRequest()
+                .authenticated()
+                .and()
+                .sessionManagement()
                 .sessionCreationPolicy(SessionCreationPolicy.STATELESS);
-//        httpSecurity.addFilterBefore(jwtRequestFilter, UsernamePasswordAuthenticationFilter.class);
-
+        httpSecurity.addFilterAfter(new JwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
     }
 
-
-
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/OAuthServiceImpl.java

@@ -4 +4 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.RequestBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -25 +36 @@
     @Autowired
     private UserService userService;
 
-    public ResponseEntity<String> authenticate(User user) {
-        final String userName = user.getName();
-        final String token = user.getToken();
-
-        if(userName == null || token == null) {
-            return null;
-        }
-
-        //HttpURLConnection con = RequestBuilder.createConnection(AUTH_URL);
-        HashMap<String, String> requestBody = new HashMap<>();
+    public ResponseEntity<String> authenticate(String token) {
 
         requestBody.put("name", userName);
         requestBody.put("token", token);

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/utils/JSONBuilder.java

@@ -17 +17 @@
      * @return String representation of JSON object
      */
     public static String buildJson(HashMap<String, String> map){
+        if(map == null) {
+            return "";
+        }
         ObjectMapper mapper = new ObjectMapper();
         ObjectNode jsonObject = mapper.createObjectNode();
         for (String key : map.keySet()) {

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/utils/RequestBuilder.java

@@ -3 +3 @@
 import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
+import java.util.Optional;
 import java.util.logging.Logger;
 
 import org.springframework.http.*;
@@ -25 +26 @@
         return response;
     }
 
+    public static ResponseEntity<String> sendRequestResponse(String url, HashMap<String,String> body, String token) {
+        RestTemplate restTemplate = new RestTemplate();
+        String json = JSONBuilder.buildJson(body);
+
+        HttpHeaders headers = new HttpHeaders();
+
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(token);
+
+        HttpEntity<String> entity = new HttpEntity<>(json, headers);
+        return restTemplate.postForEntity(url, entity, String.class);
+    }
+
 }