Merge lp:~nataliabidart/ubuntu-sso-client/no-more-two-tokens into lp:ubuntu-sso-client
Proposed by
Natalia Bidart
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||
Approved revision: | 662 | ||||
Merged at revision: | 662 | ||||
Proposed branch: | lp:~nataliabidart/ubuntu-sso-client/no-more-two-tokens | ||||
Merge into: | lp:ubuntu-sso-client | ||||
Diff against target: |
97 lines (+10/-14) 4 files modified
ubuntu_sso/account.py (+4/-6) ubuntu_sso/main.py (+1/-3) ubuntu_sso/tests/test_account.py (+3/-3) ubuntu_sso/tests/test_main.py (+2/-2) |
||||
To merge this branch: | bzr merge lp:~nataliabidart/ubuntu-sso-client/no-more-two-tokens | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
Roman Yepishev (community) | fieldtest | Approve | |
Review via email: mp+43826@code.launchpad.net |
Commit message
* Avoid generating an extra token when attempting to validate a user account (LP: #687523).
Description of the change
To test, run from this branch:
killall ubuntu-sso-login; DEBUG=True PYTHONPATH=. ./bin/ubuntu-
Remove all your Ubuntu One credentials in seahorse, in https:/
Re-add your computer to Ubuntu One with issuing:
u1sdtool -d
u1sdtool -c
Confirm that only one token is added in both:
https:/
To post a comment you must log in.
login.ubuntu.com: one token com/account/ machines: one token. All OK
one.ubuntu.