Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(services-bff): Add missing exp check on the user endpoint #17247

Merged
merged 3 commits into from
Dec 16, 2024

Conversation

snaerth
Copy link
Member

@snaerth snaerth commented Dec 16, 2024

Fix for missing expiration check on the user endpoint

What

Add a utility function to check if the access token has expired before attempting to refresh it. This change improves the efficiency of the token refresh process by ensuring that refresh operations are only triggered when necessary.

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • Formatting passes locally with my changes
  • I have rebased against main before asking for a review

Summary by CodeRabbit

  • New Features
    • Enhanced token refresh logic in the user service to check for token expiration before refreshing.
  • Bug Fixes
    • Improved test coverage for the token refresh functionality, ensuring correct behavior under various conditions.

Add a utility function to check if the access token has expired 
before attempting to refresh it. This change improves the 
efficiency of the token refresh process by ensuring that 
refresh operations are only triggered when necessary.
Add tests to verify token refresh behavior based on token 
expiration and refresh query parameter. Ensure that the 
refreshToken service is called only when the token exists, 
is expired, and refresh is set to true. This improves 
test coverage and ensures correct handling of token 
refresh scenarios.
@snaerth snaerth requested a review from a team as a code owner December 16, 2024 11:28
Copy link
Contributor

coderabbitai bot commented Dec 16, 2024

Walkthrough

This pull request focuses on enhancing the token refresh logic and test coverage in the BFF (Backend for Frontend) user service. The changes involve updating the UserService to improve token expiration checks and adding comprehensive test cases in the UserController test suite. The modifications aim to ensure more robust token management by introducing a new utility function to check token expiration and expanding the test scenarios for different token refresh conditions.

Changes

File Change Summary
apps/services/bff/src/app/modules/user/user.controller.spec.ts Added new test cases for token refresh scenarios, including tests for:
- Token not refreshed when valid and non-expired
- Token refresh logic with various conditions (existence, expiration, refresh flag)
apps/services/bff/src/app/modules/user/user.service.ts Introduced hasTimestampExpiredInMS utility function
Updated getUser method to include more precise token expiration check
Refined token refresh logic

Sequence Diagram

sequenceDiagram
    participant Client
    participant UserController
    participant UserService
    participant TokenCache

    Client->>UserController: GET /user request
    UserController->>UserService: getUser()
    UserService->>TokenCache: Check cached token
    alt Token exists and not expired
        UserService-->>UserController: Return existing token
    else Token expired and refresh=true
        UserService->>TokenCache: Refresh token
        TokenCache-->>UserService: New token
        UserService-->>UserController: Return new token
    else No valid token
        UserService-->>UserController: Throw Unauthorized
    end
    UserController-->>Client: Respond with token/error
Loading

Possibly related PRs

Suggested reviewers

  • baering
  • eirikurn

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ 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.
    • Generate unit testing code for this file.
    • 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 generate unit testing code for this file.
    • @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 generate unit testing code.
    • @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.

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. (Beta)
  • @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.

@snaerth snaerth added the automerge Merge this PR as soon as all checks pass label Dec 16, 2024
Copy link
Member

@eirikurn eirikurn left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
apps/services/bff/src/app/modules/user/user.controller.spec.ts (1)

273-344: LGTM: Comprehensive test matrix for token refresh conditions

Excellent test coverage using a matrix approach to verify all possible combinations:

  • Token existence
  • Token expiration status
  • Refresh flag value

The test structure ensures thorough validation of the new token refresh logic.

Consider adding a test case for invalid token format to improve edge case coverage.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4fcc879 and ca67dd9.

📒 Files selected for processing (2)
  • apps/services/bff/src/app/modules/user/user.controller.spec.ts (1 hunks)
  • apps/services/bff/src/app/modules/user/user.service.ts (2 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
apps/services/bff/src/app/modules/user/user.service.ts (2)

Pattern apps/services/**/*: "Confirm that the code adheres to the following:

  • NestJS architecture, including modules, services, and controllers.
  • Dependency injection patterns and service encapsulation.
  • Integration and unit testing coverage and practices."

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/services/bff/src/app/modules/user/user.controller.spec.ts (2)

Pattern apps/services/**/*: "Confirm that the code adheres to the following:

  • NestJS architecture, including modules, services, and controllers.
  • Dependency injection patterns and service encapsulation.
  • Integration and unit testing coverage and practices."

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
🔇 Additional comments (3)
apps/services/bff/src/app/modules/user/user.service.ts (2)

8-8: LGTM: Clean import of utility function

The addition of the hasTimestampExpiredInMS utility import follows NestJS best practices for code organization.


62-66: LGTM: Enhanced token refresh logic with expiration check

The modified condition properly implements the PR objective by checking three criteria before refreshing:

  1. Token exists (cachedTokenResponse)
  2. Token has expired (hasTimestampExpiredInMS)
  3. Refresh is enabled (refresh)

This optimization prevents unnecessary token refreshes.

apps/services/bff/src/app/modules/user/user.controller.spec.ts (1)

234-271: LGTM: Well-structured test for non-expired token scenario

The test properly verifies that tokens are not refreshed when they haven't expired, even if refresh is requested. Good use of NestJS testing patterns and clear arrange-act-assert structure.

Copy link

codecov bot commented Dec 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 35.74%. Comparing base (cfe3d07) to head (0897a9c).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main   #17247   +/-   ##
=======================================
  Coverage   35.74%   35.74%           
=======================================
  Files        6937     6937           
  Lines      148284   148284           
  Branches    42311    42311           
=======================================
  Hits        52998    52998           
  Misses      95286    95286           
Flag Coverage Δ
judicial-system-api 20.20% <ø> (ø)
judicial-system-backend 55.83% <ø> (ø)
judicial-system-formatters 78.33% <ø> (ø)
judicial-system-message 66.48% <ø> (ø)
judicial-system-message-handler 48.16% <ø> (ø)
judicial-system-scheduler 70.92% <ø> (ø)
judicial-system-types 42.09% <ø> (ø)
judicial-system-web 27.93% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cfe3d07...0897a9c. Read the comment docs.

@kodiakhq kodiakhq bot merged commit 8aa0e52 into main Dec 16, 2024
43 checks passed
@kodiakhq kodiakhq bot deleted the bff-user-refresh-token-fix branch December 16, 2024 12:40
snaerth added a commit that referenced this pull request Dec 16, 2024
* fix(user): enhance token refresh logic with expiration check

Add a utility function to check if the access token has expired 
before attempting to refresh it. This change improves the 
efficiency of the token refresh process by ensuring that 
refresh operations are only triggered when necessary.

* test: enhance user token refresh logic in tests

Add tests to verify token refresh behavior based on token 
expiration and refresh query parameter. Ensure that the 
refreshToken service is called only when the token exists, 
is expired, and refresh is set to true. This improves 
test coverage and ensures correct handling of token 
refresh scenarios.

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this PR as soon as all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants