MVC pattern + DAO OK ---> controller, DAO, template done

Author: SlothyKernel1314

Diff for: pom.xml

@@ -61,6 +61,16 @@
             <artifactId>spring-boot-autoconfigure</artifactId>
             <version>2.1.3.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>Semantic-UI</artifactId>
+            <version>2.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

Diff for: src/main/java/com/iat/tpldapapachedirectory/dao/UserDao.java

@@ -0,0 +1,44 @@
+package com.iat.tpldapapachedirectory.dao;
+
+import com.iat.tpldapapachedirectory.configuration.GlobalProperties;
+import com.iat.tpldapapachedirectory.model.User;
+import com.iat.tpldapapachedirectory.service.ConnectionService;
+import com.iat.tpldapapachedirectory.service.LdapQueries;
+import org.apache.directory.api.ldap.model.cursor.CursorException;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.ldap.client.api.LdapNetworkConnection;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+@Component
+public class UserDao {
+
+    // documentation : https://directory.apache.org/api/user-guide/6.12-entry.html
+
+    @Autowired
+    LdapQueries ldapQueries;
+
+    @Autowired
+    ConnectionService connectionService;
+
+    @Autowired
+    GlobalProperties globalProperties;
+
+    public ArrayList<User> getAllAdmByIdAndName() throws IOException, LdapException, CursorException {
+        LdapNetworkConnection connection = connectionService.openConnection();
+        ArrayList<Entry> entries = ldapQueries.findAllAdm(connection, globalProperties.getDomain());
+        ArrayList<User> admins = new ArrayList<>();
+        for (Entry entry: entries) {
+            // TODO : vérifier si le design pattern utilisé ici (LdapQueries + UserDao + UserController) est efficient
+            User user = new User();
+            user.setCategory(entry.get("radiusTunnelPrivateGroupId").get().toString());
+            user.setName(entry.get("sn").get().toString());
+            admins.add(user);
+        }
+        return admins;
+    }
+}

Diff for: src/main/java/com/iat/tpldapapachedirectory/model/User.java

@@ -0,0 +1,29 @@
+package com.iat.tpldapapachedirectory.model;
+
+
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class User  {
+
+    private String name; // sn
+    private String category; // radiusTunnelPrivateGroup
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+}

Diff for: src/main/java/com/iat/tpldapapachedirectory/service/ConnectionService.java

@@ -1,6 +1,5 @@
 package com.iat.tpldapapachedirectory.service;
 
-import com.iat.tpldapapachedirectory.LdapQueries;
 import com.iat.tpldapapachedirectory.configuration.GlobalProperties;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.ldap.client.api.LdapConnection;

Diff for: src/main/java/com/iat/tpldapapachedirectory/LdapQueries.java renamed to src/main/java/com/iat/tpldapapachedirectory/service/LdapQueries.java

@@ -1,22 +1,26 @@
-package com.iat.tpldapapachedirectory;
+package com.iat.tpldapapachedirectory.service;
 
+import com.iat.tpldapapachedirectory.model.User;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
 import org.apache.directory.api.ldap.model.cursor.EntryCursor;
 import org.apache.directory.api.ldap.model.entry.*;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.message.SearchScope;
 import org.apache.directory.ldap.client.api.LdapConnection;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Component
 public class LdapQueries {
 
     /**
-     * Performs search using a search of all persons in a LDAP domain (SearchScope.SearchScope.SUBTREE)
+     * Performs search using a search of all persons in a LDAP model (SearchScope.SearchScope.SUBTREE)
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      */
     public void findAllPersons(LdapConnection connection, String domain) throws LdapException, CursorException, IOException {
 
@@ -40,9 +44,11 @@ public void findAllPersons(LdapConnection connection, String domain) throws Ldap
     /**
      * Performs search using a search of all persons in a LDAP organizational unit (SearchScope.ONELEVEL)
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      */
-    public void findAllAdm(LdapConnection connection, String domain) throws LdapException, CursorException, IOException {
+    public ArrayList<Entry> findAllAdm(LdapConnection connection, String domain) throws LdapException, CursorException, IOException {
+
+        ArrayList<Entry> entries = new ArrayList<>();
 
         // Root : ou=adm ; parse : all adm, only adm (one level)
         EntryCursor cursor = connection.search( "ou=adm, "+domain+"", "(objectclass=*)", SearchScope.ONELEVEL, "*" );
@@ -52,18 +58,22 @@ public void findAllAdm(LdapConnection connection, String domain) throws LdapExce
         {
             Entry entry = cursor.get();
             System.out.println(entry);
+            entries.add(entry);
             nbrEntries +=1;
 
         }
 
         System.out.println("NOMBRE TOTAL D'ENTREES : " + nbrEntries);
+
         cursor.close();
+
+        return entries;
     }
 
     /**
      * Add an entry (a person) to the LDAP server
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      * @param cn : a LDAP common name
      * @param sn : a LDAP surname
      */
@@ -85,7 +95,7 @@ public void addPerson(LdapConnection connection, String domain, String cn, Strin
     /**
      * Delete the entry (a person) with the given distinguished name to the LDAP server
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      * @param cn : a LDAP common name
      */
     public void deletePerson(LdapConnection connection, String domain, String cn) throws Exception {
@@ -97,7 +107,7 @@ public void deletePerson(LdapConnection connection, String domain, String cn) th
      * Applies all the modifications (add attributes + values = ModificationOperation.ADD_ATTRIBUTE)...
      * ... to the entry (a person) specified by its distinguished name
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      * @param cn : a LDAP common name
      * @param attributeId1 : first attribute to add
      * @param value1 : first value to add
@@ -119,7 +129,7 @@ public void addAttributesToPerson(LdapConnection connection, String domain, Stri
      * Applies all the modifications (remove attributes = ModificationOperation.REMOVE_ATTRIBUTE)...
      * ... to the entry (a person) specified by its distinguished name
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      * @param cn : a LDAP common name
      * @param attributeId1 : first attribute to remove
      * @param attributeId2 : second attribute to remove
@@ -137,7 +147,7 @@ public void removeAttributesToPerson(LdapConnection connection, String domain, S
      * Applies all the modifications (replace attributes + values = ModificationOperation.REPLACE_ATTRIBUTE)...
      * ... to the entry (a person) specified by its distinguished name
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      * @param cn : a LDAP common name
      * @param attributeId1 : first attribute to replace
      * @param value1 : first value to replace
@@ -168,9 +178,9 @@ public void moveAndRenamePerson(LdapConnection connection, String oldDn, String
     }
 
     /**
-     * Performs search using a search of all organizational unit in a LDAP domain (SearchScope.SearchScope.ONELEVEL)
+     * Performs search using a search of all organizational unit in a LDAP model (SearchScope.SearchScope.ONELEVEL)
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      */
     public void findAllOu(LdapConnection connection, String domain) throws LdapException, CursorException, IOException {
 
@@ -193,7 +203,7 @@ public void findAllOu(LdapConnection connection, String domain) throws LdapExcep
     /**
      * Add an entry (an organizational unit) to the LDAP server
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      * @param ou : an organizational unit
      */
     public void addOu(LdapConnection connection, String domain, String ou) throws LdapException {
@@ -210,7 +220,7 @@ public void addOu(LdapConnection connection, String domain, String ou) throws Ld
     /**
      * Delete the entry (an organizational unit) with the given distinguished name to the LDAP server
      * @param connection : an instance of LdapNetworkConnection (interface LdapConnection)
-     * @param domain : a LDAP domain
+     * @param domain : a LDAP model
      */
     public void deleteOu(LdapConnection connection, String domain,String ou) throws Exception {
 

Diff for: src/main/java/com/iat/tpldapapachedirectory/web/UserController.java

@@ -0,0 +1,38 @@
+package com.iat.tpldapapachedirectory.web;
+
+import com.iat.tpldapapachedirectory.configuration.GlobalProperties;
+import com.iat.tpldapapachedirectory.dao.UserDao;
+import com.iat.tpldapapachedirectory.model.User;
+import com.iat.tpldapapachedirectory.service.LdapQueries;
+import com.iat.tpldapapachedirectory.service.ConnectionService;
+import org.apache.directory.api.ldap.model.cursor.CursorException;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.ldap.client.api.LdapNetworkConnection;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.io.IOException;
+
+@Controller
+public class UserController {
+
+    @Autowired
+    ConnectionService connectionService;
+
+    @Autowired
+    GlobalProperties globalProperties;
+
+    @Autowired
+    UserDao userDao;
+
+    @GetMapping("/admList")
+    public String admList(Model model) throws IOException, LdapException, CursorException {
+        Iterable<User> admins = userDao.getAllAdmByIdAndName();
+        model.addAttribute("admins", admins);
+        model.addAttribute("msg", "Ceci est un test");
+        return "admList";
+    }
+
+}

Diff for: src/main/resources/templates/admList.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Liste des Admins</title>
+</head>
+<body>
+<div>
+    <h2 th:text="'Liste des Admins'">Liste des Admins</h2>
+    <h3 th:text="${msg}">msg</h3>
+    <table border="1">
+        <thead>
+        <tr>
+            <th>Nom</th>
+            <th>Catégorie</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr th:each="admin : ${admins}">
+            <td>
+                <a th:text="${admin.name}"></a>
+            </td>
+            <td>
+                <a th:text="${admin.category}"></a>
+            </td>
+
+        </tr>
+        </tbody>
+    </table>
+</div>
+</body>
+</html>