fix: sync completed dingtalk workflows and add work review brand
This commit is contained in:
parent
b33cef8c44
commit
52c3a36b0f
@ -2,8 +2,10 @@
|
||||
|
||||
import { NextRequest, NextResponse } from 'next/server'
|
||||
|
||||
import { POST } from '@/app/api/dingtalk/h5-login/route'
|
||||
import { GET, POST } from '@/app/api/dingtalk/h5-login/route'
|
||||
import { loginDingtalkUserByH5AuthCode } from '@/lib/dingtalk-login'
|
||||
import { authorizeDingtalkH5UserForNextAuth } from '@/lib/dingtalk-login'
|
||||
import { createDingtalkPerformanceSessionToken } from '@/lib/dingtalk-performance-session'
|
||||
|
||||
jest.mock('@/lib/dingtalk-login', () => ({
|
||||
authorizeDingtalkH5UserForNextAuth: jest.fn(),
|
||||
@ -87,4 +89,38 @@ describe('DingTalk H5 public login body limit', () => {
|
||||
{ appSource: 'workNotice' },
|
||||
)
|
||||
})
|
||||
|
||||
test('绩效调研免登落地页写入限定路径的会话 Cookie', async () => {
|
||||
;(authorizeDingtalkH5UserForNextAuth as jest.Mock).mockResolvedValue({
|
||||
id: 'user-1',
|
||||
email: 'external@example.com',
|
||||
username: '跨部门同事',
|
||||
role: 'USER',
|
||||
department: '运营中心',
|
||||
isSuperAdmin: false,
|
||||
})
|
||||
;(createDingtalkPerformanceSessionToken as jest.Mock).mockReturnValue('signed-performance-token')
|
||||
|
||||
const response = await GET(new NextRequest(
|
||||
'https://sc.jiansun.vip/api/dingtalk/h5-login?code=short-code&redirect=%2Fperformance-survey%2Fsurvey%2Fsurvey-1%3FtargetId%3Dtarget-1',
|
||||
{
|
||||
headers: {
|
||||
accept: 'text/html',
|
||||
'user-agent': 'DingTalk/7.0',
|
||||
},
|
||||
},
|
||||
))
|
||||
|
||||
expect(response.status).toBe(200)
|
||||
expect(response.headers.get('set-cookie')).toContain(
|
||||
'dingtalk-performance-session=signed-performance-token',
|
||||
)
|
||||
expect(response.headers.get('set-cookie')).toContain('Path=/performance-survey')
|
||||
expect(response.headers.get('set-cookie')).toContain('Path=/api')
|
||||
expect(response.headers.get('set-cookie')).toContain('HttpOnly')
|
||||
expect(authorizeDingtalkH5UserForNextAuth).toHaveBeenCalledWith('short-code', {
|
||||
appSource: 'workNotice',
|
||||
clientIp: null,
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@ -4,8 +4,10 @@ import {
|
||||
loginDingtalkUserByH5AuthCode,
|
||||
} from '@/lib/dingtalk-login'
|
||||
import { createDingtalkPerformanceSessionToken } from '@/lib/dingtalk-performance-session'
|
||||
import { DINGTALK_PERFORMANCE_SESSION_COOKIE } from '@/lib/dingtalk-performance-session-constants'
|
||||
import { getPublicAppOrigin } from '@/lib/public-app-url'
|
||||
import { normalizeInternalRedirectPath } from '@/lib/safe-redirect'
|
||||
import { resolveSecureAuthCookieFromRequest } from '@/lib/auth-cookie'
|
||||
|
||||
export const runtime = 'nodejs'
|
||||
export const dynamic = 'force-dynamic'
|
||||
@ -235,7 +237,7 @@ function createPerformanceSurveySessionTransferPage({
|
||||
requestHeaders: getRequestHeaderSnapshot(request),
|
||||
})
|
||||
|
||||
return new NextResponse(
|
||||
const response = new NextResponse(
|
||||
`<!doctype html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
@ -282,6 +284,25 @@ ${SURVEY_OPENING_PAGE_MARKUP}
|
||||
},
|
||||
},
|
||||
)
|
||||
|
||||
// 页面首跳发生在浏览器导航中,不能依赖自定义请求头。这个短期、限定路径的
|
||||
// HttpOnly Cookie 只负责让 middleware 放行绩效页面,数据接口仍会重新验签。
|
||||
response.cookies.set(DINGTALK_PERFORMANCE_SESSION_COOKIE, token, {
|
||||
httpOnly: true,
|
||||
sameSite: 'lax',
|
||||
secure: resolveSecureAuthCookieFromRequest(request),
|
||||
path: '/performance-survey',
|
||||
maxAge: 12 * 60 * 60,
|
||||
})
|
||||
response.cookies.set(DINGTALK_PERFORMANCE_SESSION_COOKIE, token, {
|
||||
httpOnly: true,
|
||||
sameSite: 'lax',
|
||||
secure: resolveSecureAuthCookieFromRequest(request),
|
||||
path: '/api',
|
||||
maxAge: 12 * 60 * 60,
|
||||
})
|
||||
|
||||
return response
|
||||
}
|
||||
|
||||
function createPublicRedirectResponse({
|
||||
|
||||
@ -6,6 +6,7 @@ import {
|
||||
DINGTALK_PERFORMANCE_SESSION_HEADER,
|
||||
verifyDingtalkPerformanceSessionToken,
|
||||
} from '@/lib/dingtalk-performance-session'
|
||||
import { DINGTALK_PERFORMANCE_SESSION_COOKIE } from '@/lib/dingtalk-performance-session-constants'
|
||||
import {
|
||||
PerformanceSurveyApiError,
|
||||
createPerformanceSurveyWorkItemFromRequest,
|
||||
@ -91,7 +92,14 @@ function readDingtalkPerformanceToken(request: Request) {
|
||||
|
||||
const authorization = request.headers.get('authorization') || ''
|
||||
const match = authorization.match(/^Bearer\s+(.+)$/i)
|
||||
return match?.[1]?.trim() || null
|
||||
if (match?.[1]?.trim()) return match[1].trim()
|
||||
|
||||
const cookieHeader = request.headers.get('cookie') || ''
|
||||
const cookie = cookieHeader
|
||||
.split(';')
|
||||
.map((part) => part.trim())
|
||||
.find((part) => part.startsWith(`${DINGTALK_PERFORMANCE_SESSION_COOKIE}=`))
|
||||
return cookie?.slice(DINGTALK_PERFORMANCE_SESSION_COOKIE.length + 1).trim() || null
|
||||
}
|
||||
|
||||
async function getSession(request: Request): Promise<Session | null> {
|
||||
|
||||
@ -116,7 +116,8 @@ async function hasActiveSession() {
|
||||
})
|
||||
if (!response.ok) return false
|
||||
const data = await response.json().catch(() => null)
|
||||
return Boolean(data?.user)
|
||||
// 品牌中心外部人员也可能已经登录素材库;只有品牌中心成员才可跳过钉钉免登。
|
||||
return data?.user?.canAccessBrandCenter === true
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
|
||||
@ -205,6 +205,7 @@ function FirstPassProjectList({ metric, query, firstPassPage }: Required<Pick<Co
|
||||
<tr key={project.id} className="align-top transition-colors hover:bg-slate-50">
|
||||
<td className="px-5 py-4">
|
||||
<p className="truncate font-bold text-slate-950">{project.title}</p>
|
||||
{project.brand && <p className="mt-1 text-xs font-semibold text-slate-600">品牌:{project.brand}</p>}
|
||||
{project.description && <p className="mt-1 truncate text-xs text-slate-600">{project.description}</p>}
|
||||
<p className="mt-1 text-xs text-slate-500">作品日期 {formatDate(project.workDate)} · 当前第 {project.latestVersion} 版</p>
|
||||
</td>
|
||||
@ -231,6 +232,7 @@ function FirstPassProjectList({ metric, query, firstPassPage }: Required<Pick<Co
|
||||
{items.map((project) => (
|
||||
<li key={project.id} className="p-5">
|
||||
<h3 className="break-words font-bold text-slate-950">{project.title}</h3>
|
||||
{project.brand && <p className="mt-1 text-sm font-semibold text-slate-600">品牌:{project.brand}</p>}
|
||||
{project.description && <p className="mt-1 text-sm leading-6 text-slate-600">{project.description}</p>}
|
||||
<div className="mt-3"><FirstPassStatusBadge status={project.firstVersionStatus} /></div>
|
||||
<dl className="mt-4 grid grid-cols-2 gap-x-4 gap-y-3 text-sm">
|
||||
|
||||
@ -13,6 +13,7 @@ import {
|
||||
} from 'react'
|
||||
import { createPortal } from 'react-dom'
|
||||
import { getWorkReviewReviewerOptions, uploadWorkReviewImages } from '@/lib/work-review-client'
|
||||
import { WORK_REVIEW_BRANDS } from '@/types/work-review'
|
||||
import type {
|
||||
WorkReviewDecision,
|
||||
WorkReviewProject,
|
||||
@ -218,6 +219,7 @@ export function WorkReviewSubmissionDialog({
|
||||
onSubmit: (input: WorkReviewSubmissionInput) => Promise<void>
|
||||
}) {
|
||||
const [title, setTitle] = useState('')
|
||||
const [brand, setBrand] = useState('')
|
||||
const [description, setDescription] = useState('')
|
||||
const [workDate, setWorkDate] = useState(todayValue)
|
||||
const [reviewerEmployeeId, setReviewerEmployeeId] = useState('')
|
||||
@ -267,6 +269,10 @@ export function WorkReviewSubmissionDialog({
|
||||
setError('作品名称不能超过 120 个字')
|
||||
return
|
||||
}
|
||||
if (isCreate && !brand.trim()) {
|
||||
setError('请选择品牌')
|
||||
return
|
||||
}
|
||||
if (isCreate && !workDate) {
|
||||
setError('请选择作品日期')
|
||||
return
|
||||
@ -306,6 +312,7 @@ export function WorkReviewSubmissionDialog({
|
||||
...(isCreate
|
||||
? {
|
||||
title: title.trim(),
|
||||
brand: brand.trim(),
|
||||
description: description.trim(),
|
||||
workDate,
|
||||
reviewerEmployeeId,
|
||||
@ -393,6 +400,26 @@ export function WorkReviewSubmissionDialog({
|
||||
className="h-11 rounded border border-[#cfd6e1] px-3 text-[14px] outline-none focus:border-[#0050cb] focus:ring-2 focus:ring-[#dcecff] disabled:bg-[#f2f4f7]"
|
||||
/>
|
||||
</label>
|
||||
<label className="grid gap-2">
|
||||
<span className="text-[13px] font-bold text-[#344054]">品牌 <span className="text-[#b42318]">*</span></span>
|
||||
<input
|
||||
value={brand}
|
||||
onChange={(event) => {
|
||||
setBrand(event.target.value)
|
||||
setError(null)
|
||||
}}
|
||||
maxLength={80}
|
||||
disabled={busy}
|
||||
required
|
||||
aria-required="true"
|
||||
list="work-review-brand-options"
|
||||
placeholder="例如:亿家达"
|
||||
className="h-11 rounded border border-[#cfd6e1] bg-white px-3 text-[14px] outline-none focus:border-[#0050cb] focus:ring-2 focus:ring-[#dcecff] disabled:bg-[#f2f4f7]"
|
||||
/>
|
||||
<datalist id="work-review-brand-options">
|
||||
{WORK_REVIEW_BRANDS.map((option) => <option key={option} value={option} />)}
|
||||
</datalist>
|
||||
</label>
|
||||
<div className="grid gap-2">
|
||||
<span className="text-[13px] font-bold text-[#344054]">评审人 <span className="text-[#b42318]">*</span></span>
|
||||
<WorkReviewReviewerSelect
|
||||
|
||||
@ -191,6 +191,7 @@ export function WorkReviewProjectCard({
|
||||
<WorkReviewStatusBadge status={project.status} />
|
||||
</div>
|
||||
<div className="mt-2 flex flex-wrap items-center gap-x-4 gap-y-1 text-[11px] font-medium text-[#7b8494]">
|
||||
{project.brand && <span>品牌:{project.brand}</span>}
|
||||
<span>提交人:{project.submitter.name}</span>
|
||||
<span>作品日期:{formatDateOnly(project.workDate)}</span>
|
||||
<span>最近提交:{formatDateTime(latestVersion.submittedAt)}</span>
|
||||
|
||||
@ -17,6 +17,7 @@ import {
|
||||
isAllowedDingWorkflowProcessCode,
|
||||
isDingWorkflowStartedOnOrAfterCutoff,
|
||||
isDingWorkflowOngoing,
|
||||
isDingWorkflowTerminal,
|
||||
isDingWorkflowCompletedInRange,
|
||||
isDingWorkflowDeliveryAssessmentInRange,
|
||||
isDingWorkflowApprovedCompletion,
|
||||
@ -53,6 +54,12 @@ describe('ding workflow snapshot sync semantics', () => {
|
||||
expect(isDingWorkflowOngoing(status, finishTime)).toBe(expected)
|
||||
})
|
||||
|
||||
test('treats any upstream finish time as terminal even when status is stale', () => {
|
||||
expect(isDingWorkflowTerminal('RUNNING', '2026-08-19 18:04:00')).toBe(true)
|
||||
expect(isDingWorkflowTerminal('COMPLETED', null)).toBe(true)
|
||||
expect(isDingWorkflowTerminal('RUNNING', null)).toBe(false)
|
||||
})
|
||||
|
||||
it('interprets upstream report timestamps as Asia/Shanghai wall-clock values', () => {
|
||||
expect(sourceWorkflowTimestampToIso('2026-08-20 10:30:00')).toBe('2026-08-20T02:30:00.000Z')
|
||||
expect(sourceWorkflowTimestampToIso('2026-08-20T10:30:00Z')).toBe('2026-08-20T02:30:00.000Z')
|
||||
|
||||
@ -122,6 +122,7 @@ const finalReviewer = {
|
||||
function makeProjectBody(uploadId = 'upload-work') {
|
||||
return {
|
||||
title: '测试作品',
|
||||
brand: '亿家达',
|
||||
workDate: '2026-08-12',
|
||||
reviewerEmployeeId: manager.id,
|
||||
processedImages: [makeProcessedImage(uploadId)],
|
||||
@ -222,6 +223,17 @@ describe('work review processed image persistence safety', () => {
|
||||
])
|
||||
})
|
||||
|
||||
test('rejects a new project without a brand before touching uploaded images', async () => {
|
||||
const body = makeProjectBody()
|
||||
delete (body as Record<string, unknown>).brand
|
||||
|
||||
await expect(createWorkReviewProject(session, body)).rejects.toEqual(
|
||||
new WorkReviewApiError('请填写品牌'),
|
||||
)
|
||||
expect(getOwnedUploadSession).not.toHaveBeenCalled()
|
||||
expect(uploadFileToS3).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
test('fails closed and preserves S3 and source sessions when the commit readback is unavailable', async () => {
|
||||
;(prisma.workReviewProject.create as jest.Mock).mockRejectedValue(new Error('connection lost'))
|
||||
;(prisma.workReviewProject.findUnique as jest.Mock).mockRejectedValue(new Error('database unavailable'))
|
||||
|
||||
@ -1051,6 +1051,16 @@ export function isDingWorkflowOngoing(status: unknown, finishedAt: unknown): boo
|
||||
&& !clean(finishedAt)
|
||||
}
|
||||
|
||||
/**
|
||||
* 结束时间是上游审批的权威终态信号。部分报表同步会短暂保留旧的
|
||||
* status(例如 RUNNING),但只要 finishTime 已写入,流程就不应再进入
|
||||
* “进行中项目”。
|
||||
*/
|
||||
export function isDingWorkflowTerminal(status: unknown, finishedAt: unknown): boolean {
|
||||
const normalizedStatus = String(status || '').trim().toUpperCase()
|
||||
return TERMINAL_WORKFLOW_STATUSES.has(normalizedStatus) || Boolean(clean(finishedAt))
|
||||
}
|
||||
|
||||
export function sourceWorkflowTimestampToIso(value: unknown): string | null {
|
||||
const normalized = clean(value)
|
||||
if (!normalized) return null
|
||||
@ -1431,6 +1441,7 @@ async function fetchSourceWorkflows(
|
||||
pool: ConnectionPool,
|
||||
cursor: string | null,
|
||||
changedWorkflowIds: string[] = [],
|
||||
knownOngoingWorkflowIds: string[] = [],
|
||||
) {
|
||||
const request = pool.request()
|
||||
const currentMonth = getShanghaiMonthRange()
|
||||
@ -1446,6 +1457,7 @@ async function fetchSourceWorkflows(
|
||||
}).format(currentMonth.start)
|
||||
request.input('cursor', mssql.NVarChar(64), cursor)
|
||||
request.input('changedWorkflowIds', mssql.NVarChar(mssql.MAX), JSON.stringify(changedWorkflowIds))
|
||||
request.input('knownOngoingWorkflowIds', mssql.NVarChar(mssql.MAX), JSON.stringify(knownOngoingWorkflowIds))
|
||||
request.input('startedAtCutoff', mssql.NVarChar(64), DING_WORKFLOW_STARTED_AT_CUTOFF_LOCAL)
|
||||
request.input('currentMonthStart', mssql.NVarChar(64), currentMonthStart)
|
||||
DING_WORKFLOW_ALLOWED_PROCESS_CODES.forEach((processCode, index) => {
|
||||
@ -1482,6 +1494,15 @@ async function fetchSourceWorkflows(
|
||||
SELECT CONVERT(nvarchar(255), [value])
|
||||
FROM OPENJSON(@changedWorkflowIds)
|
||||
)
|
||||
-- Revalidate every locally ongoing workflow on each hourly sync. The
|
||||
-- upstream mirror may update status/finishTime in place without
|
||||
-- advancing updateAt or inserting a new task row; without this
|
||||
-- branch a workflow completed in a prior month can remain ongoing
|
||||
-- in the local snapshot indefinitely.
|
||||
OR CONVERT(nvarchar(255), processInstanceId) IN (
|
||||
SELECT CONVERT(nvarchar(255), [value])
|
||||
FROM OPENJSON(@knownOngoingWorkflowIds)
|
||||
)
|
||||
OR UPPER(LTRIM(RTRIM(COALESCE(CONVERT(nvarchar(100), status), '')))) NOT IN ('COMPLETED', 'TERMINATED', 'CANCELED')
|
||||
OR (
|
||||
UPPER(LTRIM(RTRIM(COALESCE(CONVERT(nvarchar(100), status), '')))) IN ('COMPLETED', 'TERMINATED', 'CANCELED')
|
||||
@ -1720,7 +1741,7 @@ function buildSnapshotPayload(
|
||||
const status = clean(row.status)
|
||||
const sourceCreatedAtRaw = sourceWorkflowTimestampToIso(row.sourceCreatedAtRaw)
|
||||
if (!processInstanceId || !status || !isDingWorkflowStartedOnOrAfterCutoff(row.sourceCreatedAtRaw)) return []
|
||||
const ongoing = isDingWorkflowOngoing(status, row.sourceFinishedAtRaw)
|
||||
const ongoing = !isDingWorkflowTerminal(status, row.sourceFinishedAtRaw)
|
||||
const task = taskByWorkflow.get(processInstanceId)
|
||||
const scheme = schemeByWorkflow.get(processInstanceId)
|
||||
const processCode = normalizeDingWorkflowProcessCode(row.processCode)
|
||||
@ -1929,10 +1950,19 @@ export async function syncDingWorkflowSnapshots() {
|
||||
await pool.connect()
|
||||
const sourceCursor = parseDingWorkflowSourceCursor(state.sourceCursorRaw)
|
||||
const sourceDelta = await fetchSourceDeltaState(pool, sourceCursor)
|
||||
const knownOngoingRows = await prisma.dingWorkflowSnapshot.findMany({
|
||||
where: {
|
||||
isOngoing: true,
|
||||
processCode: { in: ALLOWED_PROCESS_CODE_VALUES },
|
||||
},
|
||||
select: { processInstanceId: true },
|
||||
})
|
||||
const knownOngoingWorkflowIds = knownOngoingRows.map((row) => row.processInstanceId)
|
||||
const sourceRows = await fetchSourceWorkflows(
|
||||
pool,
|
||||
sourceDelta.requiresFullSync ? null : sourceCursor.workflowUpdatedAt,
|
||||
sourceDelta.changedWorkflowIds,
|
||||
knownOngoingWorkflowIds,
|
||||
)
|
||||
const workflowIds = sourceRows.flatMap((row) => {
|
||||
const id = clean(row.processInstanceId)
|
||||
|
||||
1
lib/dingtalk-performance-session-constants.ts
Normal file
1
lib/dingtalk-performance-session-constants.ts
Normal file
@ -0,0 +1 @@
|
||||
export const DINGTALK_PERFORMANCE_SESSION_COOKIE = 'dingtalk-performance-session'
|
||||
@ -1,4 +1,5 @@
|
||||
import { createHmac, randomUUID, timingSafeEqual } from 'crypto'
|
||||
export { DINGTALK_PERFORMANCE_SESSION_COOKIE } from '@/lib/dingtalk-performance-session-constants'
|
||||
|
||||
export const DINGTALK_PERFORMANCE_SESSION_HEADER = 'x-performance-survey-dingtalk-session'
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@ import {
|
||||
DINGTALK_PERFORMANCE_SESSION_HEADER,
|
||||
verifyDingtalkPerformanceSessionToken,
|
||||
} from '@/lib/dingtalk-performance-session'
|
||||
import { DINGTALK_PERFORMANCE_SESSION_COOKIE } from '@/lib/dingtalk-performance-session-constants'
|
||||
|
||||
export async function getAuthenticatedUploadUserId(request: NextRequest): Promise<string | null> {
|
||||
const session = await getServerSession(authOptions)
|
||||
@ -14,6 +15,13 @@ export async function getAuthenticatedUploadUserId(request: NextRequest): Promis
|
||||
const headerToken = request.headers.get(DINGTALK_PERFORMANCE_SESSION_HEADER)
|
||||
const authorization = request.headers.get('authorization') || ''
|
||||
const bearerToken = authorization.match(/^Bearer\s+(.+)$/i)?.[1]?.trim()
|
||||
const payload = verifyDingtalkPerformanceSessionToken(headerToken || bearerToken || null)
|
||||
const cookieHeader = request.headers.get('cookie') || ''
|
||||
const cookieToken = cookieHeader
|
||||
.split(';')
|
||||
.map((part) => part.trim())
|
||||
.find((part) => part.startsWith(`${DINGTALK_PERFORMANCE_SESSION_COOKIE}=`))
|
||||
?.slice(DINGTALK_PERFORMANCE_SESSION_COOKIE.length + 1)
|
||||
.trim()
|
||||
const payload = verifyDingtalkPerformanceSessionToken(headerToken || bearerToken || cookieToken || null)
|
||||
return payload?.userId ? String(payload.userId).trim() : null
|
||||
}
|
||||
|
||||
@ -447,6 +447,7 @@ function serializeProject(ctx: Awaited<ReturnType<typeof getContext>>, project:
|
||||
return {
|
||||
id: project.id,
|
||||
title: project.title,
|
||||
brand: project.brand || null,
|
||||
description: project.description,
|
||||
workDate: project.workDate,
|
||||
status: project.status,
|
||||
@ -553,6 +554,7 @@ export async function getWorkReviewBoard(session: Session | null, params?: URLSe
|
||||
export type OngoingWorkReviewProjectListItem = {
|
||||
id: string
|
||||
title: string
|
||||
brand?: string | null
|
||||
description: string | null
|
||||
status: 'pending_review' | 'revision_required'
|
||||
workDate: string
|
||||
@ -576,6 +578,7 @@ export type OngoingWorkReviewProjectPage = {
|
||||
export type FirstPassReviewProjectListItem = {
|
||||
id: string
|
||||
title: string
|
||||
brand?: string | null
|
||||
/** Present in API responses; optional for compatibility with older callers. */
|
||||
description?: string | null
|
||||
currentStatus: string
|
||||
@ -711,6 +714,7 @@ export async function getFirstPassReviewProjects(
|
||||
select: {
|
||||
id: true,
|
||||
title: true,
|
||||
brand: true,
|
||||
description: true,
|
||||
status: true,
|
||||
latestVersion: true,
|
||||
@ -752,6 +756,7 @@ export async function getFirstPassReviewProjects(
|
||||
return {
|
||||
id: project.id,
|
||||
title: project.title,
|
||||
brand: project.brand || null,
|
||||
description: project.description,
|
||||
currentStatus: project.status,
|
||||
latestVersion: project.latestVersion,
|
||||
@ -818,6 +823,7 @@ export async function getOngoingWorkReviewProjects(
|
||||
select: {
|
||||
id: true,
|
||||
title: true,
|
||||
brand: true,
|
||||
description: true,
|
||||
status: true,
|
||||
workDate: true,
|
||||
@ -1396,6 +1402,9 @@ export async function createWorkReviewProject(session: Session | null, body: any
|
||||
const title = clean(body?.title)
|
||||
if (!title) throw new WorkReviewApiError('请填写作品名称')
|
||||
if (title.length > 120) throw new WorkReviewApiError('作品名称不能超过 120 个字')
|
||||
const brand = clean(body?.brand)
|
||||
if (!brand) throw new WorkReviewApiError('请填写品牌')
|
||||
if (brand.length > 80) throw new WorkReviewApiError('品牌不能超过 80 个字')
|
||||
const description = clean(body?.description)
|
||||
const submissionNote = clean(body?.submissionNote)
|
||||
const workDate = parseWorkDate(body?.workDate)
|
||||
@ -1419,6 +1428,7 @@ export async function createWorkReviewProject(session: Session | null, body: any
|
||||
data: {
|
||||
id: projectId,
|
||||
title,
|
||||
brand,
|
||||
description,
|
||||
workDate,
|
||||
submitterUserId: ctx.user.id,
|
||||
|
||||
82
middleware.test.ts
Normal file
82
middleware.test.ts
Normal file
@ -0,0 +1,82 @@
|
||||
/** @jest-environment node */
|
||||
|
||||
import { NextRequest } from 'next/server'
|
||||
import { getToken } from 'next-auth/jwt'
|
||||
import { middleware } from './middleware'
|
||||
import { createDingtalkPerformanceSessionToken } from '@/lib/dingtalk-performance-session'
|
||||
|
||||
jest.mock('next-auth/jwt', () => ({
|
||||
getToken: jest.fn(),
|
||||
}))
|
||||
|
||||
describe('品牌中心门禁与钉钉绩效调研入口', () => {
|
||||
const originalSecret = process.env.NEXTAUTH_SECRET
|
||||
|
||||
beforeAll(() => {
|
||||
process.env.NEXTAUTH_SECRET = 'middleware-performance-test-secret'
|
||||
})
|
||||
|
||||
afterAll(() => {
|
||||
if (originalSecret === undefined) delete process.env.NEXTAUTH_SECRET
|
||||
else process.env.NEXTAUTH_SECRET = originalSecret
|
||||
})
|
||||
|
||||
beforeEach(() => {
|
||||
jest.clearAllMocks()
|
||||
;(getToken as jest.Mock).mockResolvedValue(null)
|
||||
})
|
||||
|
||||
test('带钉钉绩效会话 Cookie 时放行指定调研页面', async () => {
|
||||
const token = createDingtalkPerformanceSessionToken({
|
||||
id: 'external-user',
|
||||
email: 'external@example.com',
|
||||
username: '跨部门同事',
|
||||
role: 'USER',
|
||||
department: '运营中心',
|
||||
})
|
||||
const response = await middleware(new NextRequest(
|
||||
'https://sc.jiansun.vip/performance-survey/survey/survey-1?targetId=target-1',
|
||||
{ headers: { cookie: `dingtalk-performance-session=${token}` } },
|
||||
))
|
||||
|
||||
expect(response.status).toBe(200)
|
||||
expect(response.headers.get('location')).toBeNull()
|
||||
})
|
||||
|
||||
test('没有普通会话或钉钉绩效会话时仍跳转登录', async () => {
|
||||
const response = await middleware(new NextRequest(
|
||||
'https://sc.jiansun.vip/performance-survey/survey/survey-1',
|
||||
))
|
||||
|
||||
expect(response.status).toBe(307)
|
||||
expect(response.headers.get('location')).toBe('https://sc.jiansun.vip/login')
|
||||
})
|
||||
|
||||
test('外部普通会话访问品牌中心页面仍进入素材库', async () => {
|
||||
;(getToken as jest.Mock).mockResolvedValue({ canAccessBrandCenter: false })
|
||||
const response = await middleware(new NextRequest(
|
||||
'https://sc.jiansun.vip/workspaces/dashboard/core-metrics',
|
||||
))
|
||||
|
||||
expect(response.status).toBe(307)
|
||||
expect(response.headers.get('location')).toBe('https://sc.jiansun.vip/assets/material-library')
|
||||
})
|
||||
|
||||
test('外部普通会话带钉钉绩效会话时只放行绩效页面', async () => {
|
||||
;(getToken as jest.Mock).mockResolvedValue({ canAccessBrandCenter: false })
|
||||
const token = createDingtalkPerformanceSessionToken({
|
||||
id: 'external-user',
|
||||
email: 'external@example.com',
|
||||
username: '跨部门同事',
|
||||
role: 'USER',
|
||||
department: '运营中心',
|
||||
})
|
||||
const response = await middleware(new NextRequest(
|
||||
'https://sc.jiansun.vip/performance-survey/survey/survey-1',
|
||||
{ headers: { cookie: `dingtalk-performance-session=${token}` } },
|
||||
))
|
||||
|
||||
expect(response.status).toBe(200)
|
||||
expect(response.headers.get('location')).toBeNull()
|
||||
})
|
||||
})
|
||||
@ -7,6 +7,7 @@ import {
|
||||
} from '@/lib/auth-cookie'
|
||||
import { shouldRedirectToStandaloneMaterialLibrary } from '@/lib/brand-center-access-policy'
|
||||
import { getAllowedCorsOrigins, isAllowedCorsOrigin } from '@/lib/cors-origin'
|
||||
import { DINGTALK_PERFORMANCE_SESSION_COOKIE } from '@/lib/dingtalk-performance-session-constants'
|
||||
|
||||
const API_CORS_ALLOWED_HEADERS =
|
||||
'X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version, X-API-Key, Authorization, Cookie'
|
||||
@ -15,11 +16,59 @@ const DEPARTMENT_PAGE_PREFIXES = [
|
||||
'/assets/material-library',
|
||||
'/workspaces',
|
||||
]
|
||||
|
||||
function isDepartmentPage(pathname: string): boolean {
|
||||
return pathname === '/' || DEPARTMENT_PAGE_PREFIXES.some((prefix) => pathname.startsWith(prefix))
|
||||
}
|
||||
|
||||
function encodeBase64Url(bytes: Uint8Array) {
|
||||
let binary = ''
|
||||
bytes.forEach((byte) => { binary += String.fromCharCode(byte) })
|
||||
return btoa(binary)
|
||||
.replace(/=/g, '')
|
||||
.replace(/\+/g, '-')
|
||||
.replace(/\//g, '_')
|
||||
}
|
||||
|
||||
function decodeBase64Url(value: string) {
|
||||
const normalized = value.replace(/-/g, '+').replace(/_/g, '/')
|
||||
const padding = normalized.length % 4 === 0 ? '' : '='.repeat(4 - (normalized.length % 4))
|
||||
return atob(normalized + padding)
|
||||
}
|
||||
|
||||
async function hasValidDingtalkPerformanceSession(request: NextRequest) {
|
||||
const token = request.cookies.get(DINGTALK_PERFORMANCE_SESSION_COOKIE)?.value || ''
|
||||
const secret = process.env.NEXTAUTH_SECRET || ''
|
||||
const [encodedPayload, signature, extra] = token.split('.')
|
||||
if (!secret || !encodedPayload || !signature || extra) return false
|
||||
|
||||
try {
|
||||
const key = await crypto.subtle.importKey(
|
||||
'raw',
|
||||
new TextEncoder().encode(secret),
|
||||
{ name: 'HMAC', hash: 'SHA-256' },
|
||||
false,
|
||||
['sign'],
|
||||
)
|
||||
const expectedSignature = encodeBase64Url(new Uint8Array(
|
||||
await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(encodedPayload)),
|
||||
))
|
||||
if (expectedSignature !== signature) return false
|
||||
|
||||
const payload = JSON.parse(decodeBase64Url(encodedPayload)) as Record<string, unknown>
|
||||
return (
|
||||
payload.v === 1
|
||||
&& payload.purpose === 'performance-survey'
|
||||
&& typeof payload.userId === 'string'
|
||||
&& typeof payload.email === 'string'
|
||||
&& typeof payload.name === 'string'
|
||||
&& typeof payload.exp === 'number'
|
||||
&& payload.exp > Math.floor(Date.now() / 1000)
|
||||
)
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
// 注意:不在middleware中启动内存监控
|
||||
// middleware使用Edge Runtime,不支持Node.js API
|
||||
// 内存监控会在lib/memory-monitor.ts模块加载时自动启动(仅生产环境)
|
||||
@ -90,6 +139,11 @@ export async function middleware(request: NextRequest) {
|
||||
pathname.startsWith('/work-review') ||
|
||||
pathname.startsWith('/teacher')
|
||||
) {
|
||||
const isPerformanceSurveyPath =
|
||||
pathname === '/performance-survey' || pathname.startsWith('/performance-survey/')
|
||||
const hasDingtalkPerformanceSession = isPerformanceSurveyPath
|
||||
? await hasValidDingtalkPerformanceSession(request)
|
||||
: false
|
||||
const preferredSecureCookie = resolveSecureAuthCookieFromRequest(request)
|
||||
const cookieCandidates = getAuthSessionCookieCandidates(preferredSecureCookie)
|
||||
let token = null
|
||||
@ -107,7 +161,7 @@ export async function middleware(request: NextRequest) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!token) {
|
||||
if (!token && !(isPerformanceSurveyPath && hasDingtalkPerformanceSession)) {
|
||||
const url = new URL('/login', request.url)
|
||||
const redirectResponse = NextResponse.redirect(url)
|
||||
// 为重定向响应也添加缓存控制头
|
||||
@ -117,7 +171,11 @@ export async function middleware(request: NextRequest) {
|
||||
return redirectResponse
|
||||
}
|
||||
|
||||
if (shouldRedirectToStandaloneMaterialLibrary(pathname, (token as any).canAccessBrandCenter)) {
|
||||
if (
|
||||
token
|
||||
&& !(isPerformanceSurveyPath && hasDingtalkPerformanceSession)
|
||||
&& shouldRedirectToStandaloneMaterialLibrary(pathname, (token as any).canAccessBrandCenter)
|
||||
) {
|
||||
const url = new URL('/assets/material-library', request.url)
|
||||
const redirectResponse = NextResponse.redirect(url)
|
||||
redirectResponse.headers.set('Cache-Control', 'private, no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0')
|
||||
|
||||
@ -0,0 +1,2 @@
|
||||
ALTER TABLE "work_review_projects"
|
||||
ADD COLUMN IF NOT EXISTS "brand" TEXT;
|
||||
@ -1212,6 +1212,7 @@ model PerformanceSurveyConfigAuditLog {
|
||||
model WorkReviewProject {
|
||||
id String @id @default(uuid())
|
||||
title String
|
||||
brand String?
|
||||
description String?
|
||||
workDate DateTime @db.Date @map("work_date")
|
||||
submitterUserId String @map("submitter_user_id")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user