Merge lp:~canonical-isd-hackers/canonical-identity-provider/2f-reset into lp:canonical-identity-provider/release
Proposed by
David Owen
Status: | Merged |
---|---|
Approved by: | Simon Davy |
Approved revision: | no longer in the source branch. |
Merged at revision: | 317 |
Proposed branch: | lp:~canonical-isd-hackers/canonical-identity-provider/2f-reset |
Merge into: | lp:canonical-identity-provider/release |
Diff against target: |
110 lines (+55/-1) 5 files modified
identityprovider/models/account.py (+6/-0) identityprovider/tests/unit/test_devices.py (+24/-0) identityprovider/tests/unit/test_views_ui.py (+14/-0) identityprovider/views/devices.py (+6/-0) identityprovider/views/ui.py (+5/-1) |
To merge this branch: | bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/2f-reset |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Canonical ISD hackers | Pending | ||
Review via email: mp+91179@code.launchpad.net |
Commit message
Reset the user's preference to "only when a site asks" when removing the last two-factor device. Additionally, if the flag is set for "required" during authentication but the account has no devices, log an error and proceed with normal (not two-factor) authentication.
To post a comment you must log in.