-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
added security component, added user to the model #6
Merged
Merged
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
2f16dac
added pagination and api annotations
BlueVioletTeti 14b1c0c
Merge branch 'dev-data-validation' into dev-pagination
BlueVioletTeti a71d654
updated liquibase properties
BlueVioletTeti a5488eb
updated properties in pom.xml
BlueVioletTeti bda8ca5
added security component, added user to the model
BlueVioletTeti ae68043
added security component, added user to the model
BlueVioletTeti 0fb1418
resolved rebase conflict part 2
BlueVioletTeti 57492ff
added several properties
BlueVioletTeti b776299
added via liquibase default admin user and filled in roles table, ren…
BlueVioletTeti 237f000
added small amendments
BlueVioletTeti File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
src/main/java/mate/academy/bookstore/annotation/FieldsValueMatch.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package mate.academy.bookstore.annotation; | ||
|
||
import jakarta.validation.Constraint; | ||
import java.lang.annotation.ElementType; | ||
import java.lang.annotation.Retention; | ||
import java.lang.annotation.RetentionPolicy; | ||
import java.lang.annotation.Target; | ||
|
||
@Constraint(validatedBy = FieldsValueMatchValidator.class) | ||
@Target({ ElementType.TYPE }) | ||
@Retention(RetentionPolicy.RUNTIME) | ||
public @interface FieldsValueMatch { | ||
String message() default "Fields values don't match!"; | ||
String field(); | ||
String fieldMatch(); | ||
} |
31 changes: 31 additions & 0 deletions
31
src/main/java/mate/academy/bookstore/annotation/FieldsValueMatchValidator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package mate.academy.bookstore.annotation; | ||
|
||
import jakarta.validation.ConstraintValidator; | ||
import jakarta.validation.ConstraintValidatorContext; | ||
import org.springframework.beans.BeanWrapperImpl; | ||
|
||
public class FieldsValueMatchValidator implements ConstraintValidator<FieldsValueMatch, Object> { | ||
private String field; | ||
private String fieldMatch; | ||
|
||
@Override | ||
public void initialize(FieldsValueMatch constraintAnnotation) { | ||
this.field = constraintAnnotation.field(); | ||
this.fieldMatch = constraintAnnotation.fieldMatch(); | ||
} | ||
|
||
@Override | ||
public boolean isValid(Object value, | ||
ConstraintValidatorContext constraintValidatorContext) { | ||
Object fieldValue = new BeanWrapperImpl(value) | ||
.getPropertyValue(field); | ||
Object fieldMatchValue = new BeanWrapperImpl(value) | ||
.getPropertyValue(fieldMatch); | ||
|
||
if (fieldValue != null) { | ||
return fieldValue.equals(fieldMatchValue); | ||
} else { | ||
return fieldMatchValue == null; | ||
} | ||
} | ||
} |
60 changes: 60 additions & 0 deletions
60
src/main/java/mate/academy/bookstore/config/SecurityConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
package mate.academy.bookstore.config; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
import mate.academy.bookstore.security.JwtAuthenticationFilter; | ||
import org.springframework.context.annotation.Bean; | ||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.security.authentication.AuthenticationManager; | ||
import org.springframework.security.config.Customizer; | ||
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; | ||
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; | ||
import org.springframework.security.config.annotation.web.builders.HttpSecurity; | ||
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; | ||
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; | ||
import org.springframework.security.config.http.SessionCreationPolicy; | ||
import org.springframework.security.core.userdetails.UserDetailsService; | ||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; | ||
import org.springframework.security.crypto.password.PasswordEncoder; | ||
import org.springframework.security.web.SecurityFilterChain; | ||
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; | ||
|
||
@EnableWebSecurity | ||
@EnableMethodSecurity | ||
@Configuration | ||
@RequiredArgsConstructor | ||
public class SecurityConfig { | ||
private final UserDetailsService userDetailsService; | ||
private final JwtAuthenticationFilter jwtAuthenticationFilter; | ||
|
||
@Bean | ||
public PasswordEncoder passwordEncoder() { | ||
return new BCryptPasswordEncoder(); | ||
} | ||
|
||
@Bean | ||
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { | ||
return http.cors(AbstractHttpConfigurer::disable) | ||
.csrf(AbstractHttpConfigurer::disable) | ||
.authorizeHttpRequests( | ||
auth -> auth | ||
.requestMatchers("/auth/**", "/error") | ||
.permitAll() | ||
.anyRequest() | ||
.authenticated() | ||
) | ||
.httpBasic(Customizer.withDefaults()) | ||
.sessionManagement(session | ||
-> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) | ||
.addFilterBefore(jwtAuthenticationFilter, | ||
UsernamePasswordAuthenticationFilter.class) | ||
.userDetailsService(userDetailsService) | ||
.build(); | ||
} | ||
|
||
@Bean | ||
public AuthenticationManager authenticationManager( | ||
AuthenticationConfiguration authenticationConfiguration | ||
) throws Exception { | ||
return authenticationConfiguration.getAuthenticationManager(); | ||
} | ||
} |
35 changes: 35 additions & 0 deletions
35
src/main/java/mate/academy/bookstore/controller/AuthController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package mate.academy.bookstore.controller; | ||
|
||
import jakarta.validation.Valid; | ||
import lombok.RequiredArgsConstructor; | ||
import mate.academy.bookstore.dto.user.UserLoginRequestDto; | ||
import mate.academy.bookstore.dto.user.UserLoginResponseDto; | ||
import mate.academy.bookstore.dto.user.UserRegistrationRequest; | ||
import mate.academy.bookstore.dto.user.UserResponseDto; | ||
import mate.academy.bookstore.exception.RegistrationException; | ||
import mate.academy.bookstore.security.AuthenticationService; | ||
import mate.academy.bookstore.service.UserService; | ||
import org.springframework.web.bind.annotation.PostMapping; | ||
import org.springframework.web.bind.annotation.RequestBody; | ||
import org.springframework.web.bind.annotation.RequestMapping; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
@RestController | ||
@RequiredArgsConstructor | ||
@RequestMapping("/auth") | ||
public class AuthController { | ||
private final UserService userService; | ||
private final AuthenticationService authenticationService; | ||
|
||
@PostMapping("/login") | ||
public UserLoginResponseDto login(@RequestBody UserLoginRequestDto requestDto) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please, add the @Valid annotation) |
||
return authenticationService.authenticate(requestDto); | ||
} | ||
|
||
@PostMapping("/register") | ||
public UserResponseDto register(@RequestBody @Valid UserRegistrationRequest request) | ||
throws RegistrationException { | ||
return userService.register(request); | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
src/main/java/mate/academy/bookstore/dto/user/UserLoginRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package mate.academy.bookstore.dto.user; | ||
|
||
import jakarta.validation.constraints.Email; | ||
import jakarta.validation.constraints.NotBlank; | ||
import jakarta.validation.constraints.NotEmpty; | ||
import jakarta.validation.constraints.Size; | ||
import lombok.Data; | ||
|
||
@Data | ||
public class UserLoginRequestDto { | ||
@NotEmpty | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
@NotBlank | ||
@Size(min = 8, max = 20) | ||
private String email; | ||
@NotEmpty | ||
@NotBlank | ||
@Size(min = 8, max = 20) | ||
private String password; | ||
} |
4 changes: 4 additions & 0 deletions
4
src/main/java/mate/academy/bookstore/dto/user/UserLoginResponseDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
package mate.academy.bookstore.dto.user; | ||
|
||
public record UserLoginResponseDto(String token) { | ||
} |
29 changes: 29 additions & 0 deletions
29
src/main/java/mate/academy/bookstore/dto/user/UserRegistrationRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package mate.academy.bookstore.dto.user; | ||
|
||
import jakarta.validation.constraints.NotBlank; | ||
import jakarta.validation.constraints.Size; | ||
import lombok.Data; | ||
import mate.academy.bookstore.annotation.FieldsValueMatch; | ||
|
||
@Data | ||
@FieldsValueMatch( | ||
field = "password", | ||
fieldMatch = "repeatPassword", | ||
message = "Passwords do not match!" | ||
) | ||
public class UserRegistrationRequest { | ||
@NotBlank | ||
@Size(min = 4, max = 100) | ||
private String email; | ||
@NotBlank | ||
@Size(min = 6, max = 100) | ||
private String password; | ||
@NotBlank | ||
@Size(min = 6, max = 100) | ||
private String repeatPassword; | ||
@NotBlank | ||
private String firstName; | ||
@NotBlank | ||
private String lastName; | ||
private String shippingAddress; | ||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/mate/academy/bookstore/dto/user/UserResponseDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package mate.academy.bookstore.dto.user; | ||
|
||
import lombok.Data; | ||
|
||
@Data | ||
public class UserResponseDto { | ||
private Long id; | ||
private String email; | ||
private String firstName; | ||
private String lastName; | ||
private String shippingAddress; | ||
} |
2 changes: 1 addition & 1 deletion
2
...eptions/CustomGlobalExceptionHandler.java → ...ception/CustomGlobalExceptionHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...e/exceptions/EntityNotFoundException.java → ...re/exception/EntityNotFoundException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
src/main/java/mate/academy/bookstore/exception/RegistrationException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package mate.academy.bookstore.exception; | ||
|
||
public class RegistrationException extends Exception { | ||
public RegistrationException(String message) { | ||
super(message); | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
src/main/java/mate/academy/bookstore/mapper/UserMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package mate.academy.bookstore.mapper; | ||
|
||
import mate.academy.bookstore.config.MapperConfig; | ||
import mate.academy.bookstore.dto.user.UserRegistrationRequest; | ||
import mate.academy.bookstore.dto.user.UserResponseDto; | ||
import mate.academy.bookstore.model.User; | ||
import org.mapstruct.Mapper; | ||
|
||
@Mapper(config = MapperConfig.class) | ||
public interface UserMapper { | ||
UserResponseDto toUserResponse(User user); | ||
|
||
User toModel(UserRegistrationRequest request); | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since you added JWT security httpBasic is no more needed actually