Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/api/src/trpc/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
import { verifyAccessToken } from "better-auth/oauth2";
import { eq } from "drizzle-orm";
import { env } from "@/env";
import { isIssuedBeforeCutoff } from "./isIssuedBeforeCutoff";

const apiUrl = env.NEXT_PUBLIC_API_URL.replace(/\/+$/, "");

Expand Down Expand Up @@ -56,6 +57,7 @@ async function sessionFromOAuthBearer(
where: eq(authSchema.users.id, userId),
});
if (!user) return null;
if (isIssuedBeforeCutoff(payload.iat, user.tokensValidAfter)) return null;

const activeOrganizationId =
typeof payload.organizationId === "string" ? payload.organizationId : null;
Expand Down
1 change: 1 addition & 0 deletions apps/api/src/trpc/isIssuedBeforeCutoff/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { isIssuedBeforeCutoff } from "./isIssuedBeforeCutoff";
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { describe, expect, it } from "bun:test";
import { isIssuedBeforeCutoff } from "./isIssuedBeforeCutoff";

const cutoff = new Date("2026-11-18T12:00:00Z");
const cutoffSeconds = cutoff.getTime() / 1000;

describe("isIssuedBeforeCutoff", () => {
it("accepts every token when no cutoff is set", () => {
expect(isIssuedBeforeCutoff(1, null)).toBe(false);
expect(isIssuedBeforeCutoff(undefined, null)).toBe(false);
});

it("rejects a token issued before the cutoff", () => {
expect(isIssuedBeforeCutoff(cutoffSeconds - 1, cutoff)).toBe(true);
});

it("accepts a token issued at or after the cutoff", () => {
expect(isIssuedBeforeCutoff(cutoffSeconds, cutoff)).toBe(false);
expect(isIssuedBeforeCutoff(cutoffSeconds + 1, cutoff)).toBe(false);
});

it("rejects a token without iat when a cutoff is set", () => {
expect(isIssuedBeforeCutoff(undefined, cutoff)).toBe(true);
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export function isIssuedBeforeCutoff(
issuedAtSeconds: unknown,
tokensValidAfter: Date | null,
): boolean {
if (!tokensValidAfter) return false;
if (typeof issuedAtSeconds !== "number") return true;
return issuedAtSeconds * 1000 < tokensValidAfter.getTime();
}
1 change: 1 addition & 0 deletions packages/db/drizzle/0199_users_tokens_valid_after.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE "auth"."users" ADD COLUMN "tokens_valid_after" timestamp;
Loading
Loading