Canonical SSO provider

Merge lp:~matiasb/canonical-identity-provider/openid-rpconfig-command-ax-support into lp:canonical-identity-provider/release

  1. openid-rpconfig-command-ax-support
  2. Merge into trunk
Proposed by Matias Bordese
Status: Merged
Approved by: Natalia Bidart
Approved revision: no longer in the source branch.
Merged at revision: 796
Proposed branch: lp:~matiasb/canonical-identity-provider/openid-rpconfig-command-ax-support
Merge into: lp:canonical-identity-provider/release
Diff against target: 70 lines (+26/-4)
2 files modified
identityprovider/management/commands/add_openid_rp_config.py (+3/-1)
identityprovider/tests/test_command_add_openid_rp_config.py (+23/-3)
To merge this branch: bzr merge lp:~matiasb/canonical-identity-provider/openid-rpconfig-command-ax-support
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+159012@code.launchpad.net

Commit message

Added extra allowed_ax param to add openid rpconfig command.

Description of the change

Added extra allowed_ax param to add openid rpconfig command.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/management/commands/add_openid_rp_config.py'
2--- identityprovider/management/commands/add_openid_rp_config.py 2013-03-13 16:06:28 +0000
3+++ identityprovider/management/commands/add_openid_rp_config.py 2013-04-15 20:45:35 +0000
4@@ -10,6 +10,7 @@
5 option_list = BaseCommand.option_list + (
6 make_option('--allow-unverified', action="store_true",
7 default=False, dest='allow_unverified'),
8+ make_option('--allowed-ax', action="store", dest='allowed_ax'),
9 make_option('--allowed-sreg', action="store", dest='allowed_sreg'))
10 help = "Create OpenID RP config entry."
11
12@@ -20,6 +21,7 @@
13 trust_root = args[0]
14 allow_unverified = kwargs.get('allow_unverified', False)
15 allowed_sreg = kwargs.get('allowed_sreg', '')
16+ allowed_ax = kwargs.get('allowed_ax', '')
17 OpenIDRPConfig.objects.create(
18 trust_root=trust_root, allow_unverified=allow_unverified,
19- allowed_sreg=allowed_sreg)
20+ allowed_sreg=allowed_sreg, allowed_ax=allowed_ax)
21
22=== modified file 'identityprovider/tests/test_command_add_openid_rp_config.py'
23--- identityprovider/tests/test_command_add_openid_rp_config.py 2013-03-13 16:06:28 +0000
24+++ identityprovider/tests/test_command_add_openid_rp_config.py 2013-04-15 20:45:35 +0000
25@@ -24,7 +24,7 @@
26 root = 'http://localhost:8000'
27 call_command('add_openid_rp_config', root)
28 config = get_object_or_none(OpenIDRPConfig, trust_root=root)
29- self.assertTrue(config)
30+ self.assertIsNotNone(config)
31 self.assertFalse(config.allow_unverified)
32 self.assertEqual(config.allowed_sreg, '')
33
34@@ -32,7 +32,7 @@
35 root = 'http://localhost:8000'
36 call_command('add_openid_rp_config', root, allow_unverified=True)
37 config = get_object_or_none(OpenIDRPConfig, trust_root=root)
38- self.assertTrue(config)
39+ self.assertIsNotNone(config)
40 self.assertTrue(config.allow_unverified)
41
42 def test_add_with_sreg_value(self):
43@@ -40,6 +40,26 @@
44 call_command(
45 'add_openid_rp_config', root, allowed_sreg='nickname,email')
46 config = get_object_or_none(OpenIDRPConfig, trust_root=root)
47- self.assertTrue(config)
48+ self.assertIsNotNone(config)
49 self.assertFalse(config.allow_unverified)
50 self.assertEqual(config.allowed_sreg, 'nickname,email')
51+
52+ def test_add_with_ax_value(self):
53+ root = 'http://localhost:8000'
54+ call_command(
55+ 'add_openid_rp_config', root, allowed_ax='nickname,email')
56+ config = get_object_or_none(OpenIDRPConfig, trust_root=root)
57+ self.assertIsNotNone(config)
58+ self.assertFalse(config.allow_unverified)
59+ self.assertEqual(config.allowed_ax, 'nickname,email')
60+
61+ def test_add_with_ax_and_sreg_value(self):
62+ root = 'http://localhost:8000'
63+ call_command(
64+ 'add_openid_rp_config', root, allowed_sreg='nickname',
65+ allowed_ax='nickname,email')
66+ config = get_object_or_none(OpenIDRPConfig, trust_root=root)
67+ self.assertIsNotNone(config)
68+ self.assertFalse(config.allow_unverified)
69+ self.assertEqual(config.allowed_sreg, 'nickname')
70+ self.assertEqual(config.allowed_ax, 'nickname,email')