From f8f353f3e2a560ae9da332f7209bf0fcd5e54276 Mon Sep 17 00:00:00 2001
From: jluiselli <jluiselli@clipper.ens.fr>
Date: Tue, 15 Sep 2020 13:32:11 +0200
Subject: [PATCH] working auth with CAS

---
 annuaire/urls.py                      | 2 +-
 fiches/models.py                      | 2 ++
 fiches/templates/fiches/base.html     | 2 +-
 fiches/templates/fiches/birthday.html | 2 +-
 fiches/templates/fiches/home.html     | 2 +-
 fiches/urls.py                        | 2 +-
 fiches/views.py                       | 6 +++---
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/annuaire/urls.py b/annuaire/urls.py
index 85e272c..8fb9c48 100644
--- a/annuaire/urls.py
+++ b/annuaire/urls.py
@@ -25,7 +25,7 @@ urlpatterns = [
     path('fiche/', include('fiches.urls')),
     path('', home, name='home'),
     path('birthday', birthday, name='birthday'),
-    path('login', cas_views.LoginView.as_view(), name='cas_ng_login'),
+    path('accounts/login/', cas_views.LoginView.as_view(), name='cas_ng_login'),
     path('logout', cas_views.LogoutView.as_view(), name='cas_ng_logout'),
 ]
 
diff --git a/fiches/models.py b/fiches/models.py
index 9b023ce..a750a06 100644
--- a/fiches/models.py
+++ b/fiches/models.py
@@ -31,6 +31,8 @@ class Profile(models.Model):
         default=False, verbose_name=_("conserver la fiche annuaire ?")
     )
 
+    
+
     def __str__(self):
         return self.full_name
 
diff --git a/fiches/templates/fiches/base.html b/fiches/templates/fiches/base.html
index dd66119..2731e34 100644
--- a/fiches/templates/fiches/base.html
+++ b/fiches/templates/fiches/base.html
@@ -27,7 +27,7 @@
             <nav>
                 <a href='{% url "home" %}'> Accueil </a>
                 <a href='{% url "fiche_modif" %}'> Modifier sa fiche d'annuaire </a>
-                <a href='{% url "fiche" request.user.profile.id %}'> Consulter sa fiche d'annuaire </a>
+                <a href='{% url "fiche" request.user.profile.user %}'> Consulter sa fiche d'annuaire </a>
                 <a href='{% url "birthday" %}'> Anniversaires à venir </a>
                 {% if user.is_authenticated %}
                 <a href='{% url "cas_ng_logout" %}'> Se déconnecter</a>
diff --git a/fiches/templates/fiches/birthday.html b/fiches/templates/fiches/birthday.html
index e5152fb..9f0c95b 100644
--- a/fiches/templates/fiches/birthday.html
+++ b/fiches/templates/fiches/birthday.html
@@ -6,7 +6,7 @@
     <div>
         <ul>
         {% for profile in result %}
-            <li><a href="{% url 'fiche' profile.id %}">{{profile.full_name}} 
+            <li><a href="{% url 'fiche' profile.user.username %}">{{profile.full_name}} 
             </a>  ({{ profile.department.all|join:", " }} {{profile.promotion}}) : {{ profile.birth_date|date:"j F" }} </li>   
         {% endfor %}
         </ul>
diff --git a/fiches/templates/fiches/home.html b/fiches/templates/fiches/home.html
index b503bd1..e37db7f 100644
--- a/fiches/templates/fiches/home.html
+++ b/fiches/templates/fiches/home.html
@@ -11,7 +11,7 @@
 	<div>
 		<ul>
 		{% for profile in result %}
-			<li><a href="{% url 'fiche' profile.id %}">{{profile.full_name}} ({{ profile.department.all|join:", " }} {{profile.promotion}})
+			<li><a href="{% url 'fiche' profile.user.username %}">{{profile.full_name}} ({{ profile.department.all|join:", " }} {{profile.promotion}})
 			</a>	</li>	
 		{% endfor %}
 		</ul>
diff --git a/fiches/urls.py b/fiches/urls.py
index d9a7510..4058767 100644
--- a/fiches/urls.py
+++ b/fiches/urls.py
@@ -2,6 +2,6 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path("<int:id>", views.fiche, name="fiche"),
     path("edit", views.fiche_modif, name="fiche_modif"),
+    path("<user>", views.fiche, name="fiche"),
 ]
diff --git a/fiches/views.py b/fiches/views.py
index 77aac83..b9b6902 100644
--- a/fiches/views.py
+++ b/fiches/views.py
@@ -12,8 +12,8 @@ from django.template.loader import render_to_string
 
 
 @login_required
-def fiche(request, id):
-    profile = get_object_or_404(Profile, id=id)
+def fiche(request, user):
+    profile = get_object_or_404(Profile, user__username=user)
     return render(request, "fiches/fiche.html", {"profile": profile})
 
 
@@ -31,7 +31,7 @@ def fiche_modif(request):
                 ["{}@clipper.ens.psl.eu".format(request.user.username)],
                 fail_silently=False,
             )
-            return redirect(reverse("fiche", args=(profile.id,)))
+            return redirect(reverse("fiche", args=(profile.user,)))
 
     else:
         form = ProfileForm(instance=profile)