DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-22 15:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug of profile loading

Browse source
This commit is contained in:
paul-emmanuel.dos-sa 2020-11-26 12:37:15 +01:00
parent e585452b73
commit 9d7d809515
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/org/springframework/samples/petclinic/controller/UserController.java
View file

@ -245,6 +245,7 @@ public class UserController extends WebSocketSender {
public String initUpdateOwnerForm(Model model) { public String initUpdateOwnerForm(Model model) {
try { try {
UserDTO user = (UserDTO) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); UserDTO user = (UserDTO) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
user = userService.findByEmail(user.getEmail());
model.addAttribute(CommonAttribute.USER, user); model.addAttribute(CommonAttribute.USER, user);
model.addAttribute(CommonAttribute.USER_ID, user.getId()); model.addAttribute(CommonAttribute.USER_ID, user.getId());
return CommonView.USER_UPDATE; return CommonView.USER_UPDATE;

10
src/main/resources/application.properties
View file

@ -44,15 +44,13 @@ spring.h2.console.path=/h2-console
spring.security.oauth2.client.registration.google.client-id=${OAUTH2_GOOGLE_CLIENT_ID} spring.security.oauth2.client.registration.google.client-id=${OAUTH2_GOOGLE_CLIENT_ID}
spring.security.oauth2.client.registration.google.client-secret=${OAUTH2_GOOGLE_CLIENT_SECRET} spring.security.oauth2.client.registration.google.client-secret=${OAUTH2_GOOGLE_CLIENT_SECRET}
spring.security.oauth2.client.registration.github.client-id=${OAUTH2_GITHUB_CLIENT_ID} #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-secret=${OAUTH2_GITHUB_CLIENT_SECRET}
#spring.security.oauth2.client.registration.facebook.client-id=<your client id> spring.security.oauth2.client.registration.facebook.client-id=121189305185277
#spring.security.oauth2.client.registration.facebook.client-secret=<your client secret> spring.security.oauth2.client.registration.facebook.client-secret=42ffe5aa7379e8326387e0fe16f34132
spring.security.oauth2.client.registration.twitter.client-id=${OAUTH2_TWITTER_CLIENT_ID}
spring.security.oauth2.client.registration.twitter.client-secret=${OAUTH2_TWITTER_CLIENT_SECRET}
#################################################################### SPRING MAIL #################################################################### SPRING MAIL
spring.mail.host=smtp.mailtrap.io spring.mail.host=smtp.mailtrap.io