First cleaned version

src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java

@@ -5,6 +5,7 @@ import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VAL
 import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
 import at.ac.uibk.gitsearch.security.jwt.JWTConfigurer;
 import at.ac.uibk.gitsearch.security.jwt.TokenProvider;
+import at.ac.uibk.gitsearch.security.oauth2.GitSearchOAuth2AuthenticationToken;
 import at.ac.uibk.gitsearch.security.oauth2.GitSearchOAuth2AuthorizationRequestRepository;
 import at.ac.uibk.gitsearch.security.oauth2.SavedRequestAwareAuthenticationSuccessHandlerWithJWTSupport;
 import at.ac.uibk.gitsearch.security.oauth2.UserDetailsFetcher;
@@ -222,17 +223,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                 		)
                
                 .successHandler(getAuthenticationSuccessHandler());
-        		oauth2.addObjectPostProcessor(new ObjectPostProcessor<OAuth2LoginAuthenticationFilter>() {
-
-					@Override
-					public <O extends OAuth2LoginAuthenticationFilter> O postProcess(O object) {
-						if (object instanceof OAuth2LoginAuthenticationFilter) {
-							OAuth2LoginAuthenticationFilter oAuthLoginFilter = (OAuth2LoginAuthenticationFilter) object;
-							oAuthLoginFilter.setAuthenticationResultConverter(oauth2Tokenconverter);
-							
-						}
-						return object;
-					}});
+				oauth2.addObjectPostProcessor(authenticationFilterPostProcessor);
         		}
                 
                 		)
@@ -252,7 +243,27 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
  
     }
 
-    Converter<org.springframework.security.oauth2.jwt.Jwt, AbstractAuthenticationToken> authenticationConverter() {
+    /**
+     * this method postprocesses OAuth2LoginAuthenticationFilter and assigns an AuthenticationResultConverter.
+     * The AuthenticationResultConverter is needed to convey the original referer-URL from the original 
+     */
+	private final ObjectPostProcessor<OAuth2LoginAuthenticationFilter> authenticationFilterPostProcessor =
+			new ObjectPostProcessor<OAuth2LoginAuthenticationFilter>() {
+
+			@Override
+			public <O extends OAuth2LoginAuthenticationFilter> O postProcess(O object) {
+				if (object instanceof OAuth2LoginAuthenticationFilter) {
+					OAuth2LoginAuthenticationFilter oAuthLoginFilter = (OAuth2LoginAuthenticationFilter) object;
+					oAuthLoginFilter.setAuthenticationResultConverter((OAuth2LoginAuthenticationToken authenticationResult) -> {
+				    	OAuth2AuthenticationToken authToken = new GitSearchOAuth2AuthenticationToken(authenticationResult);
+						return authToken;
+					});
+				}
+				return object;
+			}};
+ 
+		
+	Converter<org.springframework.security.oauth2.jwt.Jwt, AbstractAuthenticationToken> authenticationConverter() {
         JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter();
         jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(
             new at.ac.uibk.gitsearch.security.oauth2.JwtGrantedAuthorityConverter()
@@ -307,37 +318,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
         };
     }
     
-    public static class GitSearchOAuth2AuthenticationToken extends OAuth2AuthenticationToken {
-
-    	/**
-		 * serialVersionUID
-		 */
-		private static final long serialVersionUID = 1L;
-		
-		private String redirectURL;
-    	
-		public GitSearchOAuth2AuthenticationToken(OAuth2LoginAuthenticationToken authenticationResult) {
-			super(authenticationResult.getPrincipal(), authenticationResult.getAuthorities(),
-					authenticationResult.getClientRegistration().getRegistrationId());
-			redirectURL = authenticationResult.getAuthorizationExchange().getAuthorizationRequest().getAttribute(GitSearchOAuth2AuthorizationRequestRepository.REFERER_ATTRIBUTE);
-			if(redirectURL == null)
-				redirectURL = "/";
-		}
-
-		public String getRedirectURL() {
-			return redirectURL;
-		}
-
-
-		
-    	
-    }
-
-    private Converter<OAuth2LoginAuthenticationToken, OAuth2AuthenticationToken> oauth2Tokenconverter = (OAuth2LoginAuthenticationToken authenticationResult) -> {
-    	OAuth2AuthenticationToken authToken = new GitSearchOAuth2AuthenticationToken(authenticationResult);
-		return authToken;
-	};
-	
     /**
      * not used by OidcAuthorizationCodeAuthenticationProvider :-(
      * @return

src/main/java/at/ac/uibk/gitsearch/security/oauth2/GitSearchOAuth2AuthenticationToken.java

+package at.ac.uibk.gitsearch.security.oauth2;
+
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken;
+
+public class GitSearchOAuth2AuthenticationToken extends OAuth2AuthenticationToken {
+
+	/**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	private String redirectURL;
+	
+	public GitSearchOAuth2AuthenticationToken(OAuth2LoginAuthenticationToken authenticationResult) {
+		super(authenticationResult.getPrincipal(), authenticationResult.getAuthorities(),
+				authenticationResult.getClientRegistration().getRegistrationId());
+		redirectURL = authenticationResult.getAuthorizationExchange().getAuthorizationRequest().getAttribute(GitSearchOAuth2AuthorizationRequestRepository.REFERER_ATTRIBUTE);
+		if(redirectURL == null)
+			redirectURL = "/";
+	}
+
+	public String getRedirectURL() {
+		return redirectURL;
+	}
+}
\ No newline at end of file

src/main/java/at/ac/uibk/gitsearch/security/oauth2/SavedRequestAwareAuthenticationSuccessHandlerWithJWTSupport.java

 package at.ac.uibk.gitsearch.security.oauth2;
 
-import at.ac.uibk.gitsearch.config.SecurityConfiguration.GitSearchOAuth2AuthenticationToken;
 import at.ac.uibk.gitsearch.security.jwt.TokenProvider;
 import java.io.IOException;
 import java.security.Principal;