diff --git a/src/main/java/github/benjamin/equipreservebackend/config/WebConfig.java b/src/main/java/github/benjamin/equipreservebackend/config/WebConfig.java index 1493a1c..fae95f5 100644 --- a/src/main/java/github/benjamin/equipreservebackend/config/WebConfig.java +++ b/src/main/java/github/benjamin/equipreservebackend/config/WebConfig.java @@ -1,6 +1,7 @@ package github.benjamin.equipreservebackend.config; import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -12,4 +13,13 @@ public class WebConfig implements WebMvcConfigurer { registry.addResourceHandler("/device_image/**") .addResourceLocations("file:" + System.getProperty("user.dir") + "/device_image/"); } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOriginPatterns("*") + .allowedMethods("*") + .allowedHeaders("*") + .allowCredentials(true); + } } diff --git a/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java b/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java index 26cc3aa..f188f0e 100644 --- a/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java +++ b/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java @@ -1,5 +1,6 @@ package github.benjamin.equipreservebackend.controller; +import github.benjamin.equipreservebackend.dto.LoginRequest; import github.benjamin.equipreservebackend.vo.LoginResponse; import github.benjamin.equipreservebackend.response.ResponseResult; import github.benjamin.equipreservebackend.entity.User; @@ -8,6 +9,7 @@ import github.benjamin.equipreservebackend.service.UserService; import github.benjamin.equipreservebackend.utils.JwtUtil; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @RestController @@ -19,8 +21,8 @@ public class UserController { private final JwtUtil jwtUtil; @PostMapping("/login") - public ResponseResult login(String username, String password) { - User user = userService.login(username, password); + public ResponseResult login(@RequestBody LoginRequest request) { + User user = userService.login(request.getUsername(), request.getPassword()); SecurityUser securityUser = userService.loadSecurityUserById(user.getId()); String token = jwtUtil.generateToken(securityUser); return ResponseResult.success(new LoginResponse(user.getId(), user.getName(), token)); diff --git a/src/main/java/github/benjamin/equipreservebackend/dto/LoginRequest.java b/src/main/java/github/benjamin/equipreservebackend/dto/LoginRequest.java new file mode 100644 index 0000000..839e002 --- /dev/null +++ b/src/main/java/github/benjamin/equipreservebackend/dto/LoginRequest.java @@ -0,0 +1,11 @@ +package github.benjamin.equipreservebackend.dto; + +import lombok.Data; + +@Data +public class LoginRequest { + + private String username; + private String password; + +}