Fixed Issue #43 - Added logic to check if user object already exist in the dict

Author: bhunut-adobe

tests/connector/directory_okta_test.py

@@ -228,7 +228,7 @@ def test_no_user_multiple_groups(self, mock_members):
 
     @mock.patch('user_sync.connector.directory_okta.OktaDirectoryConnector.iter_group_members')
     def test_same_user_in_multiple_groups(self, mock_members):
-        # BUG User A suppose to be Group 1 and Group 2.
+        #User A in both Group 1 and Group 2.
         groups = ['group1', 'group2']
         test_user = tests.helper.create_test_user_uid()
         mock_members.side_effect = [[test_user], [copy.deepcopy(test_user)]]

user_sync/connector/directory_okta.py

@@ -85,8 +85,6 @@ def __init__(self, caller_options):
         self.user_identity_type = user_sync.identity_type.parse_identity_type(options['user_identity_type'])
 
         self.options = options
-
-        self.user_by_login = {}
         self.user_by_uid = {}
 
         logger.debug('Initialized with options: %s', options)
@@ -123,8 +121,6 @@ def load_users_and_groups(self, groups, extended_attributes):
             users_filter = all_users_filter
 
         self.logger.info('Loading users...')
-
-        self.user_by_login = user_by_login = {}
         self.user_by_uid = user_by_uid = {}
 
         for group in groups:
@@ -135,9 +131,10 @@ def load_users_and_groups(self, groups, extended_attributes):
 
                 uid = user.get('uid')
                 if user and uid:
-                    user_by_uid[uid] = user
+                    if uid not in user_by_uid:
+                        user_by_uid[uid] = user
                     total_group_users += 1
-                    user_groups = user['groups']
+                    user_groups = user_by_uid[uid]['groups']
                     if group not in user_groups:
                         user_groups.append(group)