Skip to content
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

Jump to bottom

微软登录设备代码流 #3940

Merged
merged 11 commits into from
Sep 21, 2024
Merged

微软登录设备代码流 #3940

merged 11 commits into from
Sep 21, 2024

Conversation

Pigeon0v0
Copy link
Collaborator

@Pigeon0v0 Pigeon0v0 commented Jun 1, 2024 •
edited
Loading

Close #122 （关联投票 #127 ）
同时移除了之前的浏览器验证方式（设备代码流更加灵活，可以直接替换，且理解成本应该不高）

需要在 ModLaunch.vb Ln 501 添加 ClientID 才可以正常使用，也因此在“开源版本提示”中新增了一条提示
可能写的有点屎，龙猫自己改改罢（

@Pigeon0v0 Pigeon0v0 added the 等待确认 已经过社区确认，等待开发者确认 label Jun 1, 2024
@LTCatt LTCatt added 处理中 开发者正在调查或处理该项 🟥 高 优先度：高 and removed 等待确认 已经过社区确认，等待开发者确认 labels Jun 1, 2024
@Pigeon0v0
Copy link
Collaborator Author

在显示设备代码的弹窗倒是还可以考虑放俩按钮，让用户能手动复制一下验证网址和设备代码...

@Pigeon0v0
Copy link
Collaborator Author

考虑了一下还是不加了，这个网址手打应该没啥难度...

@allMagicNB
Copy link
Contributor

allMagicNB commented Jun 30, 2024 •
edited
Loading

考虑了一下还是不加了，这个网址手打应该没啥难度...

我觉得你应该要考虑到超级巨婴小白的感受。

@LTCatt LTCatt added 🟦 推迟 and removed 🟥 高 优先度：高 labels Jul 4, 2024
@LTCatt
Copy link
Member

LTCatt commented Jul 9, 2024

预期在 2.8.3 合并 :D

@allMagicNB allMagicNB mentioned this pull request Jul 11, 2024
Merged
@LTCatt LTCatt added 🟥 高 优先度：高 and removed 🟦 推迟 labels Jul 11, 2024
@Deep-Dark-Forest
Copy link
Collaborator

已经 2.8.3 了（

#4234 (reply in thread)

3gf8jv4dv
3gf8jv4dv suggested changes Jul 17, 2024
View reviewed changes
Copy link
Collaborator

@3gf8jv4dv 3gf8jv4dv left a comment

Choose a reason for hiding this comment

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

在显示设备代码的弹窗倒是还可以考虑放俩按钮，让用户能手动复制一下验证网址和设备代码...

I personally think these features are very useful. Sometimes or some users/players may have trouble typing. If you need to use another device (such as a mobile phone), you can quickly forward it to this device through other software, and then visit website and paste the code directly.

Elsewhere, during the second stage of login, I'm a little curious whether the launcher will automatically stop the process if no action is performed for a long time (visiting www.microsoft.com/link). At least I left the launcher idle for several minutes and still got stuck at 20%.

@allMagicNB
Copy link
Contributor

allMagicNB commented Jul 17, 2024 •
edited
Loading

In fact, Microsoft, on its part, will give an expiration time. (

@allMagicNB
Copy link
Contributor

image
？？？难绷
应该是我的网络问题（

你没 client_id 就别试了。

@Pigeon0v0
Copy link
Collaborator Author

@3gf8jv4dv Have a try :)

3gf8jv4dv
3gf8jv4dv approved these changes Jul 18, 2024
View reviewed changes
Copy link
Collaborator

@3gf8jv4dv 3gf8jv4dv left a comment

Choose a reason for hiding this comment

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

Good.

@Pigeon0v0
Copy link
Collaborator Author

所以这边下个版本能合吗...？

@allMagicNB
Copy link
Contributor

一周=一个周期（

@LTCatt
Copy link
Member

LTCatt commented Aug 12, 2024

Close #4333

@LTCatt LTCatt linked an issue Aug 12, 2024 that may be closed by this pull request
启动器在 access_token 过期后启动游戏不会刷新 access_token #4333
Closed
1 task
@LTCatt
Copy link
Member

LTCatt commented Aug 14, 2024

已经半个月了麻将还是没有回，下个版本只能没有这个功能了 orz

@tangge233
Copy link
Contributor

已经半个月了麻将还是没有回，下个版本只能没有这个功能了 orz

https://learn.microsoft.com/zh-cn/entra/identity-platform/v2-oauth2-device-code
好像不是给 Mojang 申请的样子（

@LTCatt
Copy link
Member

LTCatt commented Aug 14, 2024

已经半个月了麻将还是没有回，下个版本只能没有这个功能了 orz

https://learn.microsoft.com/zh-cn/entra/identity-platform/v2-oauth2-device-code 好像不是给 Mojang 申请的样子（

https://aka.ms/mce-reviewappid

@EncVar
Copy link

EncVar commented Aug 18, 2024

在麻将要求之前申请的Azure app可以不用给麻将提交审核
自己申请的azure app需要在身份验证栏最底下打开 允许公共客户端流 才能使用

@zkitefly zkitefly mentioned this pull request Aug 18, 2024
Open
@allMagicNB
Copy link
Contributor

怎么又有冲突……

@allMagicNB
Copy link
Contributor

事实上龙猫已经合了，只不过在注释（

@LTCatt LTCatt added the 🚫 阻碍者 它导致了其他项无法继续 label Aug 30, 2024
@LTCatt LTCatt mentioned this pull request Aug 30, 2024
Closed
1 task
@LTCatt
Copy link
Member

LTCatt commented Aug 31, 2024

看起来麻将不打算理我的申请了……如果谁有能用的 APP ID 可以私聊发一下 orz
QQ 1043137532

@LTCatt LTCatt added 需要社区帮助 开发者无法处理，需要社区提供帮助 and removed 第三方 等待第三方处理，或是由第三方导致 labels Aug 31, 2024
@LTCatt
Copy link
Member

LTCatt commented Aug 31, 2024

已经有啦，多谢大家！

@LTCatt LTCatt added 处理中 开发者正在调查或处理该项 and removed 需要社区帮助 开发者无法处理，需要社区提供帮助 labels Aug 31, 2024
@allMagicNB
Copy link
Contributor

看起来麻将不打算理我的申请了……如果谁有能用的 APP ID 可以私聊发一下 orz
QQ 1043137532

@LTCatt 没有回应 ≠ 不能使用，我的申请也是没有回复但尝试后发现已解除限制。

@LTCatt
Copy link
Member

LTCatt commented Sep 21, 2024 •
edited
Loading

如果使用 ?otc=UserCode，只有 HMCL 可以正常访问：
image

而大家发给我的 ClientId 全都报错：
image

我没有找到任何关于这个参数的文档，谁有什么相关信息吗？为啥只有 HMCL 可以用这个参数？
@zkitefly 是在哪看到的这个参数……

@3gf8jv4dv
Copy link
Collaborator

Just tested it, Prism Launcher can also use this parameter.

Another discovery is that appending a different code than the one provided by HMCL / Prism Launcher after ?otc= will result in the exact same error.

@Pigeon0v0
Copy link
Collaborator Author

这可能和 Azure 那边的设置有关吧，需要研究一下

@LTCatt LTCatt merged commit 49fe406 into Hex-Dragon:main Sep 21, 2024
5 checks passed
@LTCatt LTCatt removed a link to an issue Sep 21, 2024
启动器在 access_token 过期后启动游戏不会刷新 access_token #4333
Closed
1 task
@LTCatt LTCatt added 完成 已被处理，将在下次更新之后生效 and removed 处理中 开发者正在调查或处理该项 🚫 阻碍者 它导致了其他项无法继续 labels Sep 21, 2024
@Pigeon0v0 Pigeon0v0 deleted the auth branch September 22, 2024 01:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JingHai-Lingyun JingHai-Lingyun JingHai-Lingyun left review comments

@3gf8jv4dv 3gf8jv4dv 3gf8jv4dv requested changes

@LTCatt LTCatt Awaiting requested review from LTCatt

Assignees
No one assigned
Labels
· 新功能 完成 已被处理，将在下次更新之后生效 🟥 高 优先度：高
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

优化微软登录，以实现安全登录与在浏览器中登录
9 participants
@Pigeon0v0 @allMagicNB @LTCatt @Deep-Dark-Forest @zkitefly @3gf8jv4dv @tangge233 @EncVar @JingHai-Lingyun