From a991d203da508b8aa11325c18503f64315f184bc Mon Sep 17 00:00:00 2001 From: Lucian <14054859+Luci2015@users.noreply.github.com> Date: Thu, 14 Dec 2017 11:30:04 +0200 Subject: [PATCH 1/6] Update directory_ldap.py --- user_sync/connector/directory_ldap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_sync/connector/directory_ldap.py b/user_sync/connector/directory_ldap.py index 9479094b0..2ce3a501e 100755 --- a/user_sync/connector/directory_ldap.py +++ b/user_sync/connector/directory_ldap.py @@ -269,9 +269,9 @@ def iter_users(self, users_filter, extended_attributes): if sn_value is not None: user['lastname'] = sn_value c_value = LDAPValueFormatter.get_attribute_value(record, six.text_type('c')) - source_attributes['c'] = c_value + source_attributes['c'] = c_value if c_value else None if c_value is not None: - user['country'] = c_value + user['country'] = c_value.upper() if extended_attributes is not None: for extended_attribute in extended_attributes: From d5a9afc6d20d3376e46c1d972791b79c0b1b63ae Mon Sep 17 00:00:00 2001 From: Lucian <14054859+Luci2015@users.noreply.github.com> Date: Thu, 14 Dec 2017 11:36:22 +0200 Subject: [PATCH 2/6] Update directory_ldap.py correcting Issue # --- user_sync/connector/directory_ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_sync/connector/directory_ldap.py b/user_sync/connector/directory_ldap.py index 2ce3a501e..1e1b78591 100755 --- a/user_sync/connector/directory_ldap.py +++ b/user_sync/connector/directory_ldap.py @@ -269,7 +269,7 @@ def iter_users(self, users_filter, extended_attributes): if sn_value is not None: user['lastname'] = sn_value c_value = LDAPValueFormatter.get_attribute_value(record, six.text_type('c')) - source_attributes['c'] = c_value if c_value else None + source_attributes['c'] = c_value.upper() if c_value else None if c_value is not None: user['country'] = c_value.upper() From d6d4e9c7fcaa66b67b65eeeb89eeb780c583841f Mon Sep 17 00:00:00 2001 From: Lucian <14054859+Luci2015@users.noreply.github.com> Date: Thu, 14 Dec 2017 13:08:40 +0200 Subject: [PATCH 3/6] Update directory_csv.py Resolving issue #319 by enforcing the value to be always uppercase --- user_sync/connector/directory_csv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_sync/connector/directory_csv.py b/user_sync/connector/directory_csv.py index 024053081..773e34414 100644 --- a/user_sync/connector/directory_csv.py +++ b/user_sync/connector/directory_csv.py @@ -159,7 +159,7 @@ def get_column_name(key): country = self.get_column_value(row, country_column_name) if country is not None: - user['country'] = country + user['country'] = country.upper() groups = self.get_column_value(row, groups_column_name) if groups is not None: From a85bf02f571118174e44a1931c93a5eb5706dde2 Mon Sep 17 00:00:00 2001 From: Lucian <14054859+Luci2015@users.noreply.github.com> Date: Fri, 15 Dec 2017 13:51:58 +0200 Subject: [PATCH 4/6] Update directory_ldap.py --- user_sync/connector/directory_ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_sync/connector/directory_ldap.py b/user_sync/connector/directory_ldap.py index 1e1b78591..43a1e60c0 100755 --- a/user_sync/connector/directory_ldap.py +++ b/user_sync/connector/directory_ldap.py @@ -269,7 +269,7 @@ def iter_users(self, users_filter, extended_attributes): if sn_value is not None: user['lastname'] = sn_value c_value = LDAPValueFormatter.get_attribute_value(record, six.text_type('c')) - source_attributes['c'] = c_value.upper() if c_value else None + source_attributes['c'] = c_value if c_value is not None: user['country'] = c_value.upper() From 05ae81ecf02667440b31c123d7fffa5f36bf5982 Mon Sep 17 00:00:00 2001 From: Lucian Date: Fri, 15 Dec 2017 16:13:44 +0200 Subject: [PATCH 5/6] Update directory_okta.py --- user_sync/connector/directory_okta.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_sync/connector/directory_okta.py b/user_sync/connector/directory_okta.py index 6bb29d597..e5b12d989 100644 --- a/user_sync/connector/directory_okta.py +++ b/user_sync/connector/directory_okta.py @@ -227,9 +227,10 @@ def convert_user(self, record, extended_attributes): source_attributes['lastName'] = None if profile.countryCode: - source_attributes['countryCode'] = user['country'] = profile.countryCode + source_attributes['countryCode'] = profile.countryCode + user['country'] = profile.countryCode.upper() else: - source_attributes['countryCode'] = None + source_attributes['countryCode'] = user['country'] = None if extended_attributes: for extended_attribute in extended_attributes: From d40ae589cb77cc4909b0934fb5defbaa39b62eb9 Mon Sep 17 00:00:00 2001 From: Lucian Date: Fri, 15 Dec 2017 20:37:30 +0200 Subject: [PATCH 6/6] Update directory_okta.py --- user_sync/connector/directory_okta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_sync/connector/directory_okta.py b/user_sync/connector/directory_okta.py index e5b12d989..53682cacc 100644 --- a/user_sync/connector/directory_okta.py +++ b/user_sync/connector/directory_okta.py @@ -230,7 +230,7 @@ def convert_user(self, record, extended_attributes): source_attributes['countryCode'] = profile.countryCode user['country'] = profile.countryCode.upper() else: - source_attributes['countryCode'] = user['country'] = None + source_attributes['countryCode'] = None if extended_attributes: for extended_attribute in extended_attributes: