Merge pull request #50 from kakawait/develop

Release 0.4.4

Author: kakawait

README.md

@@ -1,6 +1,6 @@
 # Spring Security CAS starter
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.kakawait/cas-security-spring-boot-starter.svg)](https://search.maven.org/#artifactdetails%7Ccom.kakawait%7Ccas-security-spring-boot-starter%7C0.4.3%7Cjar)
+[![Maven Central](https://img.shields.io/maven-central/v/com.kakawait/cas-security-spring-boot-starter.svg)](https://search.maven.org/#artifactdetails%7Ccom.kakawait%7Ccas-security-spring-boot-starter%7C0.4.4%7Cjar)
 [![license](https://img.shields.io/github/license/kakawait/cas-security-spring-boot-starter.svg)](https://github.com/kakawait/cas-security-spring-boot-starter/blob/master/LICENSE.md)
 
 > A Spring boot starter that will help you configure [Spring Security Cas](http://docs.spring.io/spring-security/site/docs/current/reference/html/cas.html) within the application security context.
@@ -20,7 +20,7 @@ Add the Spring boot starter to your project
 <dependency>
   <groupId>com.kakawait</groupId>
   <artifactId>cas-security-spring-boot-starter</artifactId>
-  <version>0.4.3</version>
+  <version>0.4.4</version>
 </dependency>
 ```
 

cas-security-dynamic-service-resolver/pom.xml

@@ -56,7 +56,7 @@
     <distributionManagement>
         <relocation>
             <artifactId>spring-security-cas-extension</artifactId>
-            <version>0.4.3</version>
+            <version>0.4.4</version>
         </relocation>
     </distributionManagement>
 

cas-security-spring-boot-autoconfigure/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.kakawait</groupId>
     <artifactId>cas-security-spring-boot-autoconfigure</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <packaging>jar</packaging>
 
     <name>Cas security spring boot autoconfigure</name>

cas-security-spring-boot-autoconfigure/src/main/java/com/kakawait/spring/boot/security/cas/CasAuthenticationFilterConfigurer.java

@@ -40,7 +40,7 @@ void configure(CasAuthenticationFilter filter) {
         if (proxyAuthenticationFailureHandler != null) {
             filter.setProxyAuthenticationFailureHandler(proxyAuthenticationFailureHandler);
         }
-        if (authenticationFailureHandler != null) {
+        if (authenticationSuccessHandler != null) {
             filter.setAuthenticationSuccessHandler(authenticationSuccessHandler);
         }
         if (proxyReceptorUrl != null) {

cas-security-spring-boot-sample/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.kakawait</groupId>
     <artifactId>cas-security-spring-boot-sample</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
 
     <name>Cas security spring boot sample</name>
 

cas-security-spring-boot-starter/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.kakawait</groupId>
     <artifactId>cas-security-spring-boot-starter</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <packaging>jar</packaging>
 
     <name>Cas security spring boot starter</name>

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.kakawait</groupId>
     <artifactId>cas-security-spring-boot-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
 
     <name>Cas security spring boot parent</name>
     <description>Spring boot starter for Apereo CAS client fully integrated with Spring security</description>

spring-security-cas-extension/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.kakawait</groupId>
     <artifactId>spring-security-cas-extension</artifactId>
-    <version>0.4.3</version>
+    <version>0.4.4</version>
     <packaging>jar</packaging>
 
     <name>Spring security cas extension</name>

spring-security-cas-extension/src/main/java/com/kakawait/spring/security/cas/web/authentication/CasAuthenticationSuccessHandler.java

@@ -12,21 +12,22 @@
  */
 public class CasAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler {
 
-    private final String ticketParameterName;
+    private final String artifactParameter;
 
-    public CasAuthenticationSuccessHandler(String ticketParameterName) {
-        Assert.notNull(ticketParameterName, "tickerParameterName must not be null!");
-        this.ticketParameterName = ticketParameterName;
+    public CasAuthenticationSuccessHandler(String artifactParameter) {
+        Assert.notNull(artifactParameter, "artifactParameter must not be null!");
+        this.artifactParameter = artifactParameter;
     }
 
     @Override
     protected String determineTargetUrl(HttpServletRequest request, HttpServletResponse response) {
         String url = super.determineTargetUrl(request, response);
-        String ticket = request.getParameter(ticketParameterName);
+        String ticket = request.getParameter(artifactParameter);
         if (ticket != null) {
             url = UriComponentsBuilder
                     .fromUriString(request.getRequestURL().toString())
-                    .replaceQueryParam(ticketParameterName, new Object[0])
+                    .query(request.getQueryString())
+                    .replaceQueryParam(artifactParameter, new Object[0])
                     .build()
                     .toUriString();
         }