fix:"保证验证码消费与账号变更原子提交"
This commit is contained in:
1 parent
32f6f67b9f
commit
02c21e5c19
9 files changed
+345
-14
No files matched your search
@@ -28,17 +28,20 @@ public class AuthController {
|
||||
private static final String SESSION_COOKIE = "moyi_session";
|
||||
private final AuthService authService;
|
||||
private final VerificationService verification;
|
||||
private final VerifiedAccountService verifiedAccounts;
|
||||
private final int sessionTtlHours;
|
||||
private final boolean secureCookie;
|
||||
|
||||
public AuthController(
|
||||
AuthService authService,
|
||||
VerificationService verification,
|
||||
VerifiedAccountService verifiedAccounts,
|
||||
@Value("${moyi.auth.session-ttl-hours}") int sessionTtlHours,
|
||||
@Value("${moyi.auth.secure-cookie}") boolean secureCookie
|
||||
) {
|
||||
this.authService = authService;
|
||||
this.verification = verification;
|
||||
this.verifiedAccounts = verifiedAccounts;
|
||||
this.sessionTtlHours = sessionTtlHours;
|
||||
this.secureCookie = secureCookie;
|
||||
}
|
||||
@@ -67,10 +70,8 @@ public class AuthController {
|
||||
|
||||
@PostMapping("/auth/password-reset")
|
||||
public ResponseEntity<Void> resetPassword(@RequestBody PasswordResetRequest input,HttpServletRequest request) {
|
||||
PasswordPolicy.validate(input.newPassword());
|
||||
String account = verification.consumeReset(input.account(), input.verificationCode());
|
||||
authService.resetPassword(account, input.newPassword(), meta(request));
|
||||
return ResponseEntity.noContent().build();
|
||||
verifiedAccounts.resetPassword(input.account(), input.verificationCode(), input.newPassword(), meta(request));
|
||||
return ResponseEntity.noContent().header(HttpHeaders.SET_COOKIE, sessionCookie("", Duration.ZERO).toString()).build();
|
||||
}
|
||||
|
||||
public record InvitationRequest(String label, Integer maxUses, OffsetDateTime expiresAt) {}
|
||||
@@ -103,10 +104,8 @@ public class AuthController {
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response
|
||||
) {
|
||||
PasswordPolicy.validate(input.password());
|
||||
verification.consume(input.account(),input.verificationCode());
|
||||
AuthService.AuthResult result = authService.register(
|
||||
input.invitationCode(), input.account(), input.password(), input.displayName(), meta(request)
|
||||
AuthService.AuthResult result = verifiedAccounts.register(
|
||||
input.invitationCode(), input.account(), input.password(), input.displayName(), input.verificationCode(), meta(request)
|
||||
);
|
||||
response.addHeader(HttpHeaders.SET_COOKIE, sessionCookie(result.token(), null).toString());
|
||||
return ResponseEntity.status(HttpStatus.CREATED).body(Map.of("user", result.user()));
|
||||
|
||||
Reference in new issue
Block a user