Skip to content

Commit 77eea0a

Browse files
committed
Disallow login attempt if either username or password are not set
1 parent cb10531 commit 77eea0a

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

app/credentials-management/src/main/java/org/phoebus/applications/credentialsmanagement/CredentialsManagementController.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,16 @@ public void updateItem(StringProperty item, final boolean empty) {
384384
textField.getStyleClass().add("text-field-styling");
385385
textField.textProperty().bindBidirectional(getTableRow().getItem().username);
386386
textField.disableProperty().bind(getTableRow().getItem().userLoggedIn);
387+
ServiceItem serviceItem = getTableRow().getItem();
388+
textField.setOnKeyPressed(keyEvent -> {
389+
if (keyEvent.getCode() == KeyCode.ENTER &&
390+
!serviceItem.username.isNull().get() &&
391+
!serviceItem.username.get().isEmpty() &&
392+
!serviceItem.password.isNull().get() &&
393+
!serviceItem.password.get().isEmpty()) {
394+
CredentialsManagementController.this.login(serviceItem);
395+
}
396+
});
387397
setGraphic(textField);
388398
}
389399
}
@@ -405,9 +415,14 @@ protected void updateItem(StringProperty item, final boolean empty) {
405415
passwordField.setText(item.get() == null ? null : "dummypass"); // Hack to not reveal password length
406416
passwordField.textProperty().bindBidirectional(getTableRow().getItem().password);
407417
passwordField.disableProperty().bind(getTableRow().getItem().userLoggedIn);
418+
ServiceItem serviceItem = getTableRow().getItem();
408419
passwordField.setOnKeyPressed(keyEvent -> {
409-
if (keyEvent.getCode() == KeyCode.ENTER) {
410-
CredentialsManagementController.this.login(getTableRow().getItem());
420+
if (keyEvent.getCode() == KeyCode.ENTER &&
421+
!serviceItem.username.isNull().get() &&
422+
!serviceItem.username.get().isEmpty() &&
423+
!serviceItem.password.isNull().get() &&
424+
!serviceItem.password.get().isEmpty()) {
425+
CredentialsManagementController.this.login(serviceItem);
411426
}
412427
});
413428
setGraphic(passwordField);

0 commit comments

Comments
 (0)