Fix loginToken and legacy apiToken not working #8369
Merged
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 modifies JWT token verification to maintain backward compatibility with legacy API keys while fixing login token functionality.
- Modified
jwt-wrapper.service.tsto handle legacy tokens without type/workspaceId fields using ACCESS_TOKEN_SECRET - Simplified
generateAppSecretLegacy()to use raw ACCESS_TOKEN_SECRET instead of hashing - Added special case in
verifyWorkspaceToken()to bypass sub check for FILE type tokens - Added specific error handling for TokenExpiredError and JsonWebTokenError with AuthException codes
1 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings | Greptile
| @@ -59,10 +59,11 @@ export class JwtWrapperService { | |||
| } | |||
|
|
|||
| try { | |||
| if (!type && !payload.workspaceId) { | |||
| // TODO: Deprecate this once old API KEY tokens are no longer in use | |||
| if (!payload.type && !payload.workspaceId && type === 'ACCESS') { | |||
There was a problem hiding this comment.
logic: This condition now only handles legacy ACCESS tokens, but doesn't handle legacy API_KEY tokens. May need to check if API_KEY type should also be included.
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.
No description provided.