[ES 2924] Prompt Validation before id token hint to propogate right error code#1904
Open
KashiwalHarsh wants to merge 4 commits into
Open
[ES 2924] Prompt Validation before id token hint to propogate right error code#1904KashiwalHarsh wants to merge 4 commits into
KashiwalHarsh wants to merge 4 commits into
Conversation
Signed-off-by: Harsh Kashiwal <harsh.kashiwal@infosys.com>
Signed-off-by: Harsh Kashiwal <harsh.kashiwal@infosys.com>
WalkthroughAll OAuth detail endpoints (V2, V3, PAR) now route through buildTransactionAndOAuthDetailResponse which conditionally processes id_token_hint; id_token_hint validation failures now throw LOGIN_REQUIRED. Tests updated to reflect the new error semantics and required mocks. ChangesCentralize id_token_hint processing with error code alignment
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@oidc-service-impl/src/main/java/io/mosip/esignet/services/AuthorizationServiceImpl.java`:
- Around line 518-520: The cast to OAuthDetailRequestV3 in
AuthorizationServiceImpl when idTokenHint != null is unsafe; before casting
oauthDetailReqDto, verify its type (e.g., oauthDetailReqDto instanceof
OAuthDetailRequestV3) and handle the mismatch by either throwing a clear
IllegalArgumentException/BadRequest or falling back to a safe path, then call
handleIdTokenHint((OAuthDetailRequestV3) oauthDetailReqDto, httpServletRequest)
only after the check; reference oauthDetailReqDto, OAuthDetailRequestV3,
handleIdTokenHint and the surrounding conditional to locate where to add the
defensive check and error handling.
In
`@oidc-service-impl/src/test/java/io/mosip/esignet/services/AuthorizationServiceTest.java`:
- Around line 1166-1171: The test is ambiguous because it both asserts a
non-null OAuthDetailResponseV2 and catches EsignetException expecting
ErrorConstants.LOGIN_REQUIRED; since the JWT audience
("mosip-signup-oauth-client") does not match oauthDetailRequest.clientId
("34567") the test should explicitly expect failure: replace the try/catch block
around AuthorizationServiceTest.getOauthDetailsV3(oauthDetailRequest, request)
with an assertion that the call throws EsignetException (e.g., assertThrows) and
then assert the thrown exception's errorCode equals
ErrorConstants.LOGIN_REQUIRED; alternatively, if you intend success, change the
test fixture so oauthDetailRequest.clientId matches the JWT audience before
calling getOauthDetailsV3.
- Around line 728-755: The test currently fails to reach the cookie-null branch
in AuthorizationServiceImpl#handleIdTokenHint because
authorizationHelperService.validateAndGetSubjectAndNonce(...) is causing an
earlier failure; update the test to mock
authorizationHelperService.validateAndGetSubjectAndNonce(...) to return a valid
subject/nonce (or otherwise not throw) so getOauthDetailsV3(...) proceeds to the
cookie check, then change the asserted error to
ErrorConstants.INVALID_ID_TOKEN_HINT (or if you meant to test the earlier
validation, instead keep the existing mocks and assert
ErrorConstants.LOGIN_REQUIRED). Ensure you reference
authorizationHelperService.validateAndGetSubjectAndNonce,
AuthorizationServiceImpl.handleIdTokenHint, getOauthDetailsV3, and
ErrorConstants.INVALID_ID_TOKEN_HINT when making the change.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: ASSERTIVE
Plan: Pro
Run ID: e128ac83-a8f8-4a33-9216-4daf10de0282
📒 Files selected for processing (3)
oidc-service-impl/src/main/java/io/mosip/esignet/services/AuthorizationHelperService.javaoidc-service-impl/src/main/java/io/mosip/esignet/services/AuthorizationServiceImpl.javaoidc-service-impl/src/test/java/io/mosip/esignet/services/AuthorizationServiceTest.java
Signed-off-by: Harsh Kashiwal <harsh.kashiwal@infosys.com>
|
Actionable comments posted: 0 |
sacrana0
reviewed
May 29, 2026
Signed-off-by: Harsh Kashiwal <harsh.kashiwal@infosys.com>
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
oidc-service-impl/src/main/java/io/mosip/esignet/services/AuthorizationServiceImpl.java (1)
626-630:⚠️ Potential issue | 🟡 Minor | ⚡ Quick winAlign cookie-missing paths to
LOGIN_REQUIRED(id_token_hint semantics)
AuthorizationServiceImpl.handleIdTokenHintstill throwsErrorConstants.INVALID_ID_TOKEN_HINTwhenhttpServletRequest.getCookies()isnull(line 627) or when the expected cookie isn’t found (line 630).AuthorizationHelperService.validateAndGetSubjectAndNoncealready throwsLOGIN_REQUIREDforid_token_hintvalidation failures, so these branches should be updated for consistency with the PR’s error-code alignment.🔧 Proposed alignment
Pair<String, String> pair = authorizationHelperService.validateAndGetSubjectAndNonce(oauthDetailReqDto.getClientId(), oauthDetailReqDto.getIdTokenHint()); if(httpServletRequest.getCookies() == null) - throw new EsignetException(ErrorConstants.INVALID_ID_TOKEN_HINT); + throw new EsignetException(ErrorConstants.LOGIN_REQUIRED); Optional<Cookie> result = Arrays.stream(httpServletRequest.getCookies()).filter(x -> x.getName().equals(pair.getFirst())).findFirst(); if (result.isEmpty()) { - throw new EsignetException(ErrorConstants.INVALID_ID_TOKEN_HINT); + throw new EsignetException(ErrorConstants.LOGIN_REQUIRED); }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@oidc-service-impl/src/main/java/io/mosip/esignet/services/AuthorizationServiceImpl.java` around lines 626 - 630, In AuthorizationServiceImpl.handleIdTokenHint replace the two throws of ErrorConstants.INVALID_ID_TOKEN_HINT (the branch where httpServletRequest.getCookies() == null and the branch where the expected cookie is not found after Arrays.stream(...).findFirst()) with throws that use ErrorConstants.LOGIN_REQUIRED so the id_token_hint cookie-missing paths align with AuthorizationHelperService.validateAndGetSubjectAndNonce; locate the code around httpServletRequest.getCookies() and the Optional<Cookie> result to update the exception type.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Outside diff comments:
In
`@oidc-service-impl/src/main/java/io/mosip/esignet/services/AuthorizationServiceImpl.java`:
- Around line 626-630: In AuthorizationServiceImpl.handleIdTokenHint replace the
two throws of ErrorConstants.INVALID_ID_TOKEN_HINT (the branch where
httpServletRequest.getCookies() == null and the branch where the expected cookie
is not found after Arrays.stream(...).findFirst()) with throws that use
ErrorConstants.LOGIN_REQUIRED so the id_token_hint cookie-missing paths align
with AuthorizationHelperService.validateAndGetSubjectAndNonce; locate the code
around httpServletRequest.getCookies() and the Optional<Cookie> result to update
the exception type.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: ASSERTIVE
Plan: Pro
Run ID: 7b814f10-aeab-4952-afaa-476df5250179
📒 Files selected for processing (1)
oidc-service-impl/src/main/java/io/mosip/esignet/services/AuthorizationServiceImpl.java
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary by CodeRabbit
Bug Fixes
Refactor
Tests