Codiki/codiki
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Correction of change password component and its back-office processing.

Browse Source
This commit is contained in:
Florian THIERRY - Takiguchi
2019-01-30 22:27:26 +01:00
parent b403e53a23
commit b502d8830c
4 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/codiki/account/AccountController.java
View File

@@ -2,6 +2,7 @@ package org.codiki.account;
import java.io.IOException;
import java.security.Principal;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -10,6 +11,7 @@ import org.codiki.core.entities.dto.PasswordWrapperDTO;
import org.codiki.core.entities.dto.UserDTO;
import org.codiki.core.entities.dto.View;
import org.codiki.core.entities.persistence.User;
import org.codiki.core.services.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.core.Authentication;
@@ -29,6 +31,8 @@ import com.fasterxml.jackson.annotation.JsonView;
public class AccountController {
@Autowired
private AccountService accountService;
@Autowired
private UserService userService;
@JsonView(View.UserDTO.class)
@PostMapping("/login")
@@ -63,13 +67,12 @@ public class AccountController {
final HttpServletRequest pRequest,
final HttpServletResponse pResponse,
final Principal pPrincipal) throws IOException {
// final Optional<User> connectedUser = tokenService.getAuthenticatedUserByToken(pRequest);
// if(connectedUser.isPresent()) {
// accountService.changePassword(connectedUser.get(), pPasswordWrapper, pResponse);
// } else {
// pResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED);
// }
final Optional<User> connectedUser = userService.getUserByPrincipal(pPrincipal);
if(connectedUser.isPresent()) {
accountService.changePassword(connectedUser.get(), pPasswordWrapper, pResponse);
} else {
pResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED);
}
}
@PostMapping("/signin")