Skip to content

fix: v2 ignore permissions check for 3rd party oauth#22588

Merged
supalarry merged 8 commits intomainfrom
lauris/cal-6117-fix-v2-3rd-party-oauth
Jul 18, 2025
Merged

fix: v2 ignore permissions check for 3rd party oauth#22588
supalarry merged 8 commits intomainfrom
lauris/cal-6117-fix-v2-3rd-party-oauth

Conversation

@supalarry
Copy link
Copy Markdown
Contributor

Linear CAL-6117

@supalarry supalarry requested a review from a team July 17, 2025 10:10
@supalarry supalarry requested a review from a team as a code owner July 17, 2025 10:10
@linear
Copy link
Copy Markdown

linear bot commented Jul 17, 2025

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Jul 17, 2025

Walkthrough

The changes introduce a new TokensService responsible for decoding and validating third-party OAuth access tokens using JWT verification. The PermissionsGuard class is updated to inject TokensService and bypass permission checks when a valid third-party bearer token is detected. Similarly, ApiAuthStrategy refactors its third-party token validation to delegate decoding to TokensService. Module configurations are adjusted to import TokensModule and provide TokensService where needed. Tests for PermissionsGuard and ApiAuthStrategy are updated to accommodate the new service and token validation logic.

Assessment against linked issues

Objective Addressed Explanation
Skip permission checks in permissions.guard.ts for 3rd party OAuth tokens (CAL-6117) The PermissionsGuard now uses TokensService to identify third-party tokens and skip checks accordingly.

Assessment against linked issues: Out-of-scope changes

No out-of-scope changes were found. All modifications are directly related to the objective of handling third-party OAuth tokens and updating permission checks accordingly.

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.ts

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the plugin "@typescript-eslint/eslint-plugin".

(The package "@typescript-eslint/eslint-plugin" was not found when loaded as a Node module from the directory "/apps/api/v2".)

It's likely that the plugin isn't installed correctly. Try reinstalling by running the following:

npm install @typescript-eslint/eslint-plugin@latest --save-dev

The plugin "@typescript-eslint/eslint-plugin" was referenced from the config file in "apps/api/v2/.eslintrc.js".

If you still can't figure out the problem, please stop by https://eslint.org/chat/help to chat with the team.

apps/api/v2/src/modules/tokens/tokens.module.ts

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the plugin "@typescript-eslint/eslint-plugin".

(The package "@typescript-eslint/eslint-plugin" was not found when loaded as a Node module from the directory "/apps/api/v2".)

It's likely that the plugin isn't installed correctly. Try reinstalling by running the following:

npm install @typescript-eslint/eslint-plugin@latest --save-dev

The plugin "@typescript-eslint/eslint-plugin" was referenced from the config file in "apps/api/v2/.eslintrc.js".

If you still can't figure out the problem, please stop by https://eslint.org/chat/help to chat with the team.

apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.spec.ts

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the plugin "@typescript-eslint/eslint-plugin".

(The package "@typescript-eslint/eslint-plugin" was not found when loaded as a Node module from the directory "/apps/api/v2".)

It's likely that the plugin isn't installed correctly. Try reinstalling by running the following:

npm install @typescript-eslint/eslint-plugin@latest --save-dev

The plugin "@typescript-eslint/eslint-plugin" was referenced from the config file in "apps/api/v2/.eslintrc.js".

If you still can't figure out the problem, please stop by https://eslint.org/chat/help to chat with the team.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 0b16a59 and 66842e2.

📒 Files selected for processing (3)
  • apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.spec.ts (4 hunks)
  • apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.ts (4 hunks)
  • apps/api/v2/src/modules/tokens/tokens.module.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (3)
  • apps/api/v2/src/modules/tokens/tokens.module.ts
  • apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.spec.ts
  • apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.ts
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
  • GitHub Check: Security Check
✨ Finishing Touches
  • 📝 Generate Docstrings

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

@graphite-app graphite-app bot requested a review from a team July 17, 2025 10:10
@keithwillcode keithwillcode added core area: core, team members only platform Anything related to our platform plan labels Jul 17, 2025
@vercel
Copy link
Copy Markdown

vercel bot commented Jul 17, 2025

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

2 Skipped Deployments
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Jul 18, 2025 1:16pm
cal-eu ⬜️ Ignored (Inspect) Visit Preview Jul 18, 2025 1:16pm

@dosubot dosubot bot added api area: API, enterprise API, access token, OAuth authentication area: authentication, auth, google sign in, password, SAML, password reset, can't log in labels Jul 17, 2025
@supalarry supalarry enabled auto-merge (squash) July 17, 2025 10:13
@delve-auditor
Copy link
Copy Markdown

delve-auditor bot commented Jul 17, 2025

No security or compliance issues detected. Reviewed everything up to be82ea0.

Security Overview
  • 🔎 Scanned files: 7 changed file(s)
Detected Code Changes
Change Type Relevant files
Refactor ► permissions.guard.ts
    Add third-party token validation
► permissions.guard.spec.ts
    Add tests for third-party token validation
► api-auth.strategy.ts
    Move token validation logic to TokensService
► tokens.service.ts
    Add token validation service
► tokens.module.ts
    Add TokensService to module exports

Reply to this PR with @delve-auditor followed by a description of what change you want and we'll auto-submit a change to this PR to implement it.

@graphite-app
Copy link
Copy Markdown

graphite-app bot commented Jul 17, 2025

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (07/17/25)

1 reviewer was added to this PR based on Keith Williams's automation.

@vercel vercel bot temporarily deployed to Preview – api July 17, 2025 10:30 Inactive
@vercel vercel bot temporarily deployed to Preview – cal July 17, 2025 10:30 Inactive
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 17, 2025

E2E results are ready!

@vercel vercel bot temporarily deployed to Preview – api July 17, 2025 10:58 Inactive
@vercel vercel bot temporarily deployed to Preview – cal July 17, 2025 10:58 Inactive
Copy link
Copy Markdown
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: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between e73935d and 0b16a59.

📒 Files selected for processing (1)
  • apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.spec.ts (2 hunks)
🧰 Additional context used
🧠 Learnings (1)
📓 Common learnings
Learnt from: alishaz-polymath
PR: calcom/cal.com#22304
File: packages/prisma/schema.prisma:1068-1071
Timestamp: 2025-07-16T05:10:22.863Z
Learning: In PR #22304 for Cal.com private link expiration features, the `maxUsageCount` field was intentionally set to default to 1 (non-nullable) as a breaking change, making all existing private links single-use after migration. This was a deliberate design decision by alishaz-polymath.
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)
  • GitHub Check: Install dependencies / Yarn install & cache
  • GitHub Check: Security Check
🔇 Additional comments (1)
apps/api/v2/src/modules/auth/guards/permissions/permissions.guard.spec.ts (1)

4-4: LGTM - Import added correctly.

The import for TokensService is properly added to support the mock creation in the test setup.

@supalarry supalarry merged commit 2115a04 into main Jul 18, 2025
63 of 65 checks passed
@supalarry supalarry deleted the lauris/cal-6117-fix-v2-3rd-party-oauth branch July 18, 2025 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api area: API, enterprise API, access token, OAuth authentication area: authentication, auth, google sign in, password, SAML, password reset, can't log in core area: core, team members only platform Anything related to our platform plan ready-for-e2e

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants