Changeset 97fbc67 for sources/app/src/main/java/parkup/configs/WebSecurityConfig.java

Timestamp:

11/11/21 11:55:43 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

2ace8f0

Parents:

3a58bd6

Message:

fixed deleteVraboten and deleteRegistriranParkirac

File:

• sources/app/src/main/java/parkup/configs/WebSecurityConfig.java (modified) (1 diff)

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

@@ -9 +9 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import parkup.services.AdministratorService;
+import parkup.services.RegistriranParkiracService;
+import parkup.services.VrabotenService;
 
+@EnableWebSecurity
 @Configuration
-@EnableWebSecurity
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+        private final VrabotenService vrabotenService;
+        private final BCryptPasswordEncoder bCryptPasswordEncoder;
+        private final RegistriranParkiracService registriranParkiracService;
 
-    private final AdministratorService administratorService;
-    private final BCryptPasswordEncoder bCryptPasswordEncoder;
+        public WebSecurityConfig(VrabotenService vrabotenService, BCryptPasswordEncoder bCryptPasswordEncoder, RegistriranParkiracService registriranParkiracService) {
+            this.vrabotenService = vrabotenService;
+            this.bCryptPasswordEncoder = bCryptPasswordEncoder;
+            this.registriranParkiracService = registriranParkiracService;
+        }
 
-    public WebSecurityConfig(AdministratorService administratorService, BCryptPasswordEncoder bCryptPasswordEncoder) {
-        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
-        this.administratorService = administratorService;
+        @Override
+        protected void configure(HttpSecurity http) throws Exception {
+            http
+                    .csrf().disable()
+                    .authorizeRequests()
+                        .antMatchers("/vraboten/registration/**")
+                        .permitAll()
+                        .antMatchers("/registriranParkirac/registration/**")
+                        .permitAll()
+                    .anyRequest()
+                    .authenticated().and().formLogin();
+        }
+
+        @Override
+        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+            auth.authenticationProvider(daoAuthenticationProviderW());
+            auth.authenticationProvider(daoAuthenticationProviderRP());
+        }
+
+        @Bean
+        public DaoAuthenticationProvider daoAuthenticationProviderW() {
+            DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+            provider.setPasswordEncoder(bCryptPasswordEncoder);
+            provider.setUserDetailsService(vrabotenService);
+            return provider;
+        }
+
+        @Bean
+        public DaoAuthenticationProvider daoAuthenticationProviderRP(){
+            DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+            provider.setPasswordEncoder(bCryptPasswordEncoder);
+            provider.setUserDetailsService(registriranParkiracService);
+            return provider;
+        }
+
     }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-                .csrf().disable()
-                .authorizeRequests()
-                    .antMatchers("/administrator/registration/**")
-                    .permitAll()
-                .anyRequest()
-                .authenticated().and()
-                .formLogin();
-    }
-
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.authenticationProvider(daoAuthenticationProvider());
-    }
-
-    @Bean
-    public DaoAuthenticationProvider daoAuthenticationProvider(){
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setPasswordEncoder(bCryptPasswordEncoder);
-        provider.setUserDetailsService(administratorService);
-        return provider;
-    }
-}