Changeset 9dd526f for sources/app/src/main/java/parkup/configs/webConfigs/WebSecurityConfig.java

Timestamp:

02/02/22 14:15:35 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

df4089c

Parents:

9ff45d6

Message:

backend refactoring

File:

• sources/app/src/main/java/parkup/configs/webConfigs/WebSecurityConfig.java (modified) (2 diffs)

sources/app/src/main/java/parkup/configs/webConfigs/WebSecurityConfig.java

@@ -3 +3 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -9 +9 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import parkup.services.RegistriranParkiracService;
-import parkup.services.VrabotenService;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.web.cors.CorsConfiguration;
+import parkup.configs.CustomAuthenticationFilter;
+import parkup.configs.CustomAuthorizationFilter;
+import parkup.services.AdministratorService;
+import parkup.services.RegisteredUserService;
+import parkup.services.WorkerService;
+
+import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS;
 
 @EnableWebSecurity
 @Configuration
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-        private final VrabotenService vrabotenService;
+        private final WorkerService workerService;
         private final BCryptPasswordEncoder bCryptPasswordEncoder;
-        private final RegistriranParkiracService registriranParkiracService;
+        private final RegisteredUserService registeredUserService;
+        private final AdministratorService administratorService;
 
-        public WebSecurityConfig(VrabotenService vrabotenService, BCryptPasswordEncoder bCryptPasswordEncoder, RegistriranParkiracService registriranParkiracService) {
-            this.vrabotenService = vrabotenService;
+        public WebSecurityConfig(WorkerService workerService, BCryptPasswordEncoder bCryptPasswordEncoder, RegisteredUserService registeredUserService, AdministratorService administratorService) {
+            this.workerService = workerService;
             this.bCryptPasswordEncoder = bCryptPasswordEncoder;
-            this.registriranParkiracService = registriranParkiracService;
+            this.registeredUserService = registeredUserService;
+            this.administratorService = administratorService;
+        }
+
+        @Override
+        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+            auth.userDetailsService(registeredUserService).passwordEncoder(bCryptPasswordEncoder);
+            auth.userDetailsService(workerService).passwordEncoder(bCryptPasswordEncoder);
+            auth.userDetailsService(administratorService).passwordEncoder(bCryptPasswordEncoder);
         }
 
         @Override
         protected void configure(HttpSecurity http) throws Exception {
-            http
-                    .csrf().disable()
-                    .authorizeRequests()
-                        .antMatchers("/registriranParkirac/registration/**")
-                        .permitAll()
-                    .anyRequest()
-                    .authenticated().and().formLogin();//ruta na viktor
-        }
-
-        @Override
-        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-            auth.authenticationProvider(daoAuthenticationProviderW());
-            auth.authenticationProvider(daoAuthenticationProviderRP());
+            CustomAuthenticationFilter customAuthenticationFilter = new CustomAuthenticationFilter(authenticationManagerBean());
+            customAuthenticationFilter.setFilterProcessesUrl("/api/login");
+            http.csrf().disable();
+            http.cors().configurationSource(request -> new CorsConfiguration().applyPermitDefaultValues());
+            http.sessionManagement().sessionCreationPolicy(STATELESS);
+            http.authorizeRequests().antMatchers("/**").permitAll();
+//            http.authorizeRequests().antMatchers("/user/registration/**", "/home/markers","/home/getLocation/**","/api/login/**","/home").permitAll();
+//            http.authorizeRequests().antMatchers( "/user/setFavourite/**","user/favourites").hasAuthority("ROLE_USER");
+//            http.authorizeRequests().antMatchers( "/home/**").hasAuthority("ROLE_ADMIN");
+//            http.authorizeRequests().anyRequest().authenticated();
+            http.addFilter(customAuthenticationFilter);
+            http.addFilterBefore(new CustomAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class);
         }
 
         @Bean
-        public DaoAuthenticationProvider daoAuthenticationProviderW() {
-            DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-            provider.setPasswordEncoder(bCryptPasswordEncoder);
-            provider.setUserDetailsService(vrabotenService);
-            return provider;
+        @Override
+        public AuthenticationManager authenticationManagerBean() throws Exception {
+            return super.authenticationManagerBean();
         }
 
-        @Bean
-        public DaoAuthenticationProvider daoAuthenticationProviderRP(){
-            DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-            provider.setPasswordEncoder(bCryptPasswordEncoder);
-            provider.setUserDetailsService(registriranParkiracService);
-            return provider;
-        }
 
     }