haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-11 20:01:10 +00:00
Code Issues Releases Wiki Activity

[shib] Use display_name in shib_meta as nickname, fallback to givenname + surname if missing

Browse Source
This commit is contained in:
zhengxie
2016-02-23 14:26:10 +08:00
parent 08813c6ee6
commit 11e645cae0
2 changed files with 88 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
thirdpart/shibboleth/middleware.py
View File

@@ -112,9 +112,14 @@ class ShibbolethRemoteUserMiddleware(RemoteUserMiddleware):
Extrat nickname(givenname surname), contact_email, institution from
Shib attributs, and add those to user profile.
"""
givenname = shib_meta.get('givenname', '')
surname = shib_meta.get('surname', '')
nickname = "%s %s" % (givenname, surname)
# use `display_name` as nickname in shib_meta first
nickname = shib_meta.get('display_name', None)
if nickname is None:
# otherwise, fallback to givenname plus surname in shib_meta
givenname = shib_meta.get('givenname', '')
surname = shib_meta.get('surname', '')
nickname = "%s %s" % (givenname, surname)
institution = shib_meta.get('institution', None)
contact_email = shib_meta.get('contact_email', None)
@@ -122,7 +127,9 @@ class ShibbolethRemoteUserMiddleware(RemoteUserMiddleware):
if not p:
p = Profile(user=user.username)
p.nickname = nickname
if nickname.strip(): # set nickname when it's not empty
p.nickname = nickname
if institution:
p.institution = institution
if contact_email: