Fix Google OAuth login loop and unify login/signup flow #653
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
**Issue**: Users selecting a tenant after OAuth would get a 500 error because the code tried to access tenant["is_admin"] (line 316) but the available_tenants list didn't include that field. **Root Cause**: During the unified OAuth flow refactoring, we removed the is_admin field from the available_tenants dict when building it in the OAuth callback (lines 274-289). **Fix**: Restore the is_admin logic: - Domain users: Always get admin access (is_admin=True) - Email-based users: Check User table for role, default to admin This matches the previous implementation and allows tenant selection to work correctly. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
**Issues**:
1. Primary action ("Continue") had white background, less prominent than secondary action
2. "Create New Account" was bright green and most prominent (wrong hierarchy)
3. "Cancel" button was confusing - nowhere useful to cancel to
4. Copy was verbose and unclear
**Improvements**:
- Primary button: Now btn-primary btn-lg w-100 (blue, large, full width)
- Secondary button: Changed to btn-outline-secondary (gray outline, less prominent)
- Removed "Cancel" button entirely (user is authenticated, nowhere to cancel to)
- Better visual hierarchy with separator and "Don't see your account?" text
- Enhanced tenant selection with blue highlight on selected/hover
- Cleaner copy: "Select an account to continue"
**Result**: Clear visual hierarchy - primary action is obvious, secondary is available but not distracting.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
danf-newton
pushed a commit
to Newton-Research-Inc/salesagent
that referenced
this pull request
Nov 24, 2025
…tocol#653) * fix: Add missing is_admin field to tenant selection data **Issue**: Users selecting a tenant after OAuth would get a 500 error because the code tried to access tenant["is_admin"] (line 316) but the available_tenants list didn't include that field. **Root Cause**: During the unified OAuth flow refactoring, we removed the is_admin field from the available_tenants dict when building it in the OAuth callback (lines 274-289). **Fix**: Restore the is_admin logic: - Domain users: Always get admin access (is_admin=True) - Email-based users: Check User table for role, default to admin This matches the previous implementation and allows tenant selection to work correctly. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: Improve tenant selector UX with proper button hierarchy **Issues**: 1. Primary action ("Continue") had white background, less prominent than secondary action 2. "Create New Account" was bright green and most prominent (wrong hierarchy) 3. "Cancel" button was confusing - nowhere useful to cancel to 4. Copy was verbose and unclear **Improvements**: - Primary button: Now btn-primary btn-lg w-100 (blue, large, full width) - Secondary button: Changed to btn-outline-secondary (gray outline, less prominent) - Removed "Cancel" button entirely (user is authenticated, nowhere to cancel to) - Better visual hierarchy with separator and "Don't see your account?" text - Enhanced tenant selection with blue highlight on selected/hover - Cleaner copy: "Select an account to continue" **Result**: Clear visual hierarchy - primary action is obvious, secondary is available but not distracting. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>
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
Completes the OAuth flow fixes to enable smooth Google authentication with proper tenant selection UX.
Changes
1. Fix Missing
is_adminField (Fix #1)Issue: After successfully selecting a tenant, users got a 500 error because the code tried to access
tenant["is_admin"]but the field wasn't included in the session data.Root Cause: During the unified OAuth flow refactoring, we removed the
is_adminfield when building theavailable_tenantslist.Fix: Restore the
is_adminlogic:is_admin=True)2. Improve Tenant Selector UX (Fix #2)
Issues:
Improvements:
btn-primary btn-lg w-100(blue, large, full width)btn-outline-secondary(gray outline, less prominent)Testing
Related PRs
Screenshots
Before: Primary action was less prominent than "Create New Account"
After: Clear visual hierarchy with blue primary button and gray outline secondary
🤖 Generated with Claude Code