Merge pull request #4 from lrowe/master

Make authenticated_userid None when groupfinder returns None.
mozilla-services · Oct 8, 2013 · f7af518 · f7af518
2 parents 9bbb93f + 31e9593
commit f7af518
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pyramid_multiauth/__init__.py b/pyramid_multiauth/__init__.py
@@ -84,6 +84,8 @@ def authenticated_userid(self, request):
                     break
                 if self._callback(userid, request) is not None:
                     break
+                else:
+                    userid = None
         return userid
 
     def unauthenticated_userid(self, request):

diff --git a/pyramid_multiauth/tests.py b/pyramid_multiauth/tests.py
@@ -223,7 +223,7 @@ def test_authenticated_userid_unauthenticated_with_groupfinder(self):
         policies = [TestAuthnPolicy2()]
         policy = MultiAuthenticationPolicy(policies, testgroupfinder)
         request = DummyRequest()
-        self.assertEquals(policy.authenticated_userid(request), "test2")
+        self.assertEquals(policy.authenticated_userid(request), None)
         self.assertEquals(sorted(policy.effective_principals(request)),
                           [Everyone, 'test2'])