Skip to content

fix(apps/web): enhance JWT response with token type and expiration details - #24841

Merged
dhairyashiil merged 9 commits into
calcom:mainfrom
zhyd1997:fix/yadong-issue-24840-1761999763
Nov 9, 2025
Merged

dhairyashiil merged 9 commits into
calcom:mainfrom
zhyd1997:fix/yadong-issue-24840-1761999763

Conversation

@zhyd1997

@zhyd1997 zhyd1997 commented Nov 1, 2025 •

Copy link
Copy Markdown
Contributor

What does this PR do?

Visual Demo (For contributors especially)

A visual demonstration is strongly recommended, for both the original and new change (video / image - any one).

Video Demo (if applicable):

  • Show screen recordings of the issue or feature.
  • Demonstrate how to reproduce the issue, the behavior before and after the change.

Image Demo (if applicable):

  • Add side-by-side screenshots of the original and updated change.
  • Highlight any significant change(s).

Mandatory Tasks (DO NOT REMOVE)

  • I have self-reviewed the code (A decent size PR without self-review might be rejected).
  • I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
  • I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

  • Are there environment variables that should be set?
  • What are the minimal test data to have?
  • What is expected (happy path) to have (input and output)?
  • Any other important info that could help to test that PR

Checklist

  • I haven't read the contributing guide
  • My code doesn't follow the style guidelines of this project
  • I haven't commented my code, particularly in hard-to-understand areas
  • I haven't checked if my changes generate no new warnings

TODO:
PLEASE UPDATE THE DOC HERE:
https://cal.com/help/apps-and-integrations/oauth#access-token-request


Summary by cubic

Make the OAuth token endpoint RFC 6749 compliant by including token_type=bearer and expires_in=1800, and by adding no-store cache headers. Fixes clients failing to parse token type and expiry (CAL-6674, #24840).

Written for commit 435d34f. Summary will update automatically on new commits.

@vercel

vercel Bot commented Nov 1, 2025

Copy link
Copy Markdown

@zhyd1997 is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

@github-actions github-actions Bot added the 🐛 bug Something isn't working label Nov 1, 2025
@zhyd1997
zhyd1997 marked this pull request as ready for review November 1, 2025 12:31
@graphite-app graphite-app Bot added the community Created by Linear-GitHub Sync label Nov 1, 2025

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

No issues found across 1 file

volnei
volnei previously approved these changes Nov 3, 2025

@volnei volnei left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@zhyd1997 thank you for you contribution. Good to have the response aligned with OAuth2 patterns. Can you please check for tests failing?

@github-actions

github-actions Bot commented Nov 3, 2025 •

Copy link
Copy Markdown
Contributor

E2E results are ready!

@anikdhabal
anikdhabal enabled auto-merge (squash) November 3, 2025 15:39
@zhyd1997

zhyd1997 commented Nov 3, 2025

Copy link
Copy Markdown
Contributor Author

Hi @volnei

Thanks for your review, the failed e2e tests doesn’t related to the code changes in the pull request.

@zhyd1997

zhyd1997 commented Nov 3, 2025

Copy link
Copy Markdown
Contributor Author

Failed again, interesting!

@devin-ai-integration
devin-ai-integration Bot force-pushed the fix/yadong-issue-24840-1761999763 branch from 257059f to 8c2718f Compare November 3, 2025 16:53
@pull-request-size pull-request-size Bot added size/S and removed size/M labels Nov 3, 2025

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

No issues found across 2 files

auto-merge was automatically disabled November 4, 2025 06:27

Head branch was pushed to by a user without write access

@zhyd1997

zhyd1997 commented Nov 5, 2025

Copy link
Copy Markdown
Contributor Author

CI passed finally ✅

@dhairyashiil
dhairyashiil merged commit e24e1d8 into calcom:main Nov 9, 2025
33 of 37 checks passed
akarsh-jain-790 pushed a commit to akarsh-jain-790/cal.com that referenced this pull request Mar 8, 2026
…tails (calcom#24841)

* fix: enhance JWT response with token type and expiration details

* fix: update email generation in createUsersFixture to use v4 UUID without dashes

* revert: update email generation in createUsersFixture to use short-uuid for unique email identifiers

---------

Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Volnei Munhoz <volnei@cal.com>
Co-authored-by: Dhairyashil Shinde <93669429+dhairyashiil@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🐛 bug Something isn't working community Created by Linear-GitHub Sync ready-for-e2e size/S

Projects

None yet

Development

Successfully merging this pull request may close these issues.

OAuth 2.0 token endpoint missing expires_in field — causes tokens to expire silently and 403 errors in third-party apps

5 participants