refactor

Author: sgomezvillamor

metadata-ingestion/src/datahub/ingestion/source/identity/okta.py

@@ -666,13 +666,12 @@ def _map_okta_user_profile_to_username(
             self.config.okta_profile_to_username_regex,
         )
 
-    # Converts Okta User Profile into a CorpUserInfo.
-    def _map_okta_user_profile(self, profile: UserProfile) -> CorpUserInfoClass:
-        # TODO: Extract user's manager if provided.
-        # Source: https://developer.okta.com/docs/reference/api/users/#default-profile-properties
-        full_name = f"{profile.firstName} {profile.lastName}"
-        custom_properties = {
-            k: v
+    def _map_okta_user_profile_custom_properties(
+        self, profile: UserProfile
+    ) -> Dict[str, str]:
+        # filter out the common fields that are already mapped to the CorpUserInfo aspect and the private ones
+        return {
+            k: str(v)
             for k, v in profile.__dict__.items()
             if v
             and k
@@ -685,7 +684,14 @@ def _map_okta_user_profile(self, profile: UserProfile) -> CorpUserInfoClass:
                 "countryCode",
                 "department",
             ]
+            and not k.startswith("_")
         }
+
+    # Converts Okta User Profile into a CorpUserInfo.
+    def _map_okta_user_profile(self, profile: UserProfile) -> CorpUserInfoClass:
+        # TODO: Extract user's manager if provided.
+        # Source: https://developer.okta.com/docs/reference/api/users/#default-profile-properties
+        full_name = f"{profile.firstName} {profile.lastName}"
         return CorpUserInfoClass(
             active=True,
             displayName=(
@@ -698,7 +704,7 @@ def _map_okta_user_profile(self, profile: UserProfile) -> CorpUserInfoClass:
             title=profile.title,
             countryCode=profile.countryCode,
             departmentName=profile.department,
-            customProperties=custom_properties,
+            customProperties=self._map_okta_user_profile_custom_properties(profile),
         )
 
     def _make_corp_group_urn(self, name: str) -> str: