优化微软登录页面

HMCL/src/main/java/org/jackhuang/hmcl/game/OAuthServer.java

@@ -152,6 +152,12 @@ public void grantDeviceCode(String userCode, String verificationURI) {
         @Override
         public void openBrowser(String url) throws IOException {
             lastlyOpenedURL = url;
+
+            try {
+                Thread.sleep(3000);
+            } catch (InterruptedException ignored) {
+            }
+
             FXUtils.openLink(url);
 
             onOpenBrowser.fireEvent(new OpenBrowserEvent(this, url));

HMCL/src/main/java/org/jackhuang/hmcl/setting/Accounts.java

@@ -465,7 +465,7 @@ public static String localizeErrorMessage(Exception exception) {
         } else if (exception instanceof MicrosoftService.NoMinecraftJavaEditionProfileException) {
             return i18n("account.methods.microsoft.error.no_character");
         } else if (exception instanceof MicrosoftService.NoXuiException) {
-            return i18n("account.methods.microsoft.error.add_family_probably");
+            return i18n("account.methods.microsoft.error.add_family");
         } else if (exception instanceof OAuthServer.MicrosoftAuthenticationNotSupportedException) {
             return i18n("account.methods.microsoft.snapshot");
         } else if (exception instanceof OAuthAccount.WrongAccountException) {

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/CreateAccountPane.java

@@ -35,8 +35,6 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.*;
-
-import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.AccountFactory;
 import org.jackhuang.hmcl.auth.CharacterSelector;
 import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
@@ -65,11 +63,7 @@
 import org.jackhuang.hmcl.util.javafx.BindingMapping;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.regex.Pattern;
 
@@ -287,72 +281,95 @@ private void initDetailsPane() {
             btnAccept.disableProperty().unbind();
             detailsContainer.getChildren().remove(detailsPane);
             lblErrorMessage.setText("");
+            lblErrorMessage.setVisible(true);
         }
+
         if (factory == Accounts.FACTORY_MICROSOFT) {
             VBox vbox = new VBox(8);
-            if (!Accounts.OAUTH_CALLBACK.getClientId().isEmpty()) {
-                HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
-                FXUtils.onChangeAndOperate(deviceCode, deviceCode -> {
-                    if (deviceCode != null) {
-                        FXUtils.copyText(deviceCode.getUserCode());
-                        hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getUserCode(), deviceCode.getVerificationUri()));
-                    } else {
-                        hintPane.setSegment(i18n("account.methods.microsoft.hint"));
-                    }
-                });
-                FXUtils.onClicked(hintPane, () -> {
-                    if (deviceCode.get() != null) {
-                        FXUtils.copyText(deviceCode.get().getUserCode());
-                    }
-                });
-
-                holder.add(Accounts.OAUTH_CALLBACK.onGrantDeviceCode.registerWeak(value -> {
-                    runInFX(() -> deviceCode.set(value));
-                }));
-                FlowPane box = new FlowPane();
-                box.setHgap(8);
-                JFXHyperlink birthLink = new JFXHyperlink(i18n("account.methods.microsoft.birth"));
-                birthLink.setExternalLink("https://support.microsoft.com/account-billing/837badbc-999e-54d2-2617-d19206b9540a");
-                JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
-                profileLink.setExternalLink("https://account.live.com/editprof.aspx");
-                JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
-                purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
-                JFXHyperlink deauthorizeLink = new JFXHyperlink(i18n("account.methods.microsoft.deauthorize"));
-                deauthorizeLink.setExternalLink("https://account.live.com/consent/Edit?client_id=000000004C794E0A");
-                JFXHyperlink forgotpasswordLink = new JFXHyperlink(i18n("account.methods.forgot_password"));
-                forgotpasswordLink.setExternalLink("https://account.live.com/ResetPassword.aspx");
-                JFXHyperlink createProfileLink = new JFXHyperlink(i18n("account.methods.microsoft.makegameidsettings"));
-                createProfileLink.setExternalLink("https://www.minecraft.net/msaprofile/mygames/editprofile");
-                JFXHyperlink bannedQueryLink = new JFXHyperlink(i18n("account.methods.ban_query"));
-                bannedQueryLink.setExternalLink("https://enforcement.xbox.com/enforcement/showenforcementhistory");
-                box.getChildren().setAll(profileLink, birthLink, purchaseLink, deauthorizeLink, forgotpasswordLink, createProfileLink, bannedQueryLink);
-                GridPane.setColumnSpan(box, 2);
-
-                if (!IntegrityChecker.isOfficial()) {
-                    HintPane unofficialHint = new HintPane(MessageDialogPane.MessageType.WARNING);
-                    unofficialHint.setText(i18n("unofficial.hint"));
-                    vbox.getChildren().add(unofficialHint);
-                }
-
-                vbox.getChildren().addAll(hintPane, box);
+            detailsPane = vbox;
 
-                btnAccept.setDisable(false);
-            } else {
+            if (Accounts.OAUTH_CALLBACK.getClientId().isEmpty()) {
                 HintPane hintPane = new HintPane(MessageDialogPane.MessageType.WARNING);
                 hintPane.setSegment(i18n("account.methods.microsoft.snapshot"));
+                vbox.getChildren().add(hintPane);
+                return;
+            }
 
-                JFXHyperlink officialWebsite = new JFXHyperlink(i18n("account.methods.microsoft.snapshot.website"));
-                officialWebsite.setExternalLink(Metadata.PUBLISH_URL);
-
-                vbox.getChildren().setAll(hintPane, officialWebsite);
-                btnAccept.setDisable(true);
+            if (!IntegrityChecker.isOfficial()) {
+                HintPane hintPane = new HintPane(MessageDialogPane.MessageType.WARNING);
+                hintPane.setSegment(i18n("unofficial.hint"));
+                vbox.getChildren().add(hintPane);
             }
 
-            detailsPane = vbox;
+            VBox codeBox = new VBox(8);
+            Label hint = new Label(i18n("account.methods.microsoft.code"));
+            Label code = new Label();
+            code.setMouseTransparent(true);
+            code.setStyle("-fx-font-size: 24");
+            codeBox.getChildren().addAll(hint, code);
+            codeBox.setAlignment(Pos.CENTER);
+            vbox.getChildren().add(codeBox);
+
+            HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
+            HintPane errHintPane = new HintPane(MessageDialogPane.MessageType.ERROR);
+            errHintPane.setVisible(false);
+            errHintPane.setManaged(false);
+
+            codeBox.setVisible(false);
+            codeBox.setManaged(false);
+
+            FXUtils.onChangeAndOperate(deviceCode, deviceCode -> {
+                if (deviceCode != null) {
+                    FXUtils.copyText(deviceCode.getUserCode());
+                    code.setText(deviceCode.getUserCode());
+                    hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getVerificationUri()));
+                    codeBox.setVisible(true);
+                    codeBox.setManaged(true);
+                } else {
+                    hintPane.setSegment(i18n("account.methods.microsoft.hint"));
+                    codeBox.setVisible(false);
+                    codeBox.setManaged(false);
+                }
+            });
+
+            lblErrorMessage.setVisible(false);
+            lblErrorMessage.textProperty().addListener((obs, oldVal, newVal) -> {
+                boolean hasError = !newVal.isEmpty();
+                errHintPane.setSegment(newVal);
+                errHintPane.setVisible(hasError);
+                errHintPane.setManaged(hasError);
+                hintPane.setVisible(!hasError);
+                hintPane.setManaged(!hasError);
+                codeBox.setVisible(!hasError && deviceCode.get() != null);
+                codeBox.setManaged(!hasError && deviceCode.get() != null);
+            });
+
+            FXUtils.onClicked(codeBox, () -> {
+                if (deviceCode.get() != null) FXUtils.copyText(deviceCode.get().getUserCode());
+            });
+
+            holder.add(Accounts.OAUTH_CALLBACK.onGrantDeviceCode.registerWeak(value ->
+                    runInFX(() -> deviceCode.set(value))
+            ));
+
+            HBox linkBox = new HBox();
+            JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
+            profileLink.setExternalLink("https://account.live.com/editprof.aspx");
+            JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
+            purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
+            JFXHyperlink deauthorizeLink = new JFXHyperlink(i18n("account.methods.microsoft.deauthorize"));
+            deauthorizeLink.setExternalLink("https://account.live.com/consent/Edit?client_id=000000004C794E0A");
+            JFXHyperlink forgotpasswordLink = new JFXHyperlink(i18n("account.methods.forgot_password"));
+            forgotpasswordLink.setExternalLink("https://account.live.com/ResetPassword.aspx");
+            linkBox.getChildren().setAll(profileLink, purchaseLink, deauthorizeLink, forgotpasswordLink);
+
+            vbox.getChildren().addAll(hintPane, errHintPane, linkBox);
+            btnAccept.setDisable(false);
         } else {
             detailsPane = new AccountDetailsInputPane(factory, btnAccept::fire);
             btnAccept.disableProperty().bind(((AccountDetailsInputPane) detailsPane).validProperty().not());
         }
+
         detailsContainer.getChildren().add(detailsPane);
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/OAuthAccountLoginDialog.java

@@ -66,11 +66,11 @@ public OAuthAccountLoginDialog(OAuthAccount account, Consumer<AuthInfo> success,
 
         HBox box = new HBox(8);
         JFXHyperlink birthLink = new JFXHyperlink(i18n("account.methods.microsoft.birth"));
-        birthLink.setOnAction(e -> FXUtils.openLink("https://support.microsoft.com/account-billing/how-to-change-a-birth-date-on-a-microsoft-account-837badbc-999e-54d2-2617-d19206b9540a"));
+        birthLink.setExternalLink("https://support.microsoft.com/account-billing/how-to-change-a-birth-date-on-a-microsoft-account-837badbc-999e-54d2-2617-d19206b9540a");
         JFXHyperlink profileLink = new JFXHyperlink(i18n("account.methods.microsoft.profile"));
-        profileLink.setOnAction(e -> FXUtils.openLink("https://account.live.com/editprof.aspx"));
+        profileLink.setExternalLink("https://account.live.com/editprof.aspx");
         JFXHyperlink purchaseLink = new JFXHyperlink(i18n("account.methods.microsoft.purchase"));
-        purchaseLink.setOnAction(e -> FXUtils.openLink(YggdrasilService.PURCHASE_URL));
+        purchaseLink.setExternalLink(YggdrasilService.PURCHASE_URL);
         box.getChildren().setAll(profileLink, birthLink, purchaseLink);
         GridPane.setColumnSpan(box, 2);
 

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -99,31 +99,31 @@ account.methods=Login Type
 account.methods.authlib_injector=authlib-injector
 account.methods.microsoft=Microsoft
 account.methods.microsoft.birth=How to Change Your Account Birth Date
+account.methods.microsoft.code=Code (Copied to Clipboard)
 account.methods.microsoft.close_page=Microsoft account authorization is now completed.\n\
    \n\
    There are some extra works for us, but you can safely close this tab for now.
 account.methods.microsoft.deauthorize=Deauthorize
-account.methods.microsoft.error.add_family=An adult must add you to a family in order for you to play Minecraft because you are not yet 18 years old.
-account.methods.microsoft.error.add_family_probably=Please check if the age indicated in your account settings is at least 18 years old. If not and you believe this is an error, you can click "How to Change Your Account Birth Date" to learn how to change it.
+account.methods.microsoft.error.add_family=Please click <a href="https://support.microsoft.com/account-billing/837badbc-999e-54d2-2617-d19206b9540a">here</a> to change your account birth date to be over 18 years old, or add your account to a family.
 account.methods.microsoft.error.country_unavailable=Xbox Live is not available in your current country/region.
-account.methods.microsoft.error.missing_xbox_account=Your Microsoft account does not have a linked Xbox account yet. Please click "Create Profile / Edit Profile Name" to create one before continuing.
-account.methods.microsoft.error.no_character=Please ensure you have purchased Minecraft: Java Edition.\nIf you have already purchased the game, a profile may not have been created yet.\nClick "Create Profile / Edit Profile Name" to create it.
-account.methods.microsoft.error.banned=Your account may have been banned by Xbox Live.\nYou can click "Ban Query" for more details.
+account.methods.microsoft.error.missing_xbox_account=Your Microsoft account does not have a linked Xbox account yet. Please click <a href="https://www.minecraft.net/msaprofile/mygames/editprofile">here</a> to link one.
+account.methods.microsoft.error.no_character=Please confirm that you have purchased Minecraft: Java Edition.\n\
+  If you have already purchased it, a game profile may not have been created. Please click <a href="https://www.minecraft.net/msaprofile/mygames/editprofile">here</a> to create a game profile.
+account.methods.microsoft.error.banned=Your account may have been banned by Xbox Live.\n\
+  You can click <a href="https://enforcement.xbox.com/enforcement/showenforcementhistory">here</a> to check the ban status of your account.
 account.methods.microsoft.error.unknown=Failed to log in, error code: %d.
-account.methods.microsoft.error.wrong_verify_method=Please log in using your password on the Microsoft account login page, and do not use a verification code to log in.
+account.methods.microsoft.error.wrong_verify_method=Failed to log in. Please try logging into your account using PASSWORD instead of other login methods.
 account.methods.microsoft.logging_in=Logging in...
-account.methods.microsoft.hint=Please click "Log in" and copy the code displayed here to complete the login process in the browser window that opens.\n\
-   \n\
-   If the token used to log in to the Microsoft account is leaked, you can click "Deauthorize" to deauthorize it.
-account.methods.microsoft.manual=Your device code is <b>%1$s</b>. Please click here to copy.\n\
-   \n\
-   After clicking "Log in", you should complete the login process in the opened browser window. If that does not show up, you can navigate to %2$s manually.\n\
-   \n\
-   If the token used to log in to the Microsoft account is leaked, you can click "Deauthorize" to deauthorize it.
 account.methods.microsoft.makegameidsettings=Create Profile / Edit Profile Name
+account.methods.microsoft.hint=Click the "Log in" button to start adding your Microsoft account.
+account.methods.microsoft.manual=Please enter the code shown above on the pop-up webpage to complete the login.\n\
+  \n\
+  If the website fails to load, please open %s manually in your browser.\n\
+  \n\
+  <b>If your internet connection is bad, it may cause web pages to load slowly or fail to load altogether. You may try again later or switch to a different internet connection.</b>
 account.methods.microsoft.profile=Account Profile
 account.methods.microsoft.purchase=Buy Minecraft
-account.methods.microsoft.snapshot=You are using an unofficial build of HMCL. Please download the official build to log in.
+account.methods.microsoft.snapshot=You are using an unofficial build of HMCL. Please download the <a href="https://hmcl.huangyuhui.net/download">official build</a> to log in.
 account.methods.microsoft.snapshot.website=Official Website
 account.methods.offline=Offline
 account.methods.offline.name.special_characters=Use only letters, numbers, and underscores (max 16 chars)