Fix of broken API Auth #8338
Merged
Fix of broken API Auth #8338
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR fixes API authentication for self-hosted instances by modifying the JWT payload structure and validation logic to properly handle API key tokens.
- Added
type: 'API_KEY'field in JWT payload inpackages/twenty-server/src/engine/core-modules/auth/services/api-key.service.tsto distinguish API tokens - Modified user lookup logic in
jwt.auth.strategy.tsto skip user validation whenpayload.type === 'API_KEY' - Updated token validation in
jwt.auth.strategy.tsto properly handle API keys by checkingapiKey.revokedAtstatus - Fixed workspace ID resolution by using
payload.workspaceId ?? payload.subfor consistent workspace lookup
2 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings | Greptile
packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
Outdated
Show resolved
Hide resolved
and refacto validate()
packages/twenty-server/src/engine/core-modules/auth/strategies/interfaces.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/auth/strategies/interfaces.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.spec.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/auth/strategies/jwt.auth.strategy.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/environment/environment-variables.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/jwt/services/jwt-wrapper.service.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/jwt/services/jwt-wrapper.service.ts
Outdated
Show resolved
Hide resolved
packages/twenty-server/src/engine/core-modules/jwt/services/jwt-wrapper.service.ts
Outdated
Show resolved
Hide resolved
charlesBochet
approved these changes
Nov 5, 2024
|
Thanks @guillim for your contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix done this morning with @FelixMalfait from #8295