Merge lp:~facundo/canonical-identity-provider/macaroon-include-verified into lp:canonical-identity-provider/release

Proposed by Facundo Batista
Status: Merged
Approved by: Facundo Batista
Approved revision: no longer in the source branch.
Merged at revision: 1414
Proposed branch: lp:~facundo/canonical-identity-provider/macaroon-include-verified
Merge into: lp:canonical-identity-provider/release
Diff against target: 23 lines (+2/-0)
2 files modified
src/identityprovider/auth.py (+1/-0)
src/identityprovider/tests/test_auth.py (+1/-0)
To merge this branch: bzr merge lp:~facundo/canonical-identity-provider/macaroon-include-verified
Reviewer Review Type Date Requested Status
Matias Bordese (community) Approve
Review via email: mp+289248@code.launchpad.net

Commit message

Include is_verified in the user info in the discharge macaroon.

Description of the change

Include is_verified in the user info in the discharge macaroon.

To post a comment you must log in.
Revision history for this message
Matias Bordese (matiasb) wrote :

Looks good, thx.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/identityprovider/auth.py'
2--- src/identityprovider/auth.py 2016-03-07 19:27:34 +0000
3+++ src/identityprovider/auth.py 2016-03-16 16:28:50 +0000
4@@ -530,6 +530,7 @@
5 'openid': account.openid_identifier,
6 'email': account.preferredemail.email,
7 'displayname': account.displayname,
8+ 'is_verified': account.is_verified,
9 }).encode("utf8"))
10 d.add_first_party_caveat(service_location + '|account|' + account_info)
11
12
13=== modified file 'src/identityprovider/tests/test_auth.py'
14--- src/identityprovider/tests/test_auth.py 2016-03-04 22:19:58 +0000
15+++ src/identityprovider/tests/test_auth.py 2016-03-16 16:28:50 +0000
16@@ -1026,6 +1026,7 @@
17 self.assertEqual(acc['email'],
18 real_account.preferredemail.email)
19 self.assertEqual(acc['displayname'], real_account.displayname)
20+ self.assertEqual(acc['is_verified'], real_account.is_verified)
21 return True
22
23 if key == 'expires':