Pagination + Login/Logout mit Meldung

Holarse-Linuxgaming · Dec 20, 2024 · 82f50a6 · 82f50a6
1 parent 12f5348
commit 82f50a6
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 27 deletions.
diff --git a/src/main/java/de/holarse/auth/web/SecureAccountFailureHandler.java b/src/main/java/de/holarse/auth/web/SecureAccountFailureHandler.java
@@ -44,8 +44,7 @@ public void onAuthenticationFailure(final HttpServletRequest request,
 
 
         final String username = request.getParameter("username");
-
-        log.debug("Login für User " + username + " fehlgeschlagen.", exception);
+        log.debug("Login für User {} fehlgeschlagen.", username, exception);
 
         final User user = userRepository.findByLogin(username);
         if (user != null) {
@@ -54,18 +53,28 @@ public void onAuthenticationFailure(final HttpServletRequest request,
                 userStatus.setFailedLogins(user.getStatus().getFailedLogins() + 1);
                 userStatus.setUpdated(OffsetDateTime.now());
 
+                log.info("Benutzer {} hat nun {} fehlgeschlagene Login-Versuche.", username, user.getStatus().getFailedLogins());
+
                 if (!userStatus.isLocked() && hasTooManyFailedAttempts(userStatus)) {
                     userStatus.setLocked(true);
                     log.warn("Benutzer {} wurde wegen zu vielen Fehlversuchen gesperrt.", username);
+                    userStatusRepository.save(userStatus);
+                    super.setDefaultFailureUrl("/login?error=too-many-attempts");
+                } else {
+                    log.warn("Benutzer {} ist gesperrt.", username);
+                    super.setDefaultFailureUrl("/login?error=locked");
                 }
-                userStatusRepository.save(userStatus);
-                super.setDefaultFailureUrl("/login?error=locked");
+
+
             } else {
                 log.error("User login {} has no user_status assoc", username);
                 super.setDefaultFailureUrl("/login?error=incomplete");
             }
-        }                                 
-
+        } else {
+            log.error("User login {} is not known", username);
+            super.setDefaultFailureUrl("/login?error=invalid");
+        }
+
         super.onAuthenticationFailure(request, response, exception);
     }
 

diff --git a/src/main/java/de/holarse/backend/db/repositories/NewsRepository.java b/src/main/java/de/holarse/backend/db/repositories/NewsRepository.java
@@ -1,14 +1,13 @@
 package de.holarse.backend.db.repositories;
 
-import de.holarse.backend.db.Article;
 import de.holarse.backend.db.News;
 import de.holarse.backend.view.FrontpageItemView;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 import java.util.Optional;
 import org.springframework.data.repository.query.Param;
 
@@ -20,7 +19,7 @@ public interface NewsRepository extends JpaRepository<News, Integer>, NodeAwareR
             + "JOIN n.nodeStatus as ns "
             + "JOIN n.nodeSlugz as sl "
             + "WHERE ns.published and NOT ns.deleted and sl.id = (SELECT max(_sl.id) FROM NodeSlug _sl where _sl.nodeId = n.nodeId)")
-    List<FrontpageItemView> findFrontpageItems(final Pageable pageable);
+    Page<FrontpageItemView> findFrontpageItems(final Pageable pageable);
 
     @Query(value = "FROM News n " + 
                    "JOIN FETCH n.nodeRevision nr " + 

diff --git a/src/main/java/de/holarse/config/AppConfig.java b/src/main/java/de/holarse/config/AppConfig.java
@@ -13,6 +13,7 @@
 import org.springframework.context.annotation.PropertySources;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
+import org.springframework.data.web.config.PageableHandlerMethodArgumentResolverCustomizer;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -139,4 +140,9 @@ public void addFormatters(FormatterRegistry registry) {
         registry.addConverter(new StringToFilepondConverter());
     }
 
+    @Bean
+    PageableHandlerMethodArgumentResolverCustomizer pageableResolverCustomizer() {
+        return pageableResolver -> pageableResolver.setOneIndexedParameters(true);
+    }
+
 }
diff --git a/src/main/java/de/holarse/config/MultipleHttpSecurityConfig.java b/src/main/java/de/holarse/config/MultipleHttpSecurityConfig.java
@@ -137,6 +137,7 @@ public SecurityFilterChain webFormSecurityFilterChain(final HttpSecurity http, f
 
         // Normale Webseite, auch als Gast nutzbar
         .authorizeHttpRequests((requests) -> requests.requestMatchers(antMatcher("/"),
+                                                                      antMatcher("/login**"),
                                                                       antMatcher("/search/**"),
                                                                       antMatcher("/tags/**"),
                                                                       antMatcher("/wiki/**"),
@@ -150,10 +151,11 @@ public SecurityFilterChain webFormSecurityFilterChain(final HttpSecurity http, f
                                                                       antMatcher("/imprint")).permitAll())
 
         // Form-Login
-        .formLogin(form -> form.loginPage("/login").permitAll()
-                               .successHandler(successHandler())
-                               .failureHandler(failureHandler()))
-
+        .formLogin(form -> form
+                .loginPage("/login").permitAll()
+                .failureHandler(failureHandler())
+                .successHandler(successHandler()))
+
         // Logout
         .logout(logout -> logout.logoutUrl("/logout"))
 

diff --git a/src/main/java/de/holarse/web/controller/LoginController.java b/src/main/java/de/holarse/web/controller/LoginController.java
@@ -7,6 +7,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.support.SessionStatus;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
 
 @Controller
 public class LoginController {
@@ -22,10 +23,10 @@ public ModelAndView index(final ModelAndView mv) {
     }
 
     @GetMapping("/logout")
-    public String logout(final SessionStatus session) {
+    public RedirectView logout(final SessionStatus session) {
         SecurityContextHolder.getContext().setAuthentication(null);
         session.setComplete();
-        return "/login?logout=true";
+        return new RedirectView("login?logout=true");
     }    
 
 }
diff --git a/src/main/java/de/holarse/web/controller/NewsController.java b/src/main/java/de/holarse/web/controller/NewsController.java
@@ -21,6 +21,7 @@
 import de.holarse.web.defines.WebDefines;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -70,12 +71,12 @@ public class NewsController {
     private NewsCategoryRepository newsCategoryRepository;
 
     @GetMapping
-    public ModelAndView index(@PageableDefault(sort = {"title"}, value = NEWS_ARTICLES_DEFAULT_PAGE_SIZE) final Pageable pageable, final ModelAndView mv) {
+    public ModelAndView index(@PageableDefault(sort = {"nr.updated", "nr.created"}, direction = Sort.Direction.ASC, value = NEWS_ARTICLES_DEFAULT_PAGE_SIZE) final Pageable pageable, final ModelAndView mv) {
         mv.setViewName("layouts/bare");
         mv.addObject("title", "Die Linuxspiele-Seite für Linuxspieler");
         mv.addObject(WebDefines.DEFAULT_VIEW_ATTRIBUTE_NAME, "sites/news/index");
 
-        mv.addObject("items", newsRepository.findFrontpageItems(pageable));
+        mv.addObject("searchResults", newsRepository.findFrontpageItems(pageable));
         return mv;
     }
 

diff --git a/src/main/java/de/holarse/web/controller/WelcomeController.java b/src/main/java/de/holarse/web/controller/WelcomeController.java
@@ -37,10 +37,10 @@ public ModelAndView index(final ModelAndView mv) {
         mv.addObject("title", "Die Linuxspiele-Seite für Linuxspieler");
         mv.addObject(WebDefines.DEFAULT_VIEW_ATTRIBUTE_NAME, "sites/welcome");
 
-        var pageRequest = PageRequest.of(0, 10, Sort.by("nr.updated").descending().and(Sort.by("nr.created").descending()));
+        var pageRequest = PageRequest.of(1, 10, Sort.by("nr.updated").descending().and(Sort.by("nr.created").descending()));
 
         final List<FrontpageItemView> articles = articleRepository.findFrontpageItems(pageRequest);
-        final List<FrontpageItemView> news = newsRepository.findFrontpageItems(pageRequest);
+        final List<FrontpageItemView> news = newsRepository.findFrontpageItems(pageRequest) != null ? newsRepository.findFrontpageItems(pageRequest).getContent() : new ArrayList<>();
 
         final List<FrontpageItemView> items = new ArrayList<>();
         items.addAll(articles);

diff --git a/src/main/webapp/WEB-INF/templates/sites/news/index.html b/src/main/webapp/WEB-INF/templates/sites/news/index.html
@@ -1,18 +1,20 @@
-<!-- Login -->
+<!-- List News Items Start -->
 <div class="row justify-content-center">
     <div class="col-sm-8 col-lg-5">
         <div class="u-shadow-v21 g-bg-white rounded g-py-40 g-px-30">
             <header class="text-center mb-4">
                 <h2 class="h2 g-color-black g-font-weight-600">Die News-Beiträge</h2>
             </header>
 
-            <ul data-th-each="item : ${items}">
-                <li><a href="#" data-th-href="@{/news/{slug}(slug=${item.slug})}" data-th-text="${item.title}"></a></li>
+            <ul data-th-each="searchResult : ${searchResults}">
+                <li><a href="#" data-th-href="@{/news/{slug}(slug=${searchResult.slug})}" data-th-text="${searchResult.title}"></a></li>
             </ul>
 
         </div>
     </div>
 </div>
-<!-- End Login -->
+<!-- List News Items End -->
+
+<section data-th-replace="~{sites/search/pagination :: pagination(searchResults=${searchResults})}"></section>
 
 
diff --git a/src/main/webapp/WEB-INF/templates/sites/search/pagination.html b/src/main/webapp/WEB-INF/templates/sites/search/pagination.html
@@ -4,7 +4,7 @@
         <ul class="list-inline">
             <li class="list-inline-item g-hidden-sm-down" data-th-if="${searchResults.hasPrevious}">
                 <a class="u-pagination-v1__item u-pagination-v1-5 rounded g-pa-4-11"
-                   href="#!" data-th-href="@{?(q=${q},t=${t},s=${s},page=${searchResults.previousPageable.pageNumber},size=${searchResults.previousPageable.pageSize})}"  aria-label="Previous">
+                   href="#!" data-th-href="@{?(q=${q},t=${t},s=${s},page=${searchResults.previousOrFirstPageable.pageNumber},size=${searchResults.previousOrFirstPageable.pageSize})}"  aria-label="Previous">
                                     <span aria-hidden="true">
                                         <i class="fa fa-angle-left g-mr-5"></i>
                                     </span>
@@ -13,14 +13,14 @@
             </li>
             <li class="list-inline-item g-hidden-sm-down">
                 <a class="list-inline-item font-italic">
-                    <span th:text="${searchResults.number + 1}"></span>
+                    <span th:text="${searchResults.number}"></span>
                     von
                     <span th:text="${searchResults.totalPages}"></span>
                 </a>
             </li>
             <li class="list-inline-item g-hidden-sm-down" data-th-if="${searchResults.hasNext}">
                 <a class="u-pagination-v1__item u-pagination-v1-5 rounded g-pa-4-11"
-                   href="#!" data-th-href="@{?(q=${q},t=${t},s=${s},page=${searchResults.nextPageable.pageNumber},size=${searchResults.nextPageable.pageSize})}" aria-label="Next">
+                   href="#!" data-th-href="@{?(q=${q},t=${t},s=${s},page=${searchResults.nextOrLastPageable.pageNumber},size=${searchResults.nextOrLastPageable.pageSize})}" aria-label="Next">
                                     <span aria-hidden="true">
                                         <i class="fa fa-angle-right g-ml-5"></i>
                                     </span>

diff --git a/src/main/webapp/WEB-INF/templates/sites/sessions/login.html b/src/main/webapp/WEB-INF/templates/sites/sessions/login.html
@@ -6,7 +6,47 @@
                 <h2 class="h2 g-color-black g-font-weight-600">Login</h2>
             </header>
 
-            <p>${error}</p>
+            <div data-th-if="${param.error}">
+                <!-- Red Alert -->
+                <div class="alert alert-dismissible fade show g-bg-red g-color-white rounded-0" role="alert">
+                    <button type="button" class="close u-alert-close--light" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                    </button>
+
+                    <div class="media">
+                        <span class="d-flex g-mr-10 g-mt-5">
+                          <i class="icon-ban g-font-size-25"></i>
+                        </span>
+                                        <span class="media-body align-self-center">
+                          <strong>Fehler!</strong> Leider gab es einen Fehler beim Anmelden.
+                                            <p>
+                                                <div data-th-value="${param.error}"></div>
+                                            </p>
+                        </span>
+                    </div>
+                </div>
+                <!-- End Red Alert -->
+            </div>
+
+            <div data-th-if="${param.logout}">
+                <!-- Teal Alert -->
+                <div class="alert alert-dismissible fade show g-bg-teal g-color-white rounded-0" role="alert">
+                    <button type="button" class="close u-alert-close--light" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                    </button>
+
+                    <div class="media">
+                        <span class="d-flex g-mr-10 g-mt-5">
+                          <i class="icon-check g-font-size-25"></i>
+                        </span>
+                                        <span class="media-body align-self-center">
+                          <strong>Abgemeldet!</strong> Du hast dich erfolgreich abgemeldet.
+                        </span>
+                    </div>
+                </div>
+                <!-- End Teal Alert -->
+
+            </div>
 
             <!-- Form -->
             <form data-th-action="@{/login}" data-th-object="${loginForm}" class="g-py-15" method="POST">
@@ -36,6 +76,8 @@ <h2 class="h2 g-color-black g-font-weight-600">Login</h2>
                     </div>
                 </div>
 
+
+
                 <div class="mb-4">
                     <button class="btn btn-md btn-block u-btn-primary rounded g-py-13" type="submit">Anmelden</button>
                 </div>