-
Notifications
You must be signed in to change notification settings - Fork 325
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Feature] Normalize OSF Verification Key [#OSF-6560] #5964
Merged
brianjgeiger
merged 47 commits into
CenterForOpenScience:develop
from
cslzchen:feature/verification-key
Sep 28, 2016
Merged
Changes from all commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
c1bf666
Add verification_key_v2 which contains key, username and expiration t…
cslzchen 16bab4f
Add generate_verification_key_v2().
cslzchen 01c28f7
Reorder imports order for auth core.
cslzchen 9a6b2ba
Forgot and reset password now use verfication key version 2.
cslzchen 7437496
Remove username from verification_key_v2, invalid verification_key_v2…
cslzchen ae0c145
Add expiration check for user unclaimed_records.
cslzchen 7ecf373
Add `expires` to contributor claim.
cslzchen b1a6581
Temporarily remove `expires` check for unclaimed_records. [skip ci]
cslzchen c9dc259
Renew email verifications token when resending confirmation. [skip ci]
cslzchen c8a0fac
Add empty claim_user_form_get and claim_user_form_post. [skip ci]
cslzchen f46c8a0
Add expiration time to settings and enable contributor claim check. […
cslzchen d459d8f
Revert "Add empty claim_user_form_get and claim_user_form_post. [skip…
cslzchen 2e4ea05
Fix web_url_for('reset_password_get') in conference views.
cslzchen 617d2eb
Update tests for forgot and reset password, add attribute and key che…
cslzchen 6be7705
Raise ValueError in get_claim_url if no record on a given project.
cslzchen e538758
Merge remote-tracking branch 'upstream/develop' into feature/verifica…
cslzchen 93d947e
Fix conflicts and merge remote-tracking branch 'upstream/develop' int…
cslzchen d6e09ab
Minor improvement and fixes after fixing conflicts.
cslzchen a3114d4
start from longze's base
chennan47 9ceb096
fix the unclaimed contributor reset passowrd
chennan47 7968675
Merge remote-tracking branch 'upstream' into feature/verification-key.
cslzchen 810abe3
merge
chennan47 12d1308
merge
chennan47 9f3b5c5
Merge remote-tracking branch 'upstream/develop' into feature/verifica…
cslzchen 28f8f83
merge from longze
chennan47 52836d8
Merge pull request #11 from chennan47/feature/reset_password.
cslzchen 96b0c5e
Fix conflicts and merge remote-tracking branch 'upstream/develop' int…
cslzchen 1311351
Use email instead of username in `get_user()`. [skip ci]
cslzchen f627c6b
Normalize verification key generation based on type.
cslzchen 8ad4a94
Forgot/Reset password use normalized verification key: [skip ci]
cslzchen 042e2ca
Improve comment and logic for claim contributor-ship:
cslzchen 6dd18d2
Claim contributor-ship uses normalized verification key.
cslzchen 0ca06e0
Send/Resend confirmation uses normalized verification key. [skip ci]
cslzchen d9a5d64
Remove deprecated code.
cslzchen 7e862d9
Update unit tests.
cslzchen 576afb0
Temporary fix for #OSF-6673.
cslzchen ffc82ec
Minor sytle fix.
cslzchen 6a95638
Merge remote-tracking branch 'upstream/develop' into feature/verifica…
cslzchen 3385da7
Remove deprecated api call to `reset_password_post`.
cslzchen bb65649
Remove duplicated code for pushing status message.
cslzchen 31d08eb
Improve error message with product.
cslzchen f357253
Remove `#TODO`.
cslzchen 474c1a2
Fix conflicts and merge remote-tracking branch 'upstream/develop' int…
cslzchen d589f24
Remove unnecessary use of `generate_verification_key()`.
cslzchen c8bb69b
Update verification key generation in `auth.get_or_create_user()`.
cslzchen e3a4137
Update `auth.get_or_create_user()`:
cslzchen 10419b7
Minor fixes.
cslzchen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add
reset_password
:add_poster_by_email
, create user and send user confirmation email to reset password, generate reset password verification key