Torii restore generic data #1310
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
elidupuis
force-pushed
the
torii-restore-generic-data
branch
from
b5ec121
to
74e1ccf
Compare
|
Looks like there's some tests failing on |
marcoow
reviewed
May 3, 2017
| return authenticator.restore({ some: 'data', provider: 'provider' }).then((data) => { | ||
| expect(data).to.eql({ some: 'other data', provider: 'provider' }); | ||
| return authenticator.restore({ some: 'data', provider: 'provider', other: 'unrelated data' }).then((data) => { | ||
| expect(data).to.eql({ some: 'other data', provider: 'provider', other: 'unrelated data' }); |
There was a problem hiding this comment.
How would other end up in the authenticated session data in the first place?
There was a problem hiding this comment.
In this case, other is part of the data resolved by a custom authenticator.authenticate() method.
I'll put an example together shortly.
marcoow
force-pushed
the
torii-restore-generic-data
branch
from
74e1ccf
to
7f29799
Compare
Previously, generic `sessionData` was being clobbered be the data returned by Torii.fetch. Now, generic sessionData is preserved and the result of Torii.fetch is merged into it.
marcoow
approved these changes
Oct 4, 2017
marcoow
force-pushed
the
torii-restore-generic-data
branch
from
7f29799
to
10e673c
Compare
|
Great! Sorry I never got around to providing a better example! |
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.
I think I've found a small bug in
authenticator:torii. It seems that onrestore, session data (possibly resolved by extra functionality inauthenticate) is being clobbered by the data returned fromthis.get('torii').fetch().I've updated a test with some generic data to demonstrate a failing result and including a fix that simply merges the
sessionDatapassed intorestorewith the data returned from the.fetch()call.Let me know if I'm missing something here, or if you'd like anything changed/updated.