premieres modifs pour la reception des attributs SupAnn

This commit is contained in:
Paul Marillonnet 2017-04-10 09:50:50 +02:00
parent 7787374c2a
commit 462090453a
3 changed files with 18 additions and 18 deletions

View File

@ -12,7 +12,7 @@ class Unit(models.Model):
#TODO enum ?
class SupAnnUser(UserSAMLIdentifier):
s_entite_affectation_principale = models.CharField(max_length=100)
REQUIRED_FIELDS = []
USERNAME_FIELD = 'name_id'
#class SupAnnUser(UserSAMLIdentifier):
# s_entite_affectation_principale = models.CharField(max_length=100)
# REQUIRED_FIELDS = []
# USERNAME_FIELD = 'name_id'

View File

@ -6,8 +6,8 @@ import urllib
import urllib2
import urlparse
#from mellon.models import UserSAMLIdentifier
from .models import SupAnnUser
from mellon.models import UserSAMLIdentifier
#from .models import SupAnnUser
#base = "ou=People,dc=entrouvert,dc=lan"
base = "ou=supannPeople,dc=condorcet,dc=dev,dc=entrouvert,dc=org"
@ -111,21 +111,21 @@ def saml_collect_data():
form = {}
# Build the SSO operation summary:
form['prenom'] = str(SupAnnUser.objects.last().user.first_name)
form['nom'] = str(SupAnnUser.objects.last().user.last_name)
form['email'] = str(SupAnnUser.objects.last().user.email)
form['prenom'] = str(UserSAMLIdentifier.objects.last().user.first_name)
form['nom'] = str(UserSAMLIdentifier.objects.last().user.last_name)
form['email'] = str(UserSAMLIdentifier.objects.last().user.email)
form['nameid'] = craft_uid(form) # XXX redundant information
#import pdb; pdb.set_trace()
# TODO SupAnn attributes:
form['ep_principal_name'] = str(SupAnnUser.objects.last().user.ep_principal_name)
form['s_etablissement'] = str(SupAnnUser.objects.last().user.s_etablissement)
form['ep_primary_affiliation'] = str(SupAnnUser.objects.last().user.ep_primary_affiliation)
form['ep_affiliation'] = str(SupAnnUser.objects.last().user.ep_affiliation)
form['s_entite_affectation_principale'] = str(SupAnnUser.objects.last().user.s_entite_affectation_principale)
form['s_entite_affectation'] = str(SupAnnUser.objects.last().user.s_entite_affectation)
form['s_emp_corps'] = str(SupAnnUser.objects.last().user.s_emp_corps)
form['s_liste_rouge'] = str(SupAnnUser.objects.last().user.s_liste_rouge)
form['ep_principal_name'] = str(UserSAMLIdentifier.objects.last().user.ep_principal_name)
form['s_etablissement'] = str(UserSAMLIdentifier.objects.last().user.s_etablissement)
form['ep_primary_affiliation'] = str(UserSAMLIdentifier.objects.last().user.ep_primary_affiliation)
form['ep_affiliation'] = str(UserSAMLIdentifier.objects.last().user.ep_affiliation)
form['s_entite_affectation_principale'] = str(UserSAMLIdentifier.objects.last().user.s_entite_affectation_principale)
form['s_entite_affectation'] = str(UserSAMLIdentifier.objects.last().user.s_entite_affectation)
form['s_emp_corps'] = str(UserSAMLIdentifier.objects.last().user.s_emp_corps)
form['s_liste_rouge'] = str(UserSAMLIdentifier.objects.last().user.s_liste_rouge)
return form

View File

@ -43,7 +43,7 @@ AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend',
)
AUTH_USER_MODEL = 'saml.SupAnnUser'
#AUTH_USER_MODEL = 'saml.SupAnnUser'
#LOGIN_REDIRECT_URL = '/saml/index/'