Skip to content

Fix #5294 构建不包含 Microsoft OAuth App 密钥时，微软登录对话框显示为空 #5297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CiiLu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #5294 构建不包含 Microsoft OAuth App 密钥时，微软登录对话框显示为空 #5297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/account/CreateAccountPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,18 +279,21 @@ private void initDetailsPane() {
if (detailsPane != null) {
btnAccept.disableProperty().unbind();
detailsContainer.getChildren().remove(detailsPane);
btnAccept.setDisable(false);
lblErrorMessage.setText("");
lblErrorMessage.setVisible(true);
}

if (factory == Accounts.FACTORY_MICROSOFT) {
VBox vbox = new VBox(8);
detailsPane = vbox;
detailsContainer.getChildren().add(detailsPane);

if (Accounts.OAUTH_CALLBACK.getClientId().isEmpty()) {
HintPane hintPane = new HintPane(MessageDialogPane.MessageType.WARNING);
hintPane.setSegment(i18n("account.methods.microsoft.snapshot"));
vbox.getChildren().add(hintPane);
btnAccept.setDisable(true);
return;
}

Expand Down Expand Up @@ -368,8 +371,6 @@ private void initDetailsPane() {
detailsPane = new AccountDetailsInputPane(factory, btnAccept::fire);
btnAccept.disableProperty().bind(((AccountDetailsInputPane) detailsPane).validProperty().not());
}
Copy link

Copilot AI Jan 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

initDetailsPane() no longer adds detailsPane to detailsContainer for non-Microsoft factories. The only remaining detailsContainer.getChildren().add(detailsPane) call is inside the Microsoft branch, so selecting any other login method will leave the details area empty.

Suggested fix: re-add detailsPane to detailsContainer in the else branch (after creating/binding AccountDetailsInputPane), or restore a single add-at-end with a guard to avoid double-adding while still handling the early-return case for missing Microsoft clientId.

Suggested change
}
}
if (detailsPane != null && !detailsContainer.getChildren().contains(detailsPane)) {
detailsContainer.getChildren().add(detailsPane);
}

Copilot uses AI. Check for mistakes.

detailsContainer.getChildren().add(detailsPane);
}

private static class AccountDetailsInputPane extends GridPane {
Expand Down
Loading