Add Jin10 QR connection with cancellable login tasks
Store account credentials encrypted and bind QR tasks to administrator sessions. Report calendar access as awaiting validation after login. Prevent late polls and status responses from overwriting cancelled or newer operations, and clean up QR tasks when settings unmount. Cover authentication, cancellation races, and stale frontend responses.
This commit is contained in:
eezd committed
1 parent
5a991e3d29
commit
62d8c7eb65
14 files changed
+871
-1
No files matched your search
@@ -0,0 +1,18 @@
|
||||
import type * as Jin10 from "./type"
|
||||
import { request } from "@/http/axios"
|
||||
|
||||
export function getJin10Api() {
|
||||
return request<Jin10.Jin10Status>({ url: "/settings/jin10", method: "get" })
|
||||
}
|
||||
export function createJin10QrApi() {
|
||||
return request<Jin10.Jin10Qr>({ url: "/settings/jin10/qr", method: "post" })
|
||||
}
|
||||
export function pollJin10QrApi(id: string) {
|
||||
return request<Jin10.Jin10Poll>({ url: `/settings/jin10/qr/${id}/poll`, method: "post" })
|
||||
}
|
||||
export function cancelJin10QrApi(id: string) {
|
||||
return request<null>({ url: `/settings/jin10/qr/${id}`, method: "delete", notify: false })
|
||||
}
|
||||
export function disconnectJin10Api() {
|
||||
return request<null>({ url: "/settings/jin10", method: "delete" })
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
export interface Jin10Status {
|
||||
connected: boolean
|
||||
connected_at: string | null
|
||||
error: string | null
|
||||
sync_state: "awaiting_validation" | "disconnected"
|
||||
}
|
||||
export interface Jin10Qr {
|
||||
task_id: string
|
||||
image: string
|
||||
expires_at: string
|
||||
}
|
||||
export interface Jin10Poll {
|
||||
state: "pending" | "connected" | "expired"
|
||||
}
|
||||
@@ -0,0 +1,163 @@
|
||||
<script setup lang="ts">
|
||||
import type { Jin10Qr, Jin10Status } from "@@/apis/jin10/type"
|
||||
import { cancelJin10QrApi, createJin10QrApi, disconnectJin10Api, getJin10Api, pollJin10QrApi } from "@@/apis/jin10"
|
||||
import { useSessionScope } from "@@/composables/useSessionScope"
|
||||
import { useUserStore } from "@/pinia/stores/user"
|
||||
|
||||
const scope = useSessionScope()
|
||||
const user = useUserStore()
|
||||
const sessionVersion = user.sessionVersion
|
||||
const sameSession = () => sessionVersion === user.sessionVersion
|
||||
const status = ref<Jin10Status>()
|
||||
const qr = ref<Jin10Qr>()
|
||||
const visible = ref(false)
|
||||
const busy = ref(false)
|
||||
const state = ref("idle")
|
||||
const failed = ref(false)
|
||||
let generation = 0
|
||||
let statusRequest = 0
|
||||
let timer: ReturnType<typeof setTimeout> | undefined
|
||||
|
||||
async function load() {
|
||||
const request = ++statusRequest
|
||||
const current = generation
|
||||
try {
|
||||
const result = await getJin10Api()
|
||||
if (scope.isCurrent() && request === statusRequest && current === generation) {
|
||||
status.value = result
|
||||
failed.value = false
|
||||
}
|
||||
} catch {
|
||||
if (scope.isCurrent() && request === statusRequest && current === generation) failed.value = true
|
||||
}
|
||||
}
|
||||
function stop() {
|
||||
++generation
|
||||
clearTimeout(timer)
|
||||
const id = qr.value?.task_id
|
||||
qr.value = undefined
|
||||
if (id && sameSession()) void cancelJin10QrApi(id).catch(() => {})
|
||||
}
|
||||
async function poll(id: string, current: number) {
|
||||
if (!scope.isCurrent() || current !== generation || !visible.value) return
|
||||
try {
|
||||
const result = await pollJin10QrApi(id)
|
||||
if (!scope.isCurrent() || current !== generation || !visible.value) return
|
||||
state.value = result.state
|
||||
if (result.state === "pending") {
|
||||
timer = setTimeout(poll, 5000, id, current)
|
||||
} else {
|
||||
qr.value = undefined
|
||||
if (result.state === "connected") {
|
||||
visible.value = false
|
||||
const completed = generation
|
||||
await load()
|
||||
if (scope.isCurrent() && completed === generation) ElMessage.success("金十账号已连接，日历读取权限待核验")
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
if (scope.isCurrent() && current === generation) state.value = "error"
|
||||
}
|
||||
}
|
||||
async function start() {
|
||||
if (busy.value) return
|
||||
stop()
|
||||
const current = generation
|
||||
visible.value = true
|
||||
busy.value = true
|
||||
state.value = "loading"
|
||||
try {
|
||||
const result = await createJin10QrApi()
|
||||
if (!scope.isCurrent() || current !== generation || !visible.value) {
|
||||
if (sameSession()) await cancelJin10QrApi(result.task_id)
|
||||
return
|
||||
}
|
||||
qr.value = result
|
||||
state.value = "pending"
|
||||
timer = setTimeout(poll, 5000, result.task_id, current)
|
||||
} catch {
|
||||
if (scope.isCurrent() && current === generation) state.value = "error"
|
||||
} finally {
|
||||
if (scope.isCurrent()) busy.value = false
|
||||
}
|
||||
}
|
||||
async function disconnect() {
|
||||
if (busy.value) return
|
||||
const confirmed = generation
|
||||
await ElMessageBox.confirm("断开本项目的金十连接？已保存的日历历史会保留。", "断开连接")
|
||||
scope.assertCurrent()
|
||||
if (confirmed !== generation || busy.value) return
|
||||
stop()
|
||||
const current = generation
|
||||
busy.value = true
|
||||
try {
|
||||
await disconnectJin10Api()
|
||||
if (scope.isCurrent() && current === generation) await load()
|
||||
} finally {
|
||||
if (scope.isCurrent() && current === generation) busy.value = false
|
||||
}
|
||||
}
|
||||
onMounted(load)
|
||||
onBeforeUnmount(stop)
|
||||
watch(visible, (value) => {
|
||||
if (!value) stop()
|
||||
}, { flush: "sync" })
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<el-card shadow="never">
|
||||
<template #header>
|
||||
金十日历
|
||||
</template>
|
||||
<el-alert v-if="failed" title="连接状态读取失败" type="error" :closable="false" />
|
||||
<template v-else-if="status">
|
||||
<p>
|
||||
<el-tag :type="status.connected ? 'success' : 'info'">
|
||||
{{ status.connected ? "账号已连接" : "尚未连接" }}
|
||||
</el-tag>
|
||||
</p>
|
||||
<p>全球宏观数据、重要事件和假期。官方同口径数据优先，金十补充缺项。</p>
|
||||
<p v-if="status.connected">
|
||||
日历读取权限待核验；账号连接成功不代表日历同步已就绪。
|
||||
</p>
|
||||
<el-alert v-if="status.error" :title="status.error" type="warning" :closable="false" />
|
||||
<el-button type="primary" :loading="busy" @click="start">
|
||||
{{ status.connected ? "重新扫码" : "扫码连接金十" }}
|
||||
</el-button>
|
||||
<el-button v-if="status.connected" @click="disconnect">
|
||||
断开连接
|
||||
</el-button>
|
||||
</template>
|
||||
<el-button v-if="failed" @click="load">
|
||||
重试
|
||||
</el-button>
|
||||
<el-dialog v-model="visible" title="使用金十 App 扫码登录" width="min(420px, 95vw)" :close-on-click-modal="false">
|
||||
<div v-loading="busy" class="jin10-qr">
|
||||
<img v-if="qr && state === 'pending'" :src="qr.image" alt="金十登录二维码" width="240" height="240">
|
||||
<p v-if="state === 'pending'">
|
||||
请用金十 App 扫描并确认，二维码 60 秒后失效。
|
||||
</p>
|
||||
<p v-else-if="state === 'expired'">
|
||||
二维码已失效，请刷新后重新扫码。
|
||||
</p>
|
||||
<p v-else-if="state === 'error'">
|
||||
连接失败，请稍后重试。
|
||||
</p>
|
||||
<el-button v-if="state === 'expired' || state === 'error'" @click="start">
|
||||
刷新二维码
|
||||
</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.jin10-qr {
|
||||
min-height: 260px;
|
||||
text-align: center;
|
||||
}
|
||||
.jin10-qr img {
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
</style>
|
||||
@@ -1,11 +1,13 @@
|
||||
<script setup lang="ts">
|
||||
import ExchangeSettings from "./components/ExchangeSettings.vue"
|
||||
import Jin10Settings from "./components/Jin10Settings.vue"
|
||||
import ProviderSettings from "./components/ProviderSettings.vue"
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex flex-col gap-4">
|
||||
<ProviderSettings />
|
||||
<Jin10Settings />
|
||||
<ExchangeSettings />
|
||||
</div>
|
||||
</template>
|
||||
Reference in new issue
Block a user