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: ensure workspace is loaded #2470

Merged
merged 1 commit into from
Oct 16, 2024
Merged

fix: ensure workspace is loaded #2470

merged 1 commit into from
Oct 16, 2024

Conversation

chronark
Copy link
Collaborator

@chronark chronark commented Oct 16, 2024

Summary by CodeRabbit

  • Bug Fixes
    • Improved error handling for missing workspaces during key verification, ensuring a default value is returned instead of undefined.
    • Enhanced logging for cases where a workspace cannot be found.

These updates provide a more reliable key verification process, improving the overall user experience.

Copy link

vercel bot commented Oct 16, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
dashboard ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 16, 2024 10:26pm
engineering ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 16, 2024 10:26pm
play ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 16, 2024 10:26pm
workflows ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 16, 2024 10:26pm
www ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 16, 2024 10:26pm

Copy link

changeset-bot bot commented Oct 16, 2024

⚠️ No Changeset found

Latest commit: c45b5a8

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented Oct 16, 2024

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Walkthrough

The changes made in this pull request involve modifications to the _verifyKey method of the KeyService class in apps/api/src/pkg/keys/service.ts. The update adds logic to handle scenarios where a workspace associated with a key is not found. If the workspace is not present, the method attempts to retrieve it again using the workspaceId. If it remains unfound, an error is logged, and a DisabledWorkspaceError is returned with the workspaceId. Additionally, the error handling has been adjusted to return a default value of "N/A" for the workspace ID when the workspace is unavailable.

Changes

File Change Summary
apps/api/src/pkg/keys/service.ts Modified _verifyKey method to handle missing workspace cases and updated error handling for DisabledWorkspaceError.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant KeyService
    participant Database
    participant Logger

    User->>KeyService: verifyKey(key)
    KeyService->>Database: queryWorkspace(data.workspace)
    alt Workspace found
        KeyService-->>User: return valid key
    else Workspace not found
        KeyService->>Database: fetchWorkspace(workspaceId)
        alt Workspace still not found
            KeyService->>Logger: log error("Workspace not found")
            KeyService-->>User: return DisabledWorkspaceError(workspaceId)
        else Workspace found
            KeyService-->>User: return valid key
        end
    end
Loading

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 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.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

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.

Copy link
Contributor

github-actions bot commented Oct 16, 2024

Thank you for following the naming conventions for pull request titles! 🙏

@chronark chronark merged commit 8b37287 into main Oct 16, 2024
27 checks passed
@chronark chronark deleted the quickfix branch October 16, 2024 22:27
Flo4604 pushed a commit to Flo4604/unkey that referenced this pull request Oct 19, 2024
github-merge-queue bot pushed a commit that referenced this pull request Oct 20, 2024
* fix: Missing plan check and ip whitelist parsing

* fix: adjust tests for ipwhitelist

* fix: Rename error code

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: ipwhitelist via features vs enterprise plan

* fix: invert condition

* chore: add cache log

* fix: ensure workspace is loaded (#2470)

* chore: more logging and retries (#2475)

* Update 7_create_a_template.md (#2471)

* increase override limit

* Update create-new-override.tsx

* fix: Enhance API Key Detail Page: Change Permissions Visualization to Tree Format (#2238)

* fix:changed the permission view

* fixed issue comments

* [autofix.ci] apply automated fixes

* removed font

---------

Co-authored-by: Andreas Thomas <dev@chronark.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* fix: show shallow permissions followed by nested in alphabetical order (#2273)

* fix: show shallow permissions followed by nested in alphabetical order

* fix: correct the sorting of nested permissions top level keys

* [autofix.ci] apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* Add Template to Markdown (#2362)

Co-authored-by: Andreas Thomas <dev@chronark.com>

* fix: retry on any error with disabled cache

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: chronark <dev@chronark.com>
Co-authored-by: Chirag Arora <chirag8023@gmail.com>
Co-authored-by: RajuGangitla <gangitlaraju8520@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Anne Deepa Prasanna <anneraj73@gmail.com>
Co-authored-by: djnovin <95838226+djnovin@users.noreply.github.com>
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.

2 participants