fix: preserve terminal access during auth sync

This commit is contained in:
2569718930@qq.com
2026-05-28 12:18:43 +08:00
parent eef611adb4
commit 784b27a954
5 changed files with 194 additions and 65 deletions
@@ -0,0 +1,71 @@
import {
createAccessStateFromAuthPayload,
mergeAccessStateWithAuthPayload,
} from "@/components/dashboard/scan-terminal/terminal-access-state";
import type { ProAccessState } from "@/lib/dashboard-types";
function assert(condition: unknown, message: string) {
if (!condition) throw new Error(message);
}
const activeAccess: ProAccessState = {
loading: false,
authenticated: true,
userId: "user-1",
subscriptionActive: true,
subscriptionPlanCode: "pro_monthly",
subscriptionExpiresAt: "2026-06-30T00:00:00Z",
subscriptionTotalExpiresAt: "2026-06-30T00:00:00Z",
subscriptionQueuedDays: 0,
points: 120,
error: null,
};
export function runTests() {
const degraded = mergeAccessStateWithAuthPayload(activeAccess, {
authenticated: true,
user_id: "user-1",
subscription_active: null,
subscription_plan_code: null,
subscription_expires_at: null,
subscription_total_expires_at: null,
subscription_queued_days: 0,
points: 0,
degraded_auth_profile: true,
});
assert(
degraded.subscriptionActive === true,
"terminal gate must preserve a previously active subscription when auth profile is degraded/unknown",
);
assert(
degraded.subscriptionPlanCode === "pro_monthly",
"terminal gate must keep the previous plan metadata while subscription sync is unknown",
);
const confirmedInactive = mergeAccessStateWithAuthPayload(activeAccess, {
authenticated: true,
user_id: "user-1",
subscription_active: false,
subscription_plan_code: null,
subscription_expires_at: null,
subscription_total_expires_at: null,
subscription_queued_days: 0,
points: 0,
});
assert(
confirmedInactive.subscriptionActive === false,
"terminal gate must still respect a confirmed inactive subscription response",
);
const coldUnknown = createAccessStateFromAuthPayload({
authenticated: true,
user_id: "user-1",
subscription_active: null,
degraded_auth_profile: true,
});
assert(
coldUnknown.subscriptionActive === false && coldUnknown.authenticated === true,
"cold-start unknown subscription state must not fabricate Pro access",
);
}
@@ -0,0 +1,62 @@
import type { ProAccessState } from "@/lib/dashboard-types";
export type AuthProfilePayload = {
authenticated?: boolean;
user_id?: string | null;
subscription_active?: boolean | null;
subscription_plan_code?: string | null;
subscription_expires_at?: string | null;
subscription_total_expires_at?: string | null;
subscription_queued_days?: number | null;
points?: number | null;
degraded_auth_profile?: boolean | null;
};
function queuedDays(value: unknown) {
return Math.max(0, Number(value ?? 0));
}
export function createAccessStateFromAuthPayload(
payload: AuthProfilePayload,
): ProAccessState {
return {
loading: false,
authenticated: Boolean(payload.authenticated),
userId: payload.user_id ?? null,
subscriptionActive: payload.subscription_active === true,
subscriptionPlanCode: payload.subscription_plan_code ?? null,
subscriptionExpiresAt: payload.subscription_expires_at ?? null,
subscriptionTotalExpiresAt:
payload.subscription_total_expires_at ??
payload.subscription_expires_at ??
null,
subscriptionQueuedDays: queuedDays(payload.subscription_queued_days),
points: Number(payload.points ?? 0),
error: null,
};
}
export function mergeAccessStateWithAuthPayload(
previous: ProAccessState,
payload: AuthProfilePayload,
): ProAccessState {
const next = createAccessStateFromAuthPayload(payload);
const subscriptionUnknown =
payload.subscription_active === null ||
payload.subscription_active === undefined ||
payload.degraded_auth_profile === true;
if (!subscriptionUnknown || !previous.subscriptionActive || !next.authenticated) {
return next;
}
return {
...next,
subscriptionActive: true,
subscriptionPlanCode: previous.subscriptionPlanCode,
subscriptionExpiresAt: previous.subscriptionExpiresAt,
subscriptionTotalExpiresAt: previous.subscriptionTotalExpiresAt,
subscriptionQueuedDays: previous.subscriptionQueuedDays,
points: Number.isFinite(next.points) && next.points > 0 ? next.points : previous.points,
};
}