Skip to content

Fix timezone updates #10127

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
merged 1 commit into from
Oct 22, 2025
Merged

Fix timezone updates #10127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions server/account-service/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,10 @@ export function serveAccount (measureCtx: MeasureContext, brandings: BrandingMap
return extractAuthorizationToken(headers) ?? extractCookieToken(headers)
}

const getRequestMeta = (headers: IncomingHttpHeaders): Meta => {
const getRequestMeta = (headers: IncomingHttpHeaders, isServiceRequest: boolean): Meta => {
const meta: Meta = {}
if (headers?.['x-timezone'] !== undefined) {

if (!isServiceRequest && headers?.['x-timezone'] !== undefined) {
meta.timezone = headers['x-timezone'] as string
}

Expand Down Expand Up @@ -381,7 +382,6 @@ export function serveAccount (measureCtx: MeasureContext, brandings: BrandingMap

router.post('rpc', '/', async (ctx) => {
const token = extractToken(ctx.request.headers)
const meta = getRequestMeta(ctx.request.headers)

const request = ctx.request.body as any
const method = methods[request.method as AccountMethods]
Expand All @@ -403,11 +403,16 @@ export function serveAccount (measureCtx: MeasureContext, brandings: BrandingMap
const branding = getBranding(ctx)

let source = ''
let isServiceRequest = false
try {
source = (token != null ? decodeToken(token).extra?.service : undefined) ?? '🤦‍♂️user'
const decodedToken = token != null ? decodeToken(token) : null
const serviceName = decodedToken?.extra?.service
source = serviceName ?? '🤦‍♂️user'
isServiceRequest = serviceName !== undefined
} catch (err) {
// Ignore
}
const meta = getRequestMeta(ctx.request.headers, isServiceRequest)

await measureCtx.with(
request.method,
Expand Down