added security #6
Merged
Conversation
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
Rommelua
suggested changes
Sep 5, 2023
Comment on lines
24
to
25
| @NotBlank | ||
| @Size(min = 6, max = 100) |
There was a problem hiding this comment.
Suggested change
| @NotBlank | |
| @Size(min = 6, max = 100) |
| @Data | ||
| public class UserLoginRequestDto { | ||
| @Email(message = "Email is not valid", | ||
| regexp = "^[a-zA-Z0-9_!#$%&'*+/=?`{|}~^.-]+@[a-zA-Z0-9.-]+$") |
| @SQLDelete(sql = "UPDATE roles SET is_deleted=true WHERE id=?") | ||
| @Where(clause = "is_deleted=false") | ||
| @Table(name = "roles") | ||
| public class Role { |
Comment on lines
9
to
12
| @Query("FROM User u JOIN FETCH u.roles r " | ||
| + "WHERE u.email = :email " | ||
| + "AND u.isDeleted=FALSE " | ||
| + "AND r.isDeleted=FALSE") |
There was a problem hiding this comment.
Suggested change
| @Query("FROM User u JOIN FETCH u.roles r " | |
| + "WHERE u.email = :email " | |
| + "AND u.isDeleted=FALSE " | |
| + "AND r.isDeleted=FALSE") | |
| @EntityGraph(attributePaths = "roles") |
Comment on lines
42
to
48
| Role adminRole = roleRepository.findRoleByName(Role.RoleName.ADMIN) | ||
| .orElseThrow(() -> new RegistrationException("Can't find role by name")); | ||
| Set<Role> roles = new HashSet<>(); | ||
| if (user.getEmail().startsWith("admin")) { | ||
| roles.add(userRole); | ||
| roles.add(adminRole); | ||
| } |
There was a problem hiding this comment.
Suggested change
| Role adminRole = roleRepository.findRoleByName(Role.RoleName.ADMIN) | |
| .orElseThrow(() -> new RegistrationException("Can't find role by name")); | |
| Set<Role> roles = new HashSet<>(); | |
| if (user.getEmail().startsWith("admin")) { | |
| roles.add(userRole); | |
| roles.add(adminRole); | |
| } |
aaananas
approved these changes
Sep 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Added User entity,
Added Role entity,
Added the required DTOs and mapper,
Added AuthenticationController with the following methods:
Added FieldMatch annotation for checking that password and repeatPassword field in the UserRegistrationRequestDto are the same
RegistrationException and EntityNotFoundException handled using the GlobalExceptionHandler,
Addedthe JWT support to your application