Merge pull request #17 from bhunut-adobe/okta

Updated identitytype to identity_type

Author: adorton-adobe

user_sync/connector/directory_okta.py

@@ -84,12 +84,7 @@ def __init__(self, caller_options):
         self.groups_client = None
         self.logger = logger = user_sync.connector.helper.create_logger(options)
 
-        try:
-            options['user_identity_type'] = user_sync.identity_type.parse_identity_type(options['user_identity_type'])
-        except user_sync.error.AssertionException as e:
-            logger.error(e.message)
-            e.set_reported()
-            raise e
+        self.user_identity_type = user_sync.identity_type.parse_identity_type(options['user_identity_type'])
 
         self.options = options
 
@@ -220,6 +215,17 @@ def iter_users(self, users_filter, 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:
+                user['identity_type'] = self.user_identity_type
+            else:
+                try:
+                    user['identity_type'] = user_sync.identity_type.parse_identity_type(identity_type)
+                except user_sync.error.AssertionException as e:
+                    self.logger.warning('Skipping user %s: %s', profile.login, e.message)
+                    continue
+
             source_attributes['login'] = user['username'] = profile.login
 
             if profile.firstName != None:
@@ -250,9 +256,6 @@ def iter_users(self, users_filter, extended_attributes):
             # [TODO morr 2017-02-28]: Is the copy necessary? Could just assign I think
             user['source_attributes'] = source_attributes.copy()
 
-            # added to fix warning message about identitytype not being set in user obj.
-            user['identitytype'] = options['user_identity_type']
-
             yield (profile.login, user)
 
     def iter_search_result(self, filter_string, attributes):