Skip to content

Update token expiry logic#625

Merged
edulelis merged 1 commit intoelie222:stagingfrom
edulelis:staging-test-select-account-prompt
Aug 1, 2025
Merged

Update token expiry logic#625
edulelis merged 1 commit intoelie222:stagingfrom
edulelis:staging-test-select-account-prompt

Conversation

@edulelis
Copy link
Collaborator

@edulelis edulelis commented Aug 1, 2025

Summary by CodeRabbit

  • Bug Fixes

    • Improved handling of token expiration and refresh for Microsoft Entra ID and Google sign-ins, reducing the likelihood of authentication issues.
    • Enhanced reliability of user sign-in by ensuring refresh tokens are managed correctly for both providers.
  • Chores

    • Added logging around token expiration and refresh attempts for better traceability.

@vercel
Copy link

vercel bot commented Aug 1, 2025

@edulelis is attempting to deploy a commit to the Inbox Zero OSS Program Team on Vercel.

A member of the Team first needs to authorize it.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Aug 1, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

The JWT callback logic in the authentication utility was refactored to distinctly handle token refresh and field management for Microsoft Entra ID and Google providers. The update introduces explicit expiration checks, token refresh flows, and logging for both providers, separating first sign-in and subsequent sign-in scenarios, and restructures token field updates accordingly.

Changes

Cohort / File(s) Change Summary
Auth JWT Callback Refactor
apps/web/utils/auth.ts
Refactored JWT callback to add explicit expiration checks, provider-specific token refresh logic, structured token field updates, and logging for Microsoft Entra ID and Google providers. Removed unconditional provider setting and restructured Google sign-in flows.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant AuthCallback
    participant TokenDB
    participant Logger

    User->>AuthCallback: Initiate JWT callback (with token, account, user)
    alt Provider is Microsoft Entra ID
        AuthCallback->>AuthCallback: Check token expiration
        alt Token valid
            AuthCallback->>AuthCallback: Remove picture/user fields
            AuthCallback-->>User: Return token
        else Token expired
            AuthCallback->>Logger: Log expiration
            AuthCallback->>AuthCallback: Refresh token
            AuthCallback->>AuthCallback: Remove picture/user fields
            AuthCallback-->>User: Return refreshed token
        end
    else Provider is Google
        alt First sign-in (account & user defined)
            alt Refresh token present
                AuthCallback->>TokenDB: Save refresh token
            else
                AuthCallback->>TokenDB: Retrieve refresh token
            end
            AuthCallback->>AuthCallback: Update token fields
            AuthCallback-->>User: Return token
        else Subsequent sign-in
            AuthCallback->>AuthCallback: Check token expiration
            alt Token valid
                AuthCallback-->>User: Return token
            else Token expired
                AuthCallback->>Logger: Log expiration
                AuthCallback->>AuthCallback: Refresh token
                AuthCallback->>Logger: Log new expiration
                AuthCallback-->>User: Return refreshed token
            end
        end
    else
        AuthCallback-->>User: Return token as is
    end
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~7 minutes

Possibly related PRs

Poem

A token hops from field to field,
With Entra and Google, its fate is sealed.
Expiry checked, refresh in tow,
Logs now tell us when to go.
A rabbit’s leap through auth’s new gate—
Secure and fresh, tokens celebrate!
🐇✨


📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 33ccd37 and 7ab95b7.

📒 Files selected for processing (1)
  • apps/web/utils/auth.ts (1 hunks)
✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment

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.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@edulelis edulelis merged commit 7b5186a into elie222:staging Aug 1, 2025
4 of 7 checks passed
@coderabbitai coderabbitai bot mentioned this pull request Aug 4, 2025
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

Comments