Changes for spring boot 2.1.0 upgrade

Author: callicoder

spring-social/pom.xml

@@ -14,7 +14,7 @@
 <parent>
 <groupId>org.springframework.boot</groupId>
 <artifactId>spring-boot-starter-parent</artifactId>
-<version>2.0.4.RELEASE</version>
+<version>2.1.0.RELEASE</version>
 <relativePath/> <!-- lookup parent from repository -->
 </parent>
 

spring-social/src/main/java/com/example/springsocial/config/SecurityConfig.java

@@ -43,11 +43,24 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
  @Autowired
  private OAuth2AuthenticationFailureHandler oAuth2AuthenticationFailureHandler;
 
+ @Autowired
+ private HttpCookieOAuth2AuthorizationRequestRepository httpCookieOAuth2AuthorizationRequestRepository;
+
  @Bean
  public TokenAuthenticationFilter tokenAuthenticationFilter() {
  return new TokenAuthenticationFilter();
  }
 
+ /*
+ By default, Spring OAuth2 uses HttpSessionOAuth2AuthorizationRequestRepository to save
+ the authorization request. But, since our service is stateless, we can't save it in
+ the session. We'll save the request in a Base64 encoded cookie instead.
+ */
+ @Bean
+ public HttpCookieOAuth2AuthorizationRequestRepository cookieAuthorizationRequestRepository() {
+ return new HttpCookieOAuth2AuthorizationRequestRepository();
+ }
+
  @Override
  public void configure(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception {
  authenticationManagerBuilder
@@ -118,13 +131,4 @@ protected void configure(HttpSecurity http) throws Exception {
  // Add our custom Token based authentication filter
  http.addFilterBefore(tokenAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
  }
-
- /*
- By default, Spring OAuth2 uses HttpSessionOAuth2AuthorizationRequestRepository to save
- the authorization request. But, since our service is stateless, we can't save it in
- the session. We'll save the request in a Base64 encoded cookie instead.
- */
- private AuthorizationRequestRepository<OAuth2AuthorizationRequest> cookieAuthorizationRequestRepository() {
- return new HttpCookieOAuth2AuthorizationRequestRepository();
- }
 }

spring-social/src/main/java/com/example/springsocial/security/oauth2/HttpCookieOAuth2AuthorizationRequestRepository.java

@@ -4,9 +4,12 @@
 import com.nimbusds.oauth2.sdk.util.StringUtils;
 import org.springframework.security.oauth2.client.web.AuthorizationRequestRepository;
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
+import org.springframework.stereotype.Component;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+@Component
 public class HttpCookieOAuth2AuthorizationRequestRepository implements AuthorizationRequestRepository<OAuth2AuthorizationRequest> {
  public static final String OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME = "oauth2_auth_request";
  public static final String REDIRECT_URI_PARAM_COOKIE_NAME = "redirect_uri";
@@ -36,19 +39,11 @@ public void saveAuthorizationRequest(OAuth2AuthorizationRequest authorizationReq
 
  @Override
  public OAuth2AuthorizationRequest removeAuthorizationRequest(HttpServletRequest request) {
- /*
- Ideally, the saved OAuth2AuthorizationRequest should be removed in this method.
-
- Since we're saving the OAuth2AuthorizationRequest in cookies, we need access to the HttpServletResponse to clear them.
- But that is not passed to this method.
-
- Therefore, We'll clear the cookies in OAuth2AuthenticationSuccessHandler instead.
- */
- return loadAuthorizationRequest(request);
+ return this.loadAuthorizationRequest(request);
  }
 
- public static void removeAuthorizationRequest(HttpServletRequest request, HttpServletResponse response) {
-  CookieUtils.deleteCookie(request, response, OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME);
- CookieUtils.deleteCookie(request, response, REDIRECT_URI_PARAM_COOKIE_NAME);
+ @Override
+ public OAuth2AuthorizationRequest removeAuthorizationRequest(HttpServletRequest request, HttpServletResponse response) {
+ return this.loadAuthorizationRequest(request);
  }
 }

spring-social/src/main/java/com/example/springsocial/security/oauth2/OAuth2AuthenticationFailureHandler.java

@@ -1,6 +1,7 @@
 package com.example.springsocial.security.oauth2;
 
 import com.example.springsocial.util.CookieUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
 import org.springframework.stereotype.Component;
@@ -17,6 +18,9 @@
 @Component
 public class OAuth2AuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
 
+ @Autowired
+ HttpCookieOAuth2AuthorizationRequestRepository httpCookieOAuth2AuthorizationRequestRepository;
+
  @Override
  public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException {
  String targetUrl = CookieUtils.getCookie(request, REDIRECT_URI_PARAM_COOKIE_NAME)
@@ -27,7 +31,7 @@ public void onAuthenticationFailure(HttpServletRequest request, HttpServletRespo
  .queryParam("error", exception.getLocalizedMessage())
  .build().toUriString();
 
- HttpCookieOAuth2AuthorizationRequestRepository.removeAuthorizationRequest(request, response);
+ httpCookieOAuth2AuthorizationRequestRepository.removeAuthorizationRequest(request, response);
 
  getRedirectStrategy().sendRedirect(request, response, targetUrl);
  }

spring-social/src/main/java/com/example/springsocial/security/oauth2/OAuth2AuthenticationSuccessHandler.java

@@ -26,10 +26,15 @@ public class OAuth2AuthenticationSuccessHandler extends SimpleUrlAuthenticationS
 
  private AppProperties appProperties;
 
+ private HttpCookieOAuth2AuthorizationRequestRepository httpCookieOAuth2AuthorizationRequestRepository;
+
+
  @Autowired
- OAuth2AuthenticationSuccessHandler(TokenProvider tokenProvider, AppProperties appProperties) {
+ OAuth2AuthenticationSuccessHandler(TokenProvider tokenProvider, AppProperties appProperties,
+ HttpCookieOAuth2AuthorizationRequestRepository httpCookieOAuth2AuthorizationRequestRepository) {
  this.tokenProvider = tokenProvider;
  this.appProperties = appProperties;
+ this.httpCookieOAuth2AuthorizationRequestRepository = httpCookieOAuth2AuthorizationRequestRepository;
  }
 
  @Override
@@ -64,7 +69,7 @@ protected String determineTargetUrl(HttpServletRequest request, HttpServletRespo
 
  protected void clearAuthenticationAttributes(HttpServletRequest request, HttpServletResponse response) {
  super.clearAuthenticationAttributes(request);
- HttpCookieOAuth2AuthorizationRequestRepository.removeAuthorizationRequest(request, response);
+ httpCookieOAuth2AuthorizationRequestRepository.removeAuthorizationRequest(request, response);
  }
 
  private boolean isAuthorizedRedirectUri(String uri) {