From 8188b36d38fc140a82e6cb2e3170ed36c0fa9789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 12 May 2015 17:34:48 +0200
Subject: [PATCH] lingo: lookup user from NameID using new mellon object

---
 combo/apps/lingo/views.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/combo/apps/lingo/views.py b/combo/apps/lingo/views.py
index 4cc799a5..8c1dc69e 100644
--- a/combo/apps/lingo/views.py
+++ b/combo/apps/lingo/views.py
@@ -27,6 +27,11 @@ from django.views.generic import View, ListView
 
 import eopayment
 
+try:
+    from mellon.models import UserSAMLIdentifier
+except ImportError:
+    UserSAMLIdentifier = None
+
 from .models import Regie, BasketItem, Transaction
 
 class RegiesApiView(ListView):
@@ -59,7 +64,12 @@ class AddBasketItemApiView(View):
 
         try:
             if request.GET.get('NameId'):
-                user = User.objects.get(username=request.GET.get('NameId'))
+                if UserSAMLIdentifier is None:
+                    raise Exception('missing mellon?')
+                try:
+                    user = UserSAMLIdentifier.objects.get(name_id=request.GET.get('NameId')).user
+                except UserSAMLIdentifier.DoesNotExist:
+                    raise Exception('unknown name id')
             elif request.GET.get('email'):
                 user = User.objects.get(email=request.GET.get('email'))
             else: