fix: 登录皮肤站后自动认证默认玩家,修复创建实例误报需要登录
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
Axolotl desktop CI / guardrails (push) Has been cancelled
Axolotl desktop CI / desktop (macos-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (ubuntu-latest) (push) Has been cancelled
Axolotl desktop CI / desktop (windows-latest) (push) Has been cancelled
Axolotl desktop CI / website (push) Has been cancelled
Repository checks / typos (push) Has been cancelled
Repository checks / tombi (push) Has been cancelled
Rust checks / shear (push) Has been cancelled
Sync source to CNB / Sync Git ref (push) Has been cancelled
- requireHostedGameAccount 在无游戏账户但皮肤站已登录时,自动认证第一个非 Mojang 玩家 - 新增测试覆盖该自动认证流程
This commit is contained in:
1 parent
214066ae5f
commit
91e63fdb2c
2 files changed
+139
-3
No files matched your search
@@ -2,10 +2,13 @@ import { invoke } from '@tauri-apps/api/core'
|
||||
|
||||
import {
|
||||
requestSkinSiteDownloadToken,
|
||||
requestSkinSitePlayers,
|
||||
skinSitePlayers,
|
||||
skinSiteStatus,
|
||||
skinSiteUser,
|
||||
waitForSkinSiteSession,
|
||||
} from '../composables/skin-site-session.ts'
|
||||
import { authenticateInstancePlayer } from './instance-player.ts'
|
||||
|
||||
export const HOSTED_ACCOUNT_REQUIRED_MESSAGE = '您需要登录正版或皮肤站账号后才能操作'
|
||||
|
||||
@@ -24,10 +27,36 @@ function startHostedPackAttempt(instanceId: string) {
|
||||
}
|
||||
|
||||
export async function requireHostedGameAccount(): Promise<void> {
|
||||
const available = await invokeHosted<boolean>('plugin:install|hosted_has_game_account')
|
||||
if (!available) {
|
||||
throw new Error(HOSTED_ACCOUNT_REQUIRED_MESSAGE)
|
||||
if (await invokeHosted<boolean>('plugin:install|hosted_has_game_account')) return
|
||||
|
||||
// No game credential yet, but a signed-in skin site already lists the
|
||||
// user's players. Authenticate the first one automatically so the user
|
||||
// does not have to pick a player manually before creating an instance.
|
||||
await waitForSkinSiteSession()
|
||||
if (skinSiteStatus.value === 'signed-in' && skinSiteUser.value) {
|
||||
if (skinSitePlayers.value.length === 0) {
|
||||
await requestSkinSitePlayers().catch(() => {})
|
||||
}
|
||||
const player =
|
||||
skinSitePlayers.value.find((candidate) => !candidate.isMojang) ?? skinSitePlayers.value[0]
|
||||
if (player) {
|
||||
try {
|
||||
await authenticateInstancePlayer({
|
||||
id: player.uuid,
|
||||
name: player.name,
|
||||
account_type: 'yggdrasil',
|
||||
skin_site_user: skinSiteUser.value.uuid,
|
||||
})
|
||||
} catch {
|
||||
// Fall through to the login-required error below.
|
||||
}
|
||||
if (await invokeHosted<boolean>('plugin:install|hosted_has_game_account')) {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
throw new Error(HOSTED_ACCOUNT_REQUIRED_MESSAGE)
|
||||
}
|
||||
|
||||
export function clearHostedSession(): Promise<void> {
|
||||
|
||||
Reference in new issue
Block a user