feat: classify auth for google reconnect on server by tyler-dane · Pull Request #1535 · SwitchbackTech/compass

tyler-dane · 2026-03-13T03:54:29Z

Implements the server-owned Google auth finalization cleanup.

moves Google auth mode selection fully server-side (SIGNUP / SIGNIN_INCREMENTAL / RECONNECT_REPAIR)
removes client reconnect intent and client-side auth classification
keeps the client focused on launching OAuth, reflecting server metadata/socket state, and uploading device-local events after success
updates docs and focused auth tests

Follow-Up Plan

This PR follows the server-owned auth finalization plan: move Google auth finalization fully server-side so the backend owns SIGNUP / SIGNIN_INCREMENTAL / RECONNECT_REPAIR selection, reconnect repair, metadata updates, and sync kickoff; keep the client limited to launching OAuth, submitting the payload, and uploading device-local events after success.

Note

High Risk
Changes Google OAuth finalization and sync repair decisions on the backend and updates status enums across core/backend/web; mistakes could misroute auth flows or leave users stuck in repair/import states. Broad cross-package status casing changes increase integration/regression risk despite added tests and backward-compatible normalization.

Overview
Moves Google OAuth flow routing to be server-owned: handleGoogleAuth now classifies SIGNUP vs SIGNIN_INCREMENTAL vs RECONNECT_REPAIR using persisted user state (refresh token + sync health) and invokes googleSignup, googleSignin, or new repairGoogleConnection accordingly; client-provided reconnect intent is removed from both web payloads and backend SuperTokens middleware.

Standardizes Google sync/import statuses to uppercase across shared types (UserMetadata sync flags, GoogleSyncStatus, and websocket ImportGCalEndPayload) and adds normalizeSyncStatus() to tolerate legacy lowercase values while evaluating import/repair logic.

Updates web UI/auth and socket sync behavior to reflect server metadata/events (no local reconnect intent; avoid treating isImportPending as importing; don’t auto-request import when reconnect_required), adjusts backend sync/import paths to emit the new status values, and fixes Playwright flakiness by pressing the save shortcut via the focused title input; documentation and tests are updated to match.

^{Written by Cursor Bugbot for commit 91e3d81. This will update automatically on new commits. Configure here.}

tyler-dane · 2026-03-13T03:57:12Z

@cursoragent Please pick up where I left off by implementing the plan in the issue body and using your best judgement until it's at a satisfactory level

cursor · 2026-03-13T03:57:19Z

Implementation summary

Core changes

Server-side auth mode determination (google.auth.success.service.ts)
- determineAuthMode() checks user existence, refresh token presence, and sync health
- handleGoogleAuth() routes based on server-side state
- Three auth modes: signup, signin_incremental, reconnect_repair
Improved canDoIncrementalSync() (sync.util.ts)
- Handles undefined/empty events arrays
- Returns false when sync data is missing or incomplete
- Added JSDoc
repairGoogleConnection() method (compass.auth.service.ts)
- Renamed from reconnectGoogleForSession()
- Takes compassUserId as first parameter (not session-based)
- Relinks credentials and restarts sync
Deprecated functions (supertokens.middleware.util.ts)
- resolveGoogleSessionUserId() and getGoogleAuthIntent() marked as deprecated
- Still pass through for logging but no longer authoritative for routing

Testing

All backend tests pass (8 tests for handleGoogleAuth)
Edge cases covered: missing refresh token, unhealthy sync, no sync record, etc.
Tests verify correct routing for each auth mode

Documentation

Updated docs/google-sync-and-websocket-flow.md with the new auth flow
Type definitions include deprecation notices
JSDoc added to key functions

Status

The implementation follows the plan:

Auth mode is determined server-side using persisted user state
Frontend googleAuthIntent is kept as a hint but is non-authoritative
Reconnect flows correctly route through repairGoogleConnection() when needed
Edge cases are handled

The code is ready for review and testing. All tests pass, and the changes have been committed and pushed to the refactor/auth-sign-in branch.

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

✅ Fixed: Four unused imports left after removing determineAuthMethod
- Removed the four unused imports (error, getSync, canDoIncrementalSync, findCompassUserBy) that were left behind after determineAuthMethod was removed.

…mination - Renamed `reconnectGoogleForSession` to `repairGoogleConnection` to better reflect its purpose in handling Google connection repairs. - Enhanced the logic for determining the auth mode based on server-side state, replacing reliance on frontend intent. - Updated documentation to clarify the new auth mode classification and deprecated fields. - Refactored related tests to align with the new method names and logic, ensuring comprehensive coverage of the updated functionality.

- Updated various interface definitions across the codebase to improve formatting and readability by aligning type extensions and removing unnecessary line breaks. - Adjusted interfaces in event, user, and component types to follow a consistent style, enhancing maintainability and clarity.

- Add explicit handling for undefined/empty events arrays - Add comprehensive JSDoc documentation - Ensure function returns false when sync data is missing or incomplete - This ensures reconnect_repair path is correctly triggered when sync is unhealthy Co-authored-by: Tyler Dane <tyler-dane@users.noreply.github.com>

Co-authored-by: Tyler Dane <tyler-dane@users.noreply.github.com>

…functions - Eliminated the sessionUserId field from GoogleSignInSuccess type and related functions, as auth mode is now determined server-side. - Removed the resolveGoogleSessionUserId function and its associated tests, streamlining the Google authentication process. - Updated the useGoogleAuth hook to reflect these changes, ensuring a cleaner implementation without reliance on frontend-provided intent. Co-authored-by: Tyler Dane <tyler-dane@users.noreply.github.com>

…ming - Added a guideline for using uppercase and underscores for constant names, exemplified by `SIGNIN_INCREMENTAL`. - Updated documentation to reflect the new naming conventions for auth modes: `SIGNUP`, `SIGNIN_INCREMENTAL`, and `RECONNECT_REPAIR`. - Ensured consistency in the codebase by renaming references to auth modes in tests and service files. Co-authored-by: Tyler Dane <tyler-dane@users.noreply.github.com>

- Updated the Google authentication process to eliminate reliance on the `googleAuthIntent` from the frontend, making the server the authoritative source for auth mode determination. - Refactored related components and hooks to reflect this change, ensuring a cleaner and more consistent implementation. - Adjusted tests to align with the new logic, removing references to the deprecated intent and enhancing overall test coverage. Co-authored-by: Tyler Dane <tyler-dane@users.noreply.github.com>

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Autofix Details

Bugbot Autofix prepared a fix for the issue found in the latest run.

✅ Fixed: Repair button stays enabled allowing duplicate API calls
- Fixed by including isImportPending in the isImporting calculation, which immediately disables the repair button when clicked, preventing duplicate API calls during the gap before the websocket event arrives.

- Streamlined interface definitions across various files to enhance readability by aligning type extensions and removing unnecessary line breaks. - Updated interfaces in event, user, and component types to follow a consistent style, improving maintainability and clarity.

- Added a test to ensure that an import request is not automatically triggered when the Google connection status is "reconnect_required". - Updated the logic in the useGcalSync hook to only auto-request an import when the connection status is "connected". - Improved test coverage for various connection scenarios, ensuring robust handling of metadata updates.

- Updated all instances of sync status values in the codebase to use uppercase naming conventions: "IMPORTING", "ERRORED", "COMPLETED", and "RESTART". - Adjusted related tests and documentation to reflect these changes, ensuring consistency across the application. - Improved clarity and maintainability of the sync logic by adhering to a unified naming standard.

…form submission - Updated Playwright configuration to utilize 2 workers for parallel test execution, enhancing performance. - Modified event form submission logic to use `locator.press()` for sending key events, ensuring focus remains on the input field during CI tests. - This change addresses potential issues with form submission visibility and reliability in automated testing environments.

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{Bugbot Autofix is ON. A cloud agent has been kicked off to fix the reported issue.}

cursor · 2026-03-16T00:15:40Z

+  compassUserId: string | null;
+  hasStoredRefreshToken: boolean;
+  hasHealthySync: boolean;
+  createdNewRecipeUser: boolean;


Unused fields in AuthDecision type add dead code

Low Severity

The AuthDecision type includes hasStoredRefreshToken, hasHealthySync, and createdNewRecipeUser fields that are computed inside determineAuthMode but never read by handleGoogleAuth. The consumer only accesses decision.authMode and decision.compassUserId, making the other three fields dead code that increases cognitive overhead without adding value.

Additional Locations (1)

packages/backend/src/auth/services/google/google.auth.success.service.ts#L101-L120

cursor Bot reviewed Mar 13, 2026

View reviewed changes

Comment thread packages/backend/src/auth/services/google/google.auth.success.service.ts

cursor Bot reviewed Mar 13, 2026

View reviewed changes

Comment thread packages/backend/src/auth/services/google/google.auth.success.service.ts

cursor Bot reviewed Mar 13, 2026

View reviewed changes

Comment thread packages/backend/src/auth/services/compass.auth.service.ts

tyler-dane and others added 8 commits March 15, 2026 15:14

fix(backend): correct warning log message for auth edge case

2c083f3

Co-authored-by: Tyler Dane <tyler-dane@users.noreply.github.com>

fix(backend): remove dead determineAuthMethod function

c039872

Co-authored-by: Tyler Dane <tyler-dane@users.noreply.github.com>

fix(backend): remove unused imports from compass.auth.service

3b70a0d

Co-authored-by: Tyler Dane <tyler-dane@users.noreply.github.com>

tyler-dane force-pushed the refactor/auth-sign-in branch from 073bfda to 9030f1d Compare March 15, 2026 22:33

tyler-dane mentioned this pull request Mar 15, 2026

refactor(auth): update Google authentication handling and improve tests #1534

Closed

tyler-dane changed the title ~~refactor(types): streamline interface definitions for better readability~~ feat: classify auth for google reconnect on server Mar 15, 2026

cursor Bot reviewed Mar 15, 2026

View reviewed changes

Comment thread packages/web/src/auth/hooks/oauth/useConnectGoogle.ts

tyler-dane force-pushed the refactor/auth-sign-in branch from 6e1cf62 to 4b24db2 Compare March 15, 2026 23:28

tyler-dane added 3 commits March 15, 2026 16:41

cursor Bot reviewed Mar 15, 2026

View reviewed changes

Comment thread packages/core/src/types/user.types.ts

Comment thread packages/backend/src/auth/services/google/google.auth.success.service.ts

cursor Bot reviewed Mar 16, 2026

View reviewed changes

Comment thread packages/backend/src/sync/controllers/sync.controller.ts

Comment thread packages/web/src/socket/hooks/useGcalSync.ts

cursor Bot reviewed Mar 16, 2026

View reviewed changes

tyler-dane force-pushed the refactor/auth-sign-in branch from 91e3d81 to 90d762d Compare March 16, 2026 00:16

tyler-dane merged commit c58f113 into main Mar 16, 2026
14 checks passed

tyler-dane deleted the refactor/auth-sign-in branch March 16, 2026 00:16

tyler-dane mentioned this pull request Mar 16, 2026

refactor: uppercase status for consistency #1538

Merged

This was referenced Mar 16, 2026

Infinite spinner when user tries to sign out due to 400 error #1501

Closed

Client needs to cleanup after user revoked access #1494

Closed

Remove Google data after user revokes access #1480

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: classify auth for google reconnect on server#1535

feat: classify auth for google reconnect on server#1535
tyler-dane merged 13 commits intomainfrom
refactor/auth-sign-in

tyler-dane commented Mar 13, 2026 •

edited by cursor Bot

Loading

Uh oh!

tyler-dane commented Mar 13, 2026

Uh oh!

cursor Bot commented Mar 13, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment •

edited

Loading

Uh oh!

Uh oh!

cursor Bot left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment

Uh oh!

cursor Bot Mar 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

tyler-dane commented Mar 13, 2026 • edited by cursor Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Follow-Up Plan

Uh oh!

tyler-dane commented Mar 13, 2026

Uh oh!

cursor Bot commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Implementation summary

Core changes

Testing

Documentation

Status

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cursor Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

cursor Bot Mar 16, 2026

Choose a reason for hiding this comment

Unused fields in AuthDecision type add dead code

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

tyler-dane commented Mar 13, 2026 •

edited by cursor Bot

Loading

cursor Bot commented Mar 13, 2026 •

edited

Loading

cursor Bot left a comment •

edited

Loading

cursor Bot left a comment •

edited

Loading

Unused fields in `AuthDecision` type add dead code