Merge pull request 'develop' (#6) from develop into master

Reviewed-on: #6

src/main/java/com/example/nto/config/WebSecurityConfig.java

@@ -5,7 +5,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -33,21 +32,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         http.csrf().disable()
                 .authorizeRequests()
                 .antMatchers("/h2-console/**").permitAll()
-                .antMatchers("/api/v1/images/**").permitAll()
+                .antMatchers("/api/v1/**").hasAnyAuthority("ROLE_USER", "ROLE_ADMIN")
-                .antMatchers("/api/v1/volunteers/login").permitAll()
+                .antMatchers("/api/v1/authorization/login").permitAll()
-                .antMatchers("/api/v1/volunteers/register").permitAll()
+                .antMatchers("/api/v1/authorization/register").permitAll()
-
-                .antMatchers("/api/v1/**").permitAll()
-                //.antMatchers("/api/v1/**").hasAnyAuthority("ROLE_USER", "ROLE_ADMIN")
                 .anyRequest().authenticated()
                 .and()
                 .httpBasic()
                 .and()
                 .headers().frameOptions().disable();
     }
-
-    @Override
-    public void configure(WebSecurity web) {
-        web.ignoring().antMatchers("/api/v1/volunteers/images");
-    }
 }

src/main/java/com/example/nto/controller/AuthorizationController.java

@@ -17,6 +17,7 @@ public class AuthorizationController {
 
     @GetMapping("/login")
     public ResponseEntity<EmployeeDTO> login(Authentication authentication) {
+
         return ResponseEntity.ok(employeeService.getByEmail(authentication.getName()));
     }
 

src/main/java/com/example/nto/controller/EmployeeController.java

@@ -65,5 +65,4 @@ public class EmployeeController {
         employeeService.patchBlockEmployee(employeeId, blockStatus);
         return ResponseEntity.noContent().build();
     }
-
 }

src/main/java/com/example/nto/domain/entity/Employee.java

@@ -94,11 +94,6 @@ public class Employee implements UserDetails {
         return List.of(this.role);
     }
 
-    @Override
-    public String getPassword() {
-        return this.password;
-    }
-
     @Override
     public String getUsername() {
         return this.email;