From cce6b429884907d942f308a7e9bdcef8fe178dbe Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Sun, 12 Dec 2010 00:08:34 +0100 Subject: remap shib attributes --- coip/apps/auth/views.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/coip/apps/auth/views.py b/coip/apps/auth/views.py index 1c3e760..bb8ba17 100644 --- a/coip/apps/auth/views.py +++ b/coip/apps/auth/views.py @@ -10,16 +10,14 @@ from coip.apps.auth.utils import anonid from coip.apps.name.models import lookup import datetime from django.views.decorators.cache import never_cache +import logging def meta(request,attr): v = request.META.get(attr) if not v: return None - values = v.split(";") - if values[0] and values[0] != "(null)": - return values[0] - else: - return None + values = filter(lambda x: x != "(null)",v.split(";")) + return values; def accounts_login_federated(request): if request.user.is_authenticated(): @@ -33,11 +31,12 @@ def accounts_login_federated(request): else: request.user = profile.user - + update = False cn = meta(request,'cn') if not cn: cn = meta(request,'displayName') + logging.warn(cn) if not cn: fn = meta(request,'givenName') ln = meta(request,'sn') -- cgit v1.1