Skip to content

Commit ec37b32

Browse files
committed
feat(microsoft): copy device code instead of verification uri.
1 parent f893eee commit ec37b32

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,14 +270,15 @@ private void initDetailsPane() {
270270
HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
271271
FXUtils.onChangeAndOperate(deviceCode, deviceCode -> {
272272
if (deviceCode != null) {
273-
hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getUserCode()));
273+
FXUtils.copyText(deviceCode.getUserCode());
274+
hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getUserCode(), deviceCode.getVerificationUri()));
274275
} else {
275276
hintPane.setSegment(i18n("account.methods.microsoft.hint"));
276277
}
277278
});
278279
hintPane.setOnMouseClicked(e -> {
279280
if (deviceCode.get() != null) {
280-
FXUtils.copyText(deviceCode.get().getVerificationUri());
281+
FXUtils.copyText(deviceCode.get().getUserCode());
281282
}
282283
});
283284

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,15 @@ public OAuthAccountLoginDialog(OAuthAccount account, Consumer<AuthInfo> success,
4747
HintPane hintPane = new HintPane(MessageDialogPane.MessageType.INFO);
4848
FXUtils.onChangeAndOperate(deviceCode, deviceCode -> {
4949
if (deviceCode != null) {
50-
hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getUserCode()));
50+
FXUtils.copyText(deviceCode.getUserCode());
51+
hintPane.setSegment(i18n("account.methods.microsoft.manual", deviceCode.getUserCode(), deviceCode.getVerificationUri()));
5152
} else {
5253
hintPane.setSegment(i18n("account.methods.microsoft.hint"));
5354
}
5455
});
5556
hintPane.setOnMouseClicked(e -> {
5657
if (deviceCode.get() != null) {
57-
FXUtils.copyText(deviceCode.get().getVerificationUri());
58+
FXUtils.copyText(deviceCode.get().getUserCode());
5859
}
5960
});
6061

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ account.methods.microsoft.error.no_character=Account is missing a Minecraft Java
9797
account.methods.microsoft.error.unknown=Failed to log in. Microsoft respond with error code %d.
9898
account.methods.microsoft.logging_in=Logging in...
9999
account.methods.microsoft.hint=You should click "login" button, paste the device code shown here later and continue login process in newly opened browser window.
100-
account.methods.microsoft.manual=Your device code is <b>%s</b>. After clicking "login" button, you should finish authorization in the newly opened browser window. If the browser window failed to show, you can click here to copy the URL, and manually open it in your browser.
100+
account.methods.microsoft.manual=Your device code is <b>%1$s</b>, click here to copy. After clicking "login" button, you should finish authorization in the newly opened browser window. If the browser window failed to show, you can open %2$s manually.
101101
account.methods.microsoft.profile=Account Profile...
102102
account.methods.microsoft.snapshot=HMCL Snapshot version does not support Microsoft login.
103103
account.methods.microsoft.waiting_browser=Waiting for authorization in opened browser window...

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ account.methods.microsoft.error.no_character=該帳號沒有包含 Minecraft Jav
9797
account.methods.microsoft.error.unknown=登入失敗,錯誤碼:%d
9898
account.methods.microsoft.logging_in=登入中...
9999
account.methods.microsoft.hint=您需要點擊登錄按鈕,並在新打開的瀏覽器窗口中完成登錄,並輸入待會在此處顯示的設備代碼。
100-
account.methods.microsoft.manual=設備代碼為:<b>%s</b>若登錄頁面未能打開,您可以點擊此處複製連結,並手動在瀏覽器中打開網頁
100+
account.methods.microsoft.manual=設備代碼為:<b>%1$s</b>,已經幫你拷貝到剪切板中,如果未能黏貼,你可以點擊此處再複製一次。你需要在新打開的瀏覽器窗口中完成登錄,若登錄頁面未能打開,您手動在瀏覽器中打開網頁:%2$s
101101
account.methods.microsoft.profile=帳戶設置頁
102102
account.methods.microsoft.snapshot=HMCL 快照版不支持微软登录
103103
account.methods.microsoft.waiting_browser=等待在新打開的瀏覽器窗口中完成登入...

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ account.methods.microsoft.error.no_character=该帐户没有包含 Minecraft Jav
9797
account.methods.microsoft.error.unknown=登录失败,错误码:%d
9898
account.methods.microsoft.logging_in=登录中...
9999
account.methods.microsoft.hint=您需要点击登录按钮,并在新打开的浏览器窗口中完成登录,并输入待会在此处显示的设备代码。
100-
account.methods.microsoft.manual=设备代码为:<b>%s</b>若登录页面未能打开,您可以点击此处复制链接,并手动在浏览器中打开网页
100+
account.methods.microsoft.manual=设备代码为:<b>%1$s</b>,已经帮你拷贝到剪切板中,如果未能粘贴,你可以点击此处再复制一次。你需要在新打开的浏览器窗口中完成登录,若登录页面未能打开,您手动在浏览器中打开网页:%2$s
101101
account.methods.microsoft.profile=帐户设置页
102102
account.methods.microsoft.snapshot=HMCL 快照版不支持微软登录
103103
account.methods.microsoft.waiting_browser=等待在新打开的浏览器窗口中完成登录...

0 commit comments

Comments
 (0)