From a175a83f349d134453a1fbad70e7502adefabac1 Mon Sep 17 00:00:00 2001 From: "paul-emmanuel.dos-sa" Date: Thu, 26 Nov 2020 13:08:09 +0100 Subject: [PATCH] fix bug of profile loading --- .../samples/petclinic/dto/common/RoleDTO.java | 2 -- .../samples/petclinic/dto/common/UserDTO.java | 6 ++--- .../samples/petclinic/model/common/Role.java | 1 + .../samples/petclinic/model/common/User.java | 8 +++--- .../petclinic/service/common/UserService.java | 4 +-- src/main/resources/application.properties | 2 ++ src/main/resources/templates/login.html | 25 ++++++++----------- 7 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java b/src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java index ea9ef7b22..3c1cca86d 100644 --- a/src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java +++ b/src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java @@ -11,6 +11,4 @@ import java.io.Serializable; */ public class RoleDTO extends NamedDTO implements Serializable { - - } diff --git a/src/main/java/org/springframework/samples/petclinic/dto/common/UserDTO.java b/src/main/java/org/springframework/samples/petclinic/dto/common/UserDTO.java index c3179b7b0..c89861c72 100644 --- a/src/main/java/org/springframework/samples/petclinic/dto/common/UserDTO.java +++ b/src/main/java/org/springframework/samples/petclinic/dto/common/UserDTO.java @@ -153,15 +153,15 @@ public class UserDTO extends PersonDTO implements Serializable, UserDetails { this.roles = roles; } - public void addRole(String role){ - if(this.roles==null){ + public void addRole(String role) { + if (this.roles == null) { this.roles = new ArrayList<>(); } this.roles.add(role); } - public void removeRole(String role){ + public void removeRole(String role) { this.roles.remove(role); } diff --git a/src/main/java/org/springframework/samples/petclinic/model/common/Role.java b/src/main/java/org/springframework/samples/petclinic/model/common/Role.java index d7c2efcc2..e86027d26 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/common/Role.java +++ b/src/main/java/org/springframework/samples/petclinic/model/common/Role.java @@ -58,4 +58,5 @@ public class Role implements Serializable { public void setUsers(Set users) { this.users = users; } + } diff --git a/src/main/java/org/springframework/samples/petclinic/model/common/User.java b/src/main/java/org/springframework/samples/petclinic/model/common/User.java index 903408272..f7ae4fd38 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/common/User.java +++ b/src/main/java/org/springframework/samples/petclinic/model/common/User.java @@ -53,7 +53,7 @@ public class User extends Person implements Serializable, UserDetails { @Column(name = "credential_unexpired") private boolean credentialsNonExpired; - @ManyToMany(cascade=CascadeType.ALL,fetch=FetchType.EAGER) + @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id")) private Set roles; @@ -154,15 +154,15 @@ public class User extends Person implements Serializable, UserDetails { } public void addRole(Role role) { - if(this.roles==null){ + if (this.roles == null) { this.roles = new HashSet<>(); } this.roles.add(role); role.getUsers().add(this); } - public void removeRole(Role role){ - if(this.roles!=null){ + public void removeRole(Role role) { + if (this.roles != null) { this.roles.remove(role); role.getUsers().remove(this); } diff --git a/src/main/java/org/springframework/samples/petclinic/service/common/UserService.java b/src/main/java/org/springframework/samples/petclinic/service/common/UserService.java index bbb5bf46c..65c87e2d2 100644 --- a/src/main/java/org/springframework/samples/petclinic/service/common/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/service/common/UserService.java @@ -41,7 +41,7 @@ public class UserService implements BaseService { User user = modelMapper.map(dto, User.class); user.setPassword(dto.getPassword()); - if( dto.getRoles()!= null) { + if (dto.getRoles() != null) { Set roles = new HashSet<>(); for (String role : dto.getRoles()) { @@ -64,7 +64,7 @@ public class UserService implements BaseService { userDto.setPassword(entity.getPassword()); userDto.setMatchingPassword(entity.getPassword()); - if( entity.getRoles()!= null) { + if (entity.getRoles() != null) { List roles = new ArrayList<>(); for (Role role : entity.getRoles()) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e2c45f27e..e7d2a66d5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -46,6 +46,8 @@ spring.security.oauth2.client.registration.google.client-secret=${OAUTH2_GOOGLE_ #spring.security.oauth2.client.registration.github.client-id=${OAUTH2_GITHUB_CLIENT_ID} #spring.security.oauth2.client.registration.github.client-secret=${OAUTH2_GITHUB_CLIENT_SECRET} +spring.security.oauth2.client.registration.github.client-id=d3e47fc2ddd966fa4352 +spring.security.oauth2.client.registration.github.client-secret=3bc0f6b8332f93076354c2a5bada2f5a05aea60d spring.security.oauth2.client.registration.facebook.client-id=121189305185277 diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index f55a53034..592c347ee 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -27,22 +27,17 @@

Login with Social Media

-
-
- - Login with Google - - - Login with Twitter - - - Login with Github - - - Login with Facebook - +
+ + Login with Google + + + Login with Github + + + Login with Facebook + -