tanner/spaceport
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'preferred_name'

Browse Source
This commit is contained in:
Tanner Collin
2022-08-31 00:12:56 +00:00
parent a8da1ff2e5 0c0b7ce3a7
commit 0a6e9a6449
10 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apiserver/apiserver/api/utils_ldap.py
View File

@@ -28,7 +28,7 @@ def find_user(username):
def create_user(data):
ldap_data = dict(
first=data['first_name'],
first=data['preferred_name'],
last=data['last_name'],
username=data['username'],
email=data['email'],
@@ -52,7 +52,7 @@ def add_to_group(member, group):
if ldap_api('add-to-group', ldap_data) != 200: raise
except BaseException as e:
logger.error('LDAP Group - {} - {}'.format(e.__class__.__name__, str(e)))
m = '{} {} ({})'.format(member.first_name, member.last_name, member.id)
m = '{} {} ({})'.format(member.preferred_name, member.last_name, member.id)
msg = 'Problem adding {} to group {}!'.format(m, group)
utils.alert_tanner(msg)
logger.info(msg)
@@ -66,7 +66,7 @@ def remove_from_group(member, group):
if ldap_api('remove-from-group', ldap_data) != 200: raise
except BaseException as e:
logger.error('LDAP Group - {} - {}'.format(e.__class__.__name__, str(e)))
m = '{} {} ({})'.format(member.first_name, member.last_name, member.id)
m = '{} {} ({})'.format(member.preferred_name, member.last_name, member.id)
msg = 'Problem removing {} from group {}!'.format(m, group)
utils.alert_tanner(msg)
logger.info(msg)