修复(半自动履约): 登录取得CK后允许注入浏览器
This commit is contained in:
@@ -49,6 +49,7 @@ import type { UploadedFile } from '@/types/worker-platform'
|
||||
import { formatAdminDateTime } from '@/utils/admin-time'
|
||||
import { buildCustomerFulfillmentPath } from '@/utils/customer-fulfillment-link'
|
||||
import { resolvePostInjectionUrl } from '@/utils/semi-auto-injection'
|
||||
import { canCompleteSemiAutoTask, canInjectSemiAutoBrowser } from '@/utils/semi-auto-task-readiness'
|
||||
|
||||
const { Text } = Typography
|
||||
|
||||
@@ -567,7 +568,7 @@ export default function AdminSemiAutoTasksPage() {
|
||||
<Button
|
||||
size="small"
|
||||
icon={<ChromeOutlined />}
|
||||
disabled={!taskCanUseCredential(task)}
|
||||
disabled={!canInjectSemiAutoBrowser(task)}
|
||||
loading={injectionMutation.isPending}
|
||||
onClick={() => startInjection(task)}
|
||||
>
|
||||
@@ -607,7 +608,7 @@ export default function AdminSemiAutoTasksPage() {
|
||||
size="small"
|
||||
type="primary"
|
||||
icon={<CheckCircleOutlined />}
|
||||
disabled={!taskCanUseCredential(task)}
|
||||
disabled={!canCompleteSemiAutoTask(task)}
|
||||
onClick={() => openComplete(task)}
|
||||
>
|
||||
完成
|
||||
@@ -864,7 +865,7 @@ export default function AdminSemiAutoTasksPage() {
|
||||
</Button>
|
||||
<Button
|
||||
icon={<ChromeOutlined />}
|
||||
disabled={!taskCanUseCredential(detail.task)}
|
||||
disabled={!canInjectSemiAutoBrowser(detail.task)}
|
||||
loading={injectionMutation.isPending}
|
||||
onClick={() => startInjection(detail.task)}
|
||||
>
|
||||
@@ -987,13 +988,3 @@ function taskNeedsCustomerReauth(task: SemiAutoTask) {
|
||||
task.loginStatus === 'expired'
|
||||
)
|
||||
}
|
||||
|
||||
function taskCanUseCredential(task: SemiAutoTask) {
|
||||
return (
|
||||
task.loginStatus === 'authenticated' &&
|
||||
(!task.bindingPolicy.bindingRequired || task.bindingStatus === 'confirmed') &&
|
||||
task.credentialReady &&
|
||||
task.credentialStatus !== 'invalid' &&
|
||||
task.credentialStatus !== 'error'
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
import type { SemiAutoTask } from '@/types/admin/semi-auto'
|
||||
|
||||
type SemiAutoReadinessTask = Pick<
|
||||
SemiAutoTask,
|
||||
| 'platform'
|
||||
| 'loginStatus'
|
||||
| 'bindingPolicy'
|
||||
| 'bindingStatus'
|
||||
| 'credentialReady'
|
||||
| 'credentialStatus'
|
||||
>
|
||||
|
||||
function hasUsableCredential(task: SemiAutoReadinessTask) {
|
||||
return (
|
||||
task.loginStatus === 'authenticated' &&
|
||||
task.credentialReady &&
|
||||
task.credentialStatus !== 'invalid' &&
|
||||
task.credentialStatus !== 'error'
|
||||
)
|
||||
}
|
||||
|
||||
/** 注入只依赖登录成功和可用 CK,角色绑定留给客服在浏览器内协助完成。 */
|
||||
export function canInjectSemiAutoBrowser(task: SemiAutoReadinessTask) {
|
||||
return hasUsableCredential(task)
|
||||
}
|
||||
|
||||
/** 完成履约仍必须满足平台角色绑定策略。 */
|
||||
export function canCompleteSemiAutoTask(task: SemiAutoReadinessTask) {
|
||||
return (
|
||||
hasUsableCredential(task) &&
|
||||
(!task.bindingPolicy.bindingRequired || task.bindingStatus === 'confirmed')
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
import assert from 'node:assert/strict'
|
||||
import { readFileSync } from 'node:fs'
|
||||
import { dirname, join } from 'node:path'
|
||||
import { fileURLToPath } from 'node:url'
|
||||
import test from 'node:test'
|
||||
|
||||
import {
|
||||
canCompleteSemiAutoTask,
|
||||
canInjectSemiAutoBrowser,
|
||||
} from '../src/utils/semi-auto-task-readiness.ts'
|
||||
|
||||
const root = dirname(fileURLToPath(import.meta.url))
|
||||
const adminPage = readFileSync(join(root, '../src/pages/admin/AdminSemiAutoTasksPage.tsx'), 'utf8')
|
||||
|
||||
const baseTask = {
|
||||
platform: 'huya' as const,
|
||||
loginStatus: 'authenticated',
|
||||
bindingPolicy: {
|
||||
bindingRequired: true,
|
||||
},
|
||||
bindingStatus: 'role_ready',
|
||||
credentialReady: true,
|
||||
credentialStatus: 'valid' as const,
|
||||
}
|
||||
|
||||
test('虎牙和微博登录并取得 CK 后即可注入浏览器', () => {
|
||||
for (const platform of ['huya', 'weibo'] as const) {
|
||||
assert.equal(canInjectSemiAutoBrowser({ ...baseTask, platform }), true)
|
||||
}
|
||||
assert.equal(canInjectSemiAutoBrowser({ ...baseTask, bindingStatus: 'not_started' }), true)
|
||||
})
|
||||
|
||||
test('没有可用 CK 时不能注入浏览器', () => {
|
||||
assert.equal(canInjectSemiAutoBrowser({ ...baseTask, credentialReady: false }), false)
|
||||
assert.equal(canInjectSemiAutoBrowser({ ...baseTask, loginStatus: 'waiting_login' }), false)
|
||||
assert.equal(canInjectSemiAutoBrowser({ ...baseTask, credentialStatus: 'invalid' }), false)
|
||||
assert.equal(canInjectSemiAutoBrowser({ ...baseTask, credentialStatus: 'error' }), false)
|
||||
})
|
||||
|
||||
test('完成履约仍要求必要的角色绑定已确认', () => {
|
||||
assert.equal(canCompleteSemiAutoTask(baseTask), false)
|
||||
assert.equal(canCompleteSemiAutoTask({ ...baseTask, bindingStatus: 'confirmed' }), true)
|
||||
assert.equal(
|
||||
canCompleteSemiAutoTask({
|
||||
...baseTask,
|
||||
bindingPolicy: { bindingRequired: false },
|
||||
bindingStatus: 'not_started',
|
||||
}),
|
||||
true,
|
||||
)
|
||||
})
|
||||
|
||||
test('注入按钮和完成按钮使用各自的门槛', () => {
|
||||
assert.equal(adminPage.match(/disabled=\{!canInjectSemiAutoBrowser\(/g)?.length, 2)
|
||||
assert.equal(adminPage.match(/disabled=\{!canCompleteSemiAutoTask\(/g)?.length, 1)
|
||||
assert.ok(!adminPage.includes('function taskCanUseCredential('))
|
||||
})
|
||||
Reference in New Issue
Block a user