jhynsoo/edufocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117 from TeamBNBN/BE/user

Browse Source 
feat: user login 수정
This commit is contained in:
Jungmin 2024-07-26 12:36:42 +09:00 committed by GitHub
commit b7657e39d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/src/main/java/com/edufocus/edufocus/user/controller/UserController.java
View File

@ -41,17 +41,7 @@ public class UserController {
return ResponseEntity.ok("임시 비밀번호가 이메일로 전송되었습니다."); return ResponseEntity.ok("임시 비밀번호가 이메일로 전송되었습니다.");
} }
//
// @PostMapping("/login")
// public ResponseEntity<User> login(@RequestBody User user) {
// try {
// User loggedInUser = userService.login(user);
// return ResponseEntity.ok(loggedInUser);
//
// } catch (Exception e) {
// throw new RuntimeException(e);
// }
// }
@Operation(summary = "로그인", description = "아이디와 비밀번호를 이용하여 로그인 처리.") @Operation(summary = "로그인", description = "아이디와 비밀번호를 이용하여 로그인 처리.")
@PostMapping("/login") @PostMapping("/login")
@ -59,6 +49,9 @@ public class UserController {
@RequestBody @Parameter(description = "로그인 시 필요한 회원정보(아이디, 비밀번호).", required = true) User user, HttpServletResponse response) { @RequestBody @Parameter(description = "로그인 시 필요한 회원정보(아이디, 비밀번호).", required = true) User user, HttpServletResponse response) {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
HttpStatus status = HttpStatus.ACCEPTED; HttpStatus status = HttpStatus.ACCEPTED;
String name= user.getName();
resultMap.put("name",name);
try { try {
User loginUser = userService.login(user); User loginUser = userService.login(user);
if (loginUser != null) { if (loginUser != null) {
@ -69,9 +62,9 @@ public class UserController {
System.out.println(accessToken); System.out.println(accessToken);
resultMap.put("access-token", accessToken); resultMap.put("access-token", accessToken);
// resultMap.put("refresh-token", refreshToken);
// 쿠키 저장
Cookie refreshCookie = new Cookie("refresh-token", refreshToken); Cookie refreshCookie = new Cookie("refresh-token", refreshToken);
refreshCookie.setPath("/"); refreshCookie.setPath("/");
refreshCookie.setHttpOnly(true); refreshCookie.setHttpOnly(true);
@ -80,7 +73,7 @@ public class UserController {
response.addCookie(refreshCookie); response.addCookie(refreshCookie);
// 쿠키저장f
status = HttpStatus.CREATED; status = HttpStatus.CREATED;
} else { } else {
resultMap.put("message", "아이디 또는 패스워드를 확인해 주세요."); resultMap.put("message", "아이디 또는 패스워드를 확인해 주세요.");
@ -98,12 +91,9 @@ public class UserController {
public ResponseEntity<Map<String, Object>> getInfo( public ResponseEntity<Map<String, Object>> getInfo(
@PathVariable("userId") @Parameter(description = "인증할 회원의 아이디.", required = true) Long userId, @PathVariable("userId") @Parameter(description = "인증할 회원의 아이디.", required = true) Long userId,
HttpServletRequest request) { HttpServletRequest request) {
//logger.debug("userId : {} ", userId);
String id = String.valueOf(userId); String id = String.valueOf(userId);
System.out.println("!>>>>>>>>>>>>>>>>>>>>>>>>");
System.out.println(id);
System.out.println(id.getClass().getName());
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
HttpStatus status = HttpStatus.ACCEPTED; HttpStatus status = HttpStatus.ACCEPTED;
if (jwtUtil.checkToken(request.getHeader("Authorization"))) { if (jwtUtil.checkToken(request.getHeader("Authorization"))) {