Get rid of the OPENID_UPDATE_GROUPS_FROM_LAUNCHPAD_TEAMS option.

django_openid_auth/auth.py

@@ -57,11 +57,10 @@ class OpenIDBackend:
             if sreg_response:
                 self.update_user_details_from_sreg(user, sreg_response)
 
-        if getattr(settings, 'OPENID_UPDATE_GROUPS_FROM_LAUNCHPAD_TEAMS', False):
-            teams_response = teams.TeamsResponse.fromSuccessResponse(
-                openid_response)
-            if teams_response:
-                self.update_groups_from_teams(user, teams_response)
+        teams_response = teams.TeamsResponse.fromSuccessResponse(
+            openid_response)
+        if teams_response:
+            self.update_groups_from_teams(user, teams_response)
 
         return user
 
@@ -132,16 +131,16 @@ class OpenIDBackend:
 
     def update_groups_from_teams(self, user, teams_response):
         teams_mapping = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING', {})
-        resp_groups = set(Group.objects.get(name=teams_mapping[i])
-                          for i in teams_response.is_member)
-        user_groups = set(
-            i for i in user.groups.filter(name__in=teams_mapping.values()))
-
-        # the groups the user is in that aren't reported by openid
-        # should be removed
-        for group in user_groups - resp_groups:
+        if len(teams_mapping) == 0:
+            return
+
+        current_groups = set(user.groups.filter(
+                name__in=teams_mapping.values()))
+        desired_groups = set(Group.objects.filter(
+                name__in=[teams_mapping[lp_team]
+                          for lp_team in teams_response.is_member
+                          if lp_team in teams_mapping]))
+        for group in current_groups - desired_groups:
             user.groups.remove(group)
-        # and viceversa
-        for group in resp_groups - user_groups:
+        for group in desired_groups - current_groups:
             user.groups.add(group)
-        user.save()

django_openid_auth/tests/test_views.py

@@ -100,20 +100,17 @@ class RelyingPartyTests(TestCase):
         self.old_create_users = getattr(settings, 'OPENID_CREATE_USERS', False)
         self.old_update_details = getattr(settings, 'OPENID_UPDATE_DETAILS_FROM_SREG', False)
         self.old_sso_server_url = getattr(settings, 'OPENID_SSO_SERVER_URL')
-        self.old_update_groups = getattr(settings, 'OPENID_UPDATE_GROUPS_FROM_LAUNCHPAD_TEAMS', False)
         self.old_teams_map = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING', {})
 
         settings.OPENID_CREATE_USERS = False
         settings.OPENID_UPDATE_DETAILS_FROM_SREG = False
         settings.OPENID_SSO_SERVER_URL = None
-        settings.OPENID_UPDATE_GROUPS_FROM_LAUNCHPAD_TEAMS = False
         settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = {}
 
     def tearDown(self):
         settings.OPENID_CREATE_USERS = self.old_create_users
         settings.OPENID_UPDATE_DETAILS_FROM_SREG = self.old_update_details
         settings.OPENID_SSO_SERVER_URL = self.old_sso_server_url
-        settings.OPENID_UPDATE_GROUPS_FROM_LAUNCHPAD_TEAMS = self.old_update_groups
         settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = self.old_teams_map
 
         setDefaultFetcher(None)
@@ -263,7 +260,6 @@ class RelyingPartyTests(TestCase):
         self.assertEquals(user.email, 'foo@example.com')
 
     def test_login_teams(self):
-        settings.OPENID_UPDATE_GROUPS_FROM_LAUNCHPAD_TEAMS = True
         settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = {'teamname': 'groupname',
                                                    'otherteam': 'othergroup'}
         user = User.objects.create_user('testuser', 'someone@example.com')
@@ -289,8 +285,8 @@ class RelyingPartyTests(TestCase):
         openid_request = self.provider.parseFormPost(response.content)
         openid_response = openid_request.answer(True)
         teams_request = teams.TeamsRequest.fromOpenIDRequest(openid_request)
-        teams_response = teams.TeamsResponse.extractResponse(teams_request,
-                                                             'teamname')
+        teams_response = teams.TeamsResponse.extractResponse(
+            teams_request, 'teamname,some-other-team')
         openid_response.addExtension(teams_response)
         response = self.complete(openid_response)
         self.assertRedirects(response, 'http://testserver/getuser')