refactor: Generate claims in the same way #522
Closed
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
mitar
commented
Oct 28, 2020
| @@ -87,9 +106,6 @@ func (c *IDTokenClaims) ToMap() map[string]interface{} { | |||
| ret["amr"] = c.AuthenticationMethodsReference | |||
| } | |||
|
|
|||
| ret["iat"] = float64(c.IssuedAt.Unix()) | |||
There was a problem hiding this comment.
So iat in ID tokens was always added but in access tokens only if set.
I made it so that all fields are not set if empty. I think this is cleaner. I do not think you ever want to issue a token with claim with timestamp set to 0.
mitar
commented
Oct 28, 2020
| @@ -75,7 +75,7 @@ func TestAssert(t *testing.T) { | |||
| ToMapClaims().Valid()) | |||
| assert.NotNil(t, (&JWTClaims{NotBefore: time.Now().UTC().Add(time.Hour)}). | |||
| ToMapClaims().Valid()) | |||
| assert.NotNil(t, (&JWTClaims{NotBefore: time.Now().UTC().Add(-time.Hour)}). | |||
| assert.Nil(t, (&JWTClaims{NotBefore: time.Now().UTC().Add(-time.Hour)}). | |||
There was a problem hiding this comment.
This changes because ExpiredAt is not 0 anymore.
aeneasr
reviewed
Oct 28, 2020
| @@ -49,16 +49,39 @@ type IDTokenClaims struct { | |||
| // ToMap will transform the headers to a map structure | |||
There was a problem hiding this comment.
I have similar concerns about this as here.
|
How should we proceed with this PR? |
|
I will get back to this one shortly. |
aeneasr
added
the
stale
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.
Proposed changes
Just a bit of refactoring/code cleanup. Made sure that both OAuth JWT and OpenID JWT claims are generated in the same way. Also made order of field processing in the code the same so it is easier to compare.
Checklist
vulnerability. If this pull request addresses a security vulnerability, I
confirm that I got green light (please contact
[email protected]) from the maintainers to push
the changes.