Skip to content

Promote foss-sandbox to foss-main - #21

Merged
UsamaSadiq merged 11 commits into
foss-mainfrom
foss-sandbox
Jul 14, 2026
Merged

Promote foss-sandbox to foss-main#21
UsamaSadiq merged 11 commits into
foss-mainfrom
foss-sandbox

Conversation

@UsamaSadiq

Copy link
Copy Markdown
Collaborator

Description

Promotes foss-sandbox changes to foss-main, including the fix for MCP OAuth redirect staying on Twenty dashboard after SSO login (returnToPath threading through proxy-login).

UsamaSadiq and others added 11 commits June 4, 2026 19:11
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
node-redis session and cache clients crash the process when
Memorystore drops idle TLS connections. Add error handlers,
pingInterval, TCP keepalive, and reconnect strategy to both
the session-storage and cache-storage Redis clients.
- Use keepAlive: 30_000 (number) instead of keepAlive: true (boolean)
  since node-redis v4 types socket.keepAlive as number | false
- Remove keepAliveInitialDelay which node-redis ignores
- Cast redisClient as RedisClientType for redisInsStore compatibility
Fix Redis crash loop from unhandled socket errors
When SMB_CORPORATE_ID is set and AUTH_TYPE=SSO, decode the
X-Auth-Request-Access-Token JWT payload and verify
custom:is_corporate="true" and custom:corporate_id matches.
Enforced in MiddlewareService (REST + GraphQL), JwtAuthGuard,
and SsoProxyLoginController. No-op when env var is unset.
Requests without x-auth-request-access-token (MCP OAuth,
API-key, internal) never went through oauth2-proxy and have
no Cognito claims to validate. The middleware/guard paths now
silently skip instead of 403-ing. The proxy-login controller
retains strict enforcement since it is always behind ForwardAuth.
Enforce corporate_id claim across all Twenty auth paths
The MCP OAuth /authorize page was lost during the SSO round-trip
because returnToPath lived only in a Jotai atom destroyed by the
full-page navigation to /auth/sso/proxy-login. Thread it as a
query parameter so the controller can redirect back after setting
the JWT cookie.
Fix MCP OAuth redirect staying on Twenty dashboard after SSO
@UsamaSadiq
UsamaSadiq merged commit f4b9888 into foss-main Jul 14, 2026
65 of 74 checks passed
@github-actions

Copy link
Copy Markdown
Fails
🚫

node failed.

Log

Details
�[31mError: �[39m SyntaxError: Unexpected token '<', "<!DOCTYPE "... is not valid JSON
    at JSON.parse (<anonymous>)
�[90m    at parseJSONFromBytes (node:internal/deps/undici/undici:4387:19)�[39m
�[90m    at successSteps (node:internal/deps/undici/undici:7041:27)�[39m
�[90m    at readAllBytes (node:internal/deps/undici/undici:5958:13)�[39m
�[90m    at process.processTicksAndRejections (node:internal/process/task_queues:104:5)�[39m
danger-results://tmp/danger-results-03186cc6.json

Generated by 🚫 dangerJS against 7af2b77

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant