Merge lp:~canonical-isd-hackers/canonical-identity-provider/930377-add-device into lp:canonical-identity-provider/release
Proposed by
Michael Foord
Status: | Merged |
---|---|
Approved by: | David Owen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 337 |
Proposed branch: | lp:~canonical-isd-hackers/canonical-identity-provider/930377-add-device |
Merge into: | lp:canonical-identity-provider/release |
Diff against target: |
213 lines (+54/-10) 9 files modified
identityprovider/models/twofactor.py (+0/-2) identityprovider/tests/acceptance/devices/add_device.py (+15/-1) identityprovider/tests/acceptance/devices/add_two_devices.py (+3/-0) identityprovider/tests/acceptance/devices/prefs.py (+3/-1) identityprovider/tests/acceptance/devices/remove_device.py (+5/-6) identityprovider/tests/acceptance/shared/devices.py (+5/-0) identityprovider/tests/acceptance/shared/helpers.py (+18/-0) identityprovider/tests/unit/test_devices.py (+4/-0) identityprovider/views/devices.py (+1/-0) |
To merge this branch: | bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/930377-add-device |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Owen (community) | Approve | ||
Review via email: mp+93006@code.launchpad.net |
Commit message
Adding a two factor device authenticates the user with that device.
To post a comment you must log in.
Test changes look good. It's not every day you see a decent use for globals, but I think this is one.