Fix: Don't raise an error if expiration_time_millis is nil; fall back to 0#552
Open
sampart wants to merge 1 commit intogoogleapis:mainfrom
Open
Fix: Don't raise an error if expiration_time_millis is nil; fall back to 0#552sampart wants to merge 1 commit intogoogleapis:mainfrom
expiration_time_millis is nil; fall back to 0#552sampart wants to merge 1 commit intogoogleapis:mainfrom
Conversation
expiration_time_millis is nil; fall back to 0expiration_time_millis is nil; fall back to 0
…ck to 0
`data.fetch("expiration_time_millis", 0)` will default to 0 only if the key is not present. If the key is present but the associated value is nil, then prior to this change the code would raise as follows:
```
NoMethodError (undefined method `/' for nil:NilClass
expires_at: data.fetch("expiration_time_millis", 0) / 1000
^):
```
This commit updates the code to default to 0 if the key is not found or if the value is nil.
With the existing token stores, this situation may not arise, but it's a particular issue when using a custom token store where values could be nil, like a database.
3d80798 to
3f1709d
Compare
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
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.
The change
data.fetch("expiration_time_millis", 0)will default to 0 only if the key is not present. If the key is present but the associated value is nil, then prior to this change the code would raise as follows:This commit updates the code to default to 0 if the key is not found or if the value is nil.
With the existing token stores, this situation may not arise, but it's a particular issue when using a custom token store where values could be nil, like a database.
Testing
Since the existing tests don't cover the existing fallback, I've not added to them here either.
I've tested this change manually locally by modifying my copy of the gem in a test project.
Changelog
https://github.com/googleapis/google-auth-library-ruby/blob/main/.github/CONTRIBUTING.md mentions updating the CHANGELOG. However, CHANGELOG updates now appear to be an automated process so I've left this alone.