Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>cn.apiclub.tool</groupId>
<artifactId>simplecaptcha</artifactId>
<version>1.2.2</version>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.example.spring_boot_project.Security;

import cn.apiclub.captcha.Captcha;

import javax.imageio.ImageIO;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Base64;

public class CaptchaUtil {
public static Captcha createCaptcha(int width, int height){
return new Captcha.Builder(width, height)
.addText()
.addBackground()
.addNoise()
.build();
}

public static String encodeCaptcha(Captcha c){
try(ByteArrayOutputStream o = new ByteArrayOutputStream()){
ImageIO.write(c.getImage(), "jpg", o);
return Base64.getEncoder().encodeToString(o.toByteArray());
} catch (IOException e){
throw new RuntimeException("error encoding Captcha", e);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,17 @@ public AuthController(UserService userService, BCryptPasswordEncoder passwordEnc
@PostMapping("/register")
public ResponseEntity<?> registerUser(@RequestBody RegisterRequest request) {
Optional<User> existingUser = userService.findByUsername(request.getUsername());

if (existingUser.isPresent()) {
return ResponseEntity.badRequest().body("Username already exists.");
}

User user = new User();
user.setUsername(request.getUsername());
user.setPassword(passwordEncoder.encode(request.getPassword()));
user.setRole("USER");
userService.save(user);

return ResponseEntity.ok().body("User registered successfully");
}

Expand All @@ -53,6 +56,7 @@ public ResponseEntity<?> loginUser(@RequestBody Map<String, String> request) {
passwordEncoder.matches(rawPassword, userOptional.get().getPassword())) {

String token = jwtUtil.generateToken(userOptional.get().getUsername());

return ResponseEntity.ok(Map.of("token", token));
}

Expand Down
Empty file.
Loading