[auth] Auto-generate nonce when caller does not provide one#279
Merged
Conversation
- Add effectiveNonce = authContext.nonce ?: generateSecureToken() so a cryptographically-secure nonce is always sent on /authorize, even if the caller omits one (matches iOS PR #337 behaviour) - Nonce param is now unconditional in getQueryParams (was optional) - Update size assertions in existing tests (+1 for the always-present nonce) - Add 5 new tests covering auto-gen, caller-supplied, stability, PKCE, and instance uniqueness Co-Authored-By: Claude <noreply@anthropic.com>
lalwani
approved these changes
Jun 26, 2026
partha-uber
added a commit
that referenced
this pull request
Jun 26, 2026
…s set) Auto-nonce (#279) guarantees effectiveNonce is never null, so the 'if (sentNonce != null)' guard is no longer needed. Validation is now unconditional — any PKCE response without an id_token nonce claim that matches effectiveNonce is rejected. Update existing PKCE tests to provide a matching id_token and add two new tests covering the always-validated path. Co-Authored-By: Claude <noreply@anthropic.com>
partha-uber
added a commit
that referenced
this pull request
Jun 26, 2026
…s set) Auto-nonce (#279) guarantees effectiveNonce is never null, so the 'if (sentNonce != null)' guard is no longer needed. Validation is now unconditional — any PKCE response without an id_token nonce claim that matches effectiveNonce is rejected. Update existing PKCE tests to provide a matching id_token and add two new tests covering the always-validated path. Co-Authored-By: Claude <noreply@anthropic.com>
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
AuthContext.nonceis nulleffectiveNonce = authContext.nonce ?: generateSecureToken()ensures nonce is always present in SSO query params for replay-attack prevention@VisibleForTesting effectiveNoncefield exposed for test assertionsThis brings Android to parity with iOS PR #337 (
OAuthParameters.swiftauto-generates nonce).Previously merged as #273 into a stacked base branch that was already merged to main — this re-lands the change directly on main.
🤖 Generated with Claude Code
Co-Authored-By: Claude noreply@anthropic.com
Test Plan
./gradlew :authentication:testpassesRevert Plan
Revert this commit. Nonce will become optional again (only sent when caller supplies it).