From f00f59ce0b0eae58190bd8d1cbd04537a8a7fb1f Mon Sep 17 00:00:00 2001
From: Chris Mann <chris@lesgrandsvoisins.com>
Date: Fri, 21 Jul 2023 07:33:43 +0200
Subject: [PATCH] Implementing Activate User

---
 admin.go                      |  2 +-
 templates/admin_activate.html | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/admin.go b/admin.go
index 74a8c6a..1604f3f 100644
--- a/admin.go
+++ b/admin.go
@@ -56,7 +56,7 @@ func handleAdminActivateUsers(w http.ResponseWriter, r *http.Request) {
 		config.InvitationBaseDN,
 		ldap.ScopeSingleLevel, ldap.NeverDerefAliases, 0, 0, false,
 		fmt.Sprintf("(&(objectClass=organizationalPerson))"),
-		[]string{config.UserNameAttr, "dn", "displayName", "givenName", "sn", "mail", "uid", "cn"},
+		[]string{config.UserNameAttr, "displayName", "givenName", "sn", "mail", "uid", "cn"},
 		nil)
 
 	sr, err := login.conn.Search(searchRequest)
diff --git a/templates/admin_activate.html b/templates/admin_activate.html
index c4040bf..f7add1d 100644
--- a/templates/admin_activate.html
+++ b/templates/admin_activate.html
@@ -3,20 +3,25 @@
 {{define "body"}}
 <table class="table mt-4">
   <thead>
-    <th scope="col">Identifiant</th>
-    <th scope="col">Nom complet</th>
+    <th scope="col">Login</th>
+    <th scope="col">Email</th>
+    <th scope="col">Nom d'ffichage</th>
+    <th scope="col">Prénom</th>
+    <th scope="col">Nom de famille</th>
+    <th scope="col">description</th>
   </thead>
   <tbody>
     {{with $root := .}}
       {{range $user := $root.Users}}
         <tr>
           <td>
-            <a href="/admin/activate/{{$user.CN}}">
+            <a href="/admin/activate/{{ $user.GetAttributeValue "cn" }}">
               {{$user.GetAttributeValue "cn"}}
             </a>
           </td>
           <td>{{$user.GetAttributeValue "mail"}}</td>
           <td>{{$user.GetAttributeValue "displayName"}}</td>
+          <td>{{$user.GetAttributeValue "givenName"}}</td>
           <td>{{$user.GetAttributeValue "sn"}}</td>
           <td>{{$user.GetAttributeValue "description"}}</td>
         </tr>