Skip to content

[service-utils] Scope service-key auth cache by teamId; drop timestampless cache entries #8912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xFirekeeper merged 2 commits into from
Aug 21, 2026
+10 −4
Merged

[service-utils] Scope service-key auth cache by teamId; drop timestampless cache entries #8912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4ea5b0
[service-utils] Scope service-key auth cache by teamId; drop timestam…
0xFirekeeper Aug 21, 2026
7e86440
[service-utils] Do not cache service-key auth without a tenant selector
0xFirekeeper Aug 21, 2026
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
5 changes: 5 additions & 0 deletions .changeset/spicy-donuts-argue.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@thirdweb-dev/service-utils": patch
---

Scope service-key authorization cache entries by teamId, and ignore cache entries that lack a timestamp
9 changes: 5 additions & 4 deletions packages/service-utils/src/core/authorize/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,11 @@ export async function authorize(

// Use a separate cache key per auth method.
const cacheKey = authData.incomingServiceApiKey
? // incoming service key + clientId case
`key-v2:service-key:${authData.incomingServiceApiKeyHash}:${authData.clientId ?? "client_default"}`
? // incoming service key + teamId + clientId case
// do not cache service-key requests that carry no tenant selector
authData.teamId || authData.clientId
? `key-v2:service-key:${authData.incomingServiceApiKeyHash}:${authData.teamId ?? "team_default"}:${authData.clientId ?? "client_default"}`
: null
Comment thread
0xFirekeeper marked this conversation as resolved.
: authData.secretKeyHash
? // secret key case
`key-v2:secret-key:${authData.secretKeyHash}`
Expand Down Expand Up @@ -80,8 +83,6 @@ export async function authorize(
if (diff < cacheTtlMs) {
teamAndProjectResponse = parsed.teamAndProjectResponse;
}
} else {
teamAndProjectResponse = parsed;
}
}
} catch {
Expand Down
Loading