feat: handle google stale oauth #8617
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added mutation for updating Google integration settings, including handling OAuth redirects and displaying success/error notifications. Enhanced UI with a reconnect button and improved state management for loading and error handling.
…ect functionality Added `oauthStale` field to the GraphQL schema and updated related components to manage OAuth token expiration. Implemented reconnect URL in email templates and service logic, along with UI alerts for stale OAuth status in the integration details view. Updated mocks and types to reflect these changes.
Contributor
WalkthroughThis PR introduces Google OAuth staleness detection and reconnection workflow across multiple layers. It adds an Changes
Sequence DiagramsequenceDiagram
participant Client as Client (Admin UI)
participant Backend as Backend (Google Auth)
participant Database as Database
participant EmailWorker as Email Worker
participant User as User (Email)
Backend->>Backend: Token refresh fails
Backend->>Database: Mark integration.oauthStale = true
Backend->>Backend: handleStaleOAuth()
Backend->>Backend: Queue google-reconnect email job
EmailWorker->>Database: Fetch user by ID
EmailWorker->>Database: Check email preferences (accountNotifications, unsubscribeAll)
EmailWorker->>Backend: Build reconnect URL (teamId, integrationId)
EmailWorker->>EmailWorker: Render GoogleReconnectEmail template (HTML + plain text)
EmailWorker->>User: Send reconnection email
Client->>Database: Query integration (fetch oauthStale)
Client->>Client: Display stale OAuth warning alert
Client->>Client: Show "Reconnect with Google" button
User->>Client: Click Reconnect button
Client->>Backend: INTEGRATION_GOOGLE_UPDATE mutation
Backend->>Database: Update integration with new OAuth token
Backend->>Database: Mark integration.oauthStale = false
Estimated code review effort🎯 4 (Complex) | ⏱️ ~50 minutes Possibly related PRs
Suggested reviewers
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
View your CI Pipeline Execution ↗ for commit f829bf0
☁️ Nx Cloud last updated this comment at |
|
View your CI Pipeline Execution ↗ for commit a2ee020
☁️ Nx Cloud last updated this comment at |
github-actions
bot
requested a deployment
to
Preview - journeys-admin
github-actions
bot
requested a deployment
to
Preview - journeys-admin
This comment has been minimized.
This comment has been minimized.
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Contributor
|
The latest updates on your projects.
|
Enhanced Google integration tests by including the teamId field in mock data and added oauthStale field to the integration update mutation. Updated related components to reflect these changes, ensuring better handling of OAuth token states and integration details.
github-actions
bot
requested a deployment
to
Preview - journeys-admin
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In `@apis/api-gateway/schema.graphql`:
- Around line 1769-1771: The gateway schema declares the oauthStale field with
`@join__field`(graph: API_JOURNEYS) and `@join__field`(graph: API_JOURNEYS_MODERN)
which will route queries to the legacy subgraph incorrectly; update the
oauthStale field declaration so it is routed to the modern subgraph only by
keeping the `@join__field`(graph: API_JOURNEYS_MODERN) and add `@override`(from:
"api-journeys") to indicate the modern subgraph owns the field (locate the
oauthStale field declaration in the schema and replace the dual join__field
directives with the single modern join__field plus the `@override`(from:
"api-journeys") directive).
Comment on lines
1769
to
1771
| accountEmail: String | ||
| oauthStale: Boolean! @join__field(graph: API_JOURNEYS) @join__field(graph: API_JOURNEYS_MODERN) | ||
| } |
Contributor
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Search for oauthStale in legacy and modern schemas
echo "=== Searching in api-journeys schema ==="
rg -n "oauthStale" apis/api-journeys/schema.graphql
echo ""
echo "=== Searching in api-journeys-modern schema ==="
rg -n "oauthStale" apis/api-journeys-modern/schema.graphql
echo ""
echo "=== Searching in api-journeys resolvers ==="
fd -e ts -e js . apis/api-journeys --type f | head -20 | xargs -I {} rg -l "oauthStale" {}
echo ""
echo "=== Searching in api-journeys-modern resolvers ==="
fd -e ts -e js . apis/api-journeys-modern --type f | head -20 | xargs -I {} rg -l "oauthStale" {}Repository: JesusFilm/core
Length of output: 425
🏁 Script executed:
#!/bin/bash
# Get context around oauthStale in modern schema
echo "=== Context around oauthStale in api-journeys-modern ==="
sed -n '695,705p' apis/api-journeys-modern/schema.graphql
echo ""
echo "=== Check if this is in a type that appears in both schemas ==="
sed -n '690,705p' apis/api-journeys-modern/schema.graphql
echo ""
echo "=== Look for override directive examples in gateway schema ==="
rg -n "@override" apis/api-gateway/schema.graphql | head -10
echo ""
echo "=== Check what type oauthStale is part of in gateway ==="
sed -n '1760,1775p' apis/api-gateway/schema.graphqlRepository: JesusFilm/core
Length of output: 1486
Add @override directive to route oauthStale to the modern subgraph.
The oauthStale field exists only in api-journeys-modern but is declared in the gateway with @join__field(graph: API_JOURNEYS) @join__field(graph: API_JOURNEYS_MODERN). This will cause supergraph composition or runtime failures when querying the field through the legacy subgraph. Route it to the modern service using:
oauthStale: Boolean! `@join__field`(graph: API_JOURNEYS_MODERN) `@override`(from: "api-journeys")🤖 Prompt for AI Agents
In `@apis/api-gateway/schema.graphql` around lines 1769 - 1771, The gateway schema
declares the oauthStale field with `@join__field`(graph: API_JOURNEYS) and
`@join__field`(graph: API_JOURNEYS_MODERN) which will route queries to the legacy
subgraph incorrectly; update the oauthStale field declaration so it is routed to
the modern subgraph only by keeping the `@join__field`(graph: API_JOURNEYS_MODERN)
and add `@override`(from: "api-journeys") to indicate the modern subgraph owns the
field (locate the oauthStale field declaration in the schema and replace the
dual join__field directives with the single modern join__field plus the
`@override`(from: "api-journeys") directive).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit
✏️ Tip: You can customize this high-level summary in your review settings.