Skip to content

enforce country code to be uppercase #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 15, 2017
Merged

enforce country code to be uppercase #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a991d20
Update directory_ldap.py
Luci2015 Dec 14, 2017
d5a9afc
Update directory_ldap.py
Luci2015 Dec 14, 2017
d6d4e9c
Update directory_csv.py
Luci2015 Dec 14, 2017
a85bf02
Update directory_ldap.py
Luci2015 Dec 15, 2017
65e9b4f
Merge remote-tracking branch 'upstream/v2' into v2
Luci2015 Dec 15, 2017
05ae81e
Update directory_okta.py
Luci2015 Dec 15, 2017
d40ae58
Update directory_okta.py
Luci2015 Dec 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion user_sync/connector/directory_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion user_sync/connector/directory_ldap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def iter_users(self, users_filter, extended_attributes):
c_value = LDAPValueFormatter.get_attribute_value(record, six.text_type('c'))
source_attributes['c'] = c_value
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:
Expand Down
3 changes: 2 additions & 1 deletion user_sync/connector/directory_okta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ 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

Expand Down