Skip to content

RG-T141 Fixing 2FA Issue - #548

Merged
ucswift merged 1 commit into
masterfrom
develop
Oct 9, 2026
Merged

ucswift merged 1 commit into
masterfrom
develop

Conversation

@ucswift

@ucswift ucswift commented Oct 9, 2026 •

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Two-factor sign-ins now restart with an expired-sign-in outcome when the pending sign-in is no longer available. The sign-in flow also retains the intended return destination, using the model’s return destination when one isn’t provided in the request.

@request-info

request-info Bot commented Oct 9, 2026

Copy link
Copy Markdown

Thanks for opening this, but we'd appreciate a little more information. Could you update it with more details?

@coderabbitai

coderabbitai Bot commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Repository: Resgrid/Core/.coderabbit.yaml
  • Review profile: CHILL
  • Plan: Essentials
  • Run ID: c627a50f-f1f5-4c68-857b-65f924672e3f
📥 Commits

Reviewing files that changed from the base of the PR and between 9751590 and afc9402.

⛔ Files ignored due to path filters (1)
  • Tests/Resgrid.Tests/Security/WebLoginMfaTransactionTests.Shared.cs is excluded by !**/Tests/**
📒 Files selected for processing (1)
  • Web/Resgrid.Web/Controllers/AccountController.cs

Included review availability: This review used your included allowance. 1 included review remains after this review. Your included PR review attempts over the past 7 days set your current allowance at 2 reviews per hour. Your free on-demand review promotion remains active until October 9, 2026 at 6:00 PM UTC.


📝 Walkthrough

Walkthrough

Both two-factor sign-in actions now restart sign-in with the Expired outcome if the active Identity two-factor user is unavailable. They use the query-string return URL, or the model return URL if the query value is absent.

Changes

Two-factor sign-in

Layer / File(s) Summary
Handle unavailable two-factor user
Web/Resgrid.Web/Controllers/AccountController.cs
LoginWith2fa no longer looks up a user using the submitted provider value. Both actions restart sign-in when the active Identity two-factor user is unavailable and select the return URL from the query string or model.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~8 minutes

Change: Bug fix

Merge Risk: ⚪ Minimal · up to afc94

Unavailable two-factor sign-in attempts now restart with an Expired outcome. No merge-blocking risk is established; proceed with normal checks.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check Passed The title identifies the main change as a fix for the 2FA sign-in issue and includes the related tracking ID.
Docstring Coverage Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 2 functions across 1 files.
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Comment @coderabbitai help to get the list of available commands.

@ucswift

ucswift commented Oct 9, 2026

Copy link
Copy Markdown
Member Author

Approve

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is approved.

@ucswift
ucswift merged commit da304c7 into master Oct 9, 2026
17 of 18 checks passed
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