DGNum/Stirling-PDF
14
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity

fixes

Browse source
This commit is contained in:
Anthony Stirling 2024-01-13 00:55:43 +00:00
parent c4ad442ec3
commit d8cf7e81b9
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -165,7 +165,7 @@ tasks.withType(JavaCompile) {
dependsOn 'spotlessApply' dependsOn 'spotlessApply'
} }
compileJava { compileJava {
options.compilerArgs << ' -parameters' options.compilerArgs << '-parameters'
} }
task writeVersion { task writeVersion {

11
src/main/java/stirling/software/SPDF/controller/api/UserController.java
View file

@ -28,7 +28,6 @@ import jakarta.servlet.http.HttpServletResponse;
import stirling.software.SPDF.config.security.UserService; import stirling.software.SPDF.config.security.UserService;
import stirling.software.SPDF.model.Role; import stirling.software.SPDF.model.Role;
import stirling.software.SPDF.model.User; import stirling.software.SPDF.model.User;
import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
import stirling.software.SPDF.model.api.user.UpdateUserDetails; import stirling.software.SPDF.model.api.user.UpdateUserDetails;
import stirling.software.SPDF.model.api.user.UsernameAndPass; import stirling.software.SPDF.model.api.user.UsernameAndPass;
@ -41,8 +40,7 @@ public class UserController {
@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')") @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@PostMapping("/register") @PostMapping("/register")
public String register( public String register(@ModelAttribute UsernameAndPass requestModel, Model model) {
@ModelAttribute UsernameAndPass requestModel, Model model) {
if (userService.usernameExists(requestModel.getUsername())) { if (userService.usernameExists(requestModel.getUsername())) {
model.addAttribute("error", "Username already exists"); model.addAttribute("error", "Username already exists");
return "register"; return "register";
@ -61,10 +59,9 @@ public class UserController {
HttpServletResponse response, HttpServletResponse response,
RedirectAttributes redirectAttributes) { RedirectAttributes redirectAttributes) {
String currentPassword = requestModel.getPassword();
String currentPassword = requestModel.getPassword(); String newPassword = requestModel.getNewPassword();
String newPassword = requestModel.getNewPassword(); String newUsername = requestModel.getNewUsername();
String newUsername = requestModel.getNewUsername();
if (principal == null) { if (principal == null) {
return new RedirectView("/change-creds?messageType=notAuthenticated"); return new RedirectView("/change-creds?messageType=notAuthenticated");

2
src/main/java/stirling/software/SPDF/model/api/user/Username.java
View file

@ -1,7 +1,5 @@
package stirling.software.SPDF.model.api.user; package stirling.software.SPDF.model.api.user;
import org.springframework.web.multipart.MultipartFile;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;