Issue39 auth save token #41
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
graft
reviewed
May 13, 2020
lib/etna/auth.rb
Outdated
| @@ -77,6 +77,7 @@ def approve_user(request) | |||
|
|
|||
| begin | |||
| payload, header = application.sign.jwt_decode(token) | |||
| payload['token'] = token | |||
There was a problem hiding this comment.
Are we sure the payload will never contain the parameter 'token' in the future? Can we instead pass the token as an optional second argument to Etna::User.new?
graft
reviewed
May 13, 2020
spec/test_auth_spec.rb
Outdated
| @@ -37,6 +37,12 @@ class Server < Etna::Server; end | |||
| expect(user).to be_a(Etna::User) | |||
| expect(user.is_admin?('labors')).to be_truthy | |||
| expect(user.can_edit?('constellations')).to be_falsy | |||
| expect(user.token).to eq(Base64.strict_encode64({ | |||
| email: 'janus@two-faces.org', | |||
There was a problem hiding this comment.
This could be replaced with the same hash as above in a variable.
graft
reviewed
May 14, 2020
| expect(u.token).to eq('xyz123randomtoken') | ||
| end | ||
|
|
||
| it 'returns basic user info without token param' do |
There was a problem hiding this comment.
This first test is barely necessary, two of these is too much methinks.
There was a problem hiding this comment.
I wasn't super confident I had the syntax right for the optional part, so wanted an objective validation :-)
|
Seems fine to merge this. |
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.
#39
Note that this is on top of your
graft-repair-hmacbranch, and not on top of master.Adds a
tokenattribute to theUserclass, and passes that data in during the Auth process (plus for TestAuth).