Ecosystem/haveno
Ecosystem/haveno
2
1
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-12-22 19:49:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

accountService.changePassword() requires old and new password

Browse source
This commit is contained in:
woodser 2023-02-21 10:54:59 -05:00
parent 86511b4e21
commit 55650c495b
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/main/java/bisq/core/api/CoreAccountService.java
View file

@ -35,6 +35,9 @@ import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import org.apache.commons.lang3.StringUtils;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -111,13 +114,13 @@ public class CoreAccountService {
} }
} }
public void changePassword(String password) { public void changePassword(String oldPassword, String newPassword) {
if (!isAccountOpen()) throw new IllegalStateException("Cannot change password on unopened account"); if (!isAccountOpen()) throw new IllegalStateException("Cannot change password on unopened account");
String oldPassword = this.password; if (!StringUtils.equals(this.password, oldPassword)) throw new IllegalStateException("Incorrect password");
keyStorage.saveKeyRing(keyRing, oldPassword, password); keyStorage.saveKeyRing(keyRing, oldPassword, newPassword);
this.password = password; this.password = newPassword;
synchronized (listeners) { synchronized (listeners) {
for (AccountServiceListener listener : listeners) listener.onPasswordChanged(oldPassword, password); for (AccountServiceListener listener : listeners) listener.onPasswordChanged(oldPassword, newPassword);
} }
} }

4
core/src/main/java/bisq/core/api/CoreApi.java
View file

@ -169,8 +169,8 @@ public class CoreApi {
return appStartupState.isApplicationFullyInitialized(); return appStartupState.isApplicationFullyInitialized();
} }
public void changePassword(String password) { public void changePassword(String oldPassword, String newPassword) {
coreAccountService.changePassword(password); coreAccountService.changePassword(oldPassword, newPassword);
} }
public void closeAccount() { public void closeAccount() {

2
daemon/src/main/java/bisq/daemon/grpc/GrpcAccountService.java
View file

@ -145,7 +145,7 @@ public class GrpcAccountService extends AccountImplBase {
@Override @Override
public void changePassword(ChangePasswordRequest req, StreamObserver<ChangePasswordReply> responseObserver) { public void changePassword(ChangePasswordRequest req, StreamObserver<ChangePasswordReply> responseObserver) {
try { try {
coreApi.changePassword(req.getPassword()); coreApi.changePassword(req.getOldPassword(), req.getNewPassword());
var reply = ChangePasswordReply.newBuilder().build(); var reply = ChangePasswordReply.newBuilder().build();
responseObserver.onNext(reply); responseObserver.onNext(reply);
responseObserver.onCompleted(); responseObserver.onCompleted();

3
proto/src/main/proto/grpc.proto
View file

@ -119,7 +119,8 @@ message IsAppInitializedReply {
} }
message ChangePasswordRequest { message ChangePasswordRequest {
string password = 1; string old_password = 1;
string new_password = 2;
} }
message ChangePasswordReply { message ChangePasswordReply {