Merge pull request #60 from aiven/issue30-builderclasses

Issue30 builderclasses
Aiven-Open · Oct 10, 2022 · 6670b10 · 6670b10
2 parents f78c62c + e7d7469
commit 6670b10
Show file tree

Hide file tree

Showing 154 changed files with 10,263 additions and 3,026 deletions.
diff --git a/src/main/java/io/aiven/klaw/auth/KwAuthenticationService.java b/src/main/java/io/aiven/klaw/auth/KwAuthenticationService.java
@@ -110,8 +110,11 @@ private DirContextOperations searchForUser(DirContext context, String username)
     String searchRoot =
         this.adRootDn != null ? this.adRootDn : this.searchRootFromPrincipal(bindPrincipal);
     String searchFilterUpdated;
-    if (adFilter != null && !adFilter.equals("")) searchFilterUpdated = adFilter;
-    else searchFilterUpdated = searchFilter;
+    if (adFilter != null && !adFilter.equals("")) {
+      searchFilterUpdated = adFilter;
+    } else {
+      searchFilterUpdated = searchFilter;
+    }
 
     try {
       return SpringSecurityLdapTemplate.searchForSingleEntryInternal(

diff --git a/src/main/java/io/aiven/klaw/auth/KwAuthenticationSuccessHandler.java b/src/main/java/io/aiven/klaw/auth/KwAuthenticationSuccessHandler.java
@@ -32,14 +32,21 @@ private String validateUrl(String urlFromAddressBar) {
     if (urlFromAddressBar != null) {
       urlFromAddressBar = urlFromAddressBar.replace(contextPath + "/", "");
 
-      if (urlFromAddressBar.contains("login")) urlFromAddressBar = "index";
+      if (urlFromAddressBar.contains("login")) {
+        urlFromAddressBar = "index";
+      }
 
       if (!urlFromAddressBar.contains("loggedin=true")) {
-        if (urlFromAddressBar.contains("?")) urlFromAddressBar += "&loggedin=true";
-        else urlFromAddressBar += "?loggedin=true";
+        if (urlFromAddressBar.contains("?")) {
+          urlFromAddressBar += "&loggedin=true";
+        } else {
+          urlFromAddressBar += "?loggedin=true";
+        }
       }
 
-    } else urlFromAddressBar = "";
+    } else {
+      urlFromAddressBar = "";
+    }
 
     return urlFromAddressBar;
   }

diff --git a/src/main/java/io/aiven/klaw/auth/KwRequestFilter.java b/src/main/java/io/aiven/klaw/auth/KwRequestFilter.java
@@ -11,6 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.AuthenticationServiceException;
 import org.springframework.security.core.Authentication;
@@ -36,15 +37,15 @@ public class KwRequestFilter extends UsernamePasswordAuthenticationFilter {
 
   @Autowired KwAuthenticationService kwAuthenticationService;
 
-  @Autowired private AuthenticationManager authenticationManager;
+  @Lazy private AuthenticationManager authenticationManager;
 
   @Autowired private KwAuthenticationFailureHandler kwAuthenticationFailureHandler;
 
   @Autowired private KwAuthenticationSuccessHandler kwAuthenticationSuccessHandler;
 
   @Override
   @Autowired
-  public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+  public void setAuthenticationManager(@Lazy AuthenticationManager authenticationManager) {
     super.setAuthenticationManager(authenticationManager);
   }
 
@@ -56,7 +57,9 @@ public Authentication attemptAuthentication(
     if ("saas".equals(kwInstallationType)) {
       String gRecaptchaResponse = request.getParameter("g-recaptcha-response");
       boolean captchaResponse = validateCaptchaService.validateCaptcha(gRecaptchaResponse);
-      if (!captchaResponse) throw new AuthenticationServiceException("Invalid Captcha.");
+      if (!captchaResponse) {
+        throw new AuthenticationServiceException("Invalid Captcha.");
+      }
     }
 
     if ("ad".equals(authenticationType)) {
@@ -68,7 +71,9 @@ public Authentication attemptAuthentication(
         // User in KW db
         return super.attemptAuthentication(request, response);
       }
-    } else return super.attemptAuthentication(request, response);
+    } else {
+      return super.attemptAuthentication(request, response);
+    }
   }
 
   @Override