Merge lp:~jamestait/canonical-identity-provider/lp1648775-force-exhausted-paper-renewal into lp:canonical-identity-provider/release
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | James Tait | ||||
Approved revision: | no longer in the source branch. | ||||
Merge reported by: | Otto Co-Pilot | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~jamestait/canonical-identity-provider/lp1648775-force-exhausted-paper-renewal | ||||
Merge into: | lp:canonical-identity-provider/release | ||||
Diff against target: |
341 lines (+109/-22) 9 files modified
src/identityprovider/tests/utils.py (+1/-1) src/webui/templates/common/printed_codes_nearly_exhausted_warning.html (+2/-2) src/webui/templates/device/print-codes.html (+6/-2) src/webui/tests/test_views_account.py (+3/-3) src/webui/tests/test_views_devices.py (+25/-3) src/webui/tests/test_views_ui.py (+37/-1) src/webui/urls.py (+11/-5) src/webui/views/devices.py (+15/-5) src/webui/views/ui.py (+9/-0) |
||||
To merge this branch: | bzr merge lp:~jamestait/canonical-identity-provider/lp1648775-force-exhausted-paper-renewal | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ricardo Kirkner (community) | Approve | ||
Review via email: mp+322778@code.launchpad.net |
Commit message
Redirect the user to the device list page and remind them to generate and print new paper codes if their current and only list is near exhaustion.
Description of the change
Redirect the user to the device list page and remind them to generate and
print new paper codes if their current and only list is near exhaustion.
The TwoFactorLoginT
URLs - I believe this is valid because redirection to the twofactor view will
now always include that token. The token is then passed between views to
enable the "Continue" link from the device-print view to redirect the user to
their original location in the RP.
Note that if the user has two sets of printed codes and only one is close to exhaustion, they will not be forced to renew the codes. In a follow-up branch, they will be prompted to renew via email.