Fixed #37 and #38

Author: bhunut-adobe

user_sync/config.py

@@ -121,7 +121,7 @@ def get_directory_connector_module_name(self):
         '''
         options = self.options
         if 'directory_get_config_name' in options and options['directory_get_config_name']:
-            module_type = self.main_config.child_configs['directory'].value['connectors'].keys()[0]
+            module_type = self.main_config.child_configs['directory_users'].value['connectors'].keys()[0]
             return 'user_sync.connector.directory_' + module_type
         else:
             return options['directory_connector_module_name']

user_sync/connector/directory_okta.py

@@ -143,7 +143,7 @@ def load_users_and_groups(self, groups, extended_attributes):
 
             self.logger.debug('Group %s members: %d users: %d', group, total_group_members, total_group_users)
 
-        return not is_using_source_filter, user_by_uid.itervalues()
+        return user_by_uid.itervalues()
 
     def find_group(self, group):
         """
@@ -210,12 +210,12 @@ def convert_user(self, record, extended_attributes):
         source_attributes['id'] = user['uid'] = record.id
         source_attributes['email'] = user['email'] = profile.email
 
-        source_attributes['identity_type'] = identity_type = self.user_identity_type
-        if not identity_type:
+        source_attributes['identity_type'] = user_identity_type = self.user_identity_type
+        if not user_identity_type:
             user['identity_type'] = self.user_identity_type
         else:
             try:
-                user['identity_type'] = user_sync.identity_type.parse_identity_type(identity_type)
+                user['identity_type'] = user_sync.identity_type.parse_identity_type(user_identity_type)
             except user_sync.error.AssertionException as e:
                 self.logger.warning('Skipping user %s: %s', profile.login, e.message)
                 return None