Merge branch 'resubscribe-on-token-expiration' into 3.x

Signed-off-by: Ben Hale <[email protected]>

Author: nebhale

.idea/runConfigurations/integration_test.xml

@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.handler.logging.LogLevel;
 import io.netty.handler.ssl.SslContextBuilder;
 import org.cloudfoundry.Nullable;
 import org.cloudfoundry.reactor.util.ByteBufAllocatorMetricProviderWrapper;
@@ -268,6 +269,7 @@ private TcpClient configureTcpClient(TcpClient tcpClient) {
             .option(SO_SNDBUF, SEND_RECEIVE_BUFFER_SIZE)
             .option(SO_RCVBUF, SEND_RECEIVE_BUFFER_SIZE);
         tcpClient = configureKeepAlive(tcpClient);
+        tcpClient = tcpClient.wiretap("cloudfoundry-client.wire", LogLevel.TRACE);
 
         return configureConnectTimeout(tcpClient);
     }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/_DefaultConnectionContext.java

@@ -70,6 +70,16 @@ protected final Mono<HttpClientResponse> get(Object requestPayload, Function<Uri
                 .get());
     }
 
+    protected final Mono<HttpClientResponse> get(Object requestPayload, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer, Consumer<HttpHeaders> headersTransformer,
+                                                 Function<HttpHeaders, Mono<? extends HttpHeaders>> headersWhenTransformer) {
+        return createOperator()
+            .flatMap(operator -> operator.headers(headers -> addHeaders(headers, requestPayload, headersTransformer)).headersWhen(headersWhenTransformer)
+                .get()
+                .uri(queryTransformer(requestPayload).andThen(uriTransformer))
+                .response()
+                .get());
+    }
+
     protected final <T> Mono<T> get(Object requestPayload, Class<T> responseType, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
         return createOperator()
             .flatMap(operator -> operator.headers(headers -> addHeaders(headers, requestPayload))

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/uaa/AbstractUaaOperations.java

@@ -74,14 +74,18 @@ public Mono<String> authorizationCodeGrantApi(AuthorizeByAuthorizationCodeGrantA
 
     @Override
     public Mono<String> authorizationCodeGrantBrowser(AuthorizeByAuthorizationCodeGrantBrowserRequest request) {
-        return get(request, builder -> builder.pathSegment("oauth", "authorize").queryParam("response_type", ResponseType.CODE), ReactorAuthorizations::removeAuthorization)
+        return get(request, builder -> builder.pathSegment("oauth", "authorize").queryParam("response_type", ResponseType.CODE),
+            outbound -> {},
+            ReactorAuthorizations::removeAuthorization)
             .map(inbound -> inbound.responseHeaders().get(LOCATION))
             .checkpoint();
     }
 
     @Override
     public Mono<String> authorizationCodeGrantHybrid(AuthorizeByAuthorizationCodeGrantHybridRequest request) {
-        return get(request, builder -> builder.pathSegment("oauth", "authorize").queryParam("response_type", ResponseType.CODE_AND_ID_TOKEN), ReactorAuthorizations::removeAuthorization)
+        return get(request, builder -> builder.pathSegment("oauth", "authorize").queryParam("response_type", ResponseType.CODE_AND_ID_TOKEN),
+            outbound -> {},
+            ReactorAuthorizations::removeAuthorization)
             .map(inbound -> inbound.responseHeaders().get(LOCATION))
             .checkpoint();
     }
@@ -94,14 +98,18 @@ public Mono<GetOpenIdProviderConfigurationResponse> getOpenIdProviderConfigurati
 
     @Override
     public Mono<String> implicitGrantBrowser(AuthorizeByImplicitGrantBrowserRequest request) {
-        return get(request, builder -> builder.pathSegment("oauth", "authorize").queryParam("response_type", ResponseType.TOKEN), ReactorAuthorizations::removeAuthorization)
+        return get(request, builder -> builder.pathSegment("oauth", "authorize").queryParam("response_type", ResponseType.TOKEN),
+            outbound -> {},
+            ReactorAuthorizations::removeAuthorization)
             .map(inbound -> inbound.responseHeaders().get(LOCATION))
             .checkpoint();
     }
 
     @Override
     public Mono<String> openIdWithAuthorizationCodeAndIdToken(AuthorizeByOpenIdWithAuthorizationCodeGrantRequest request) {
-        return get(request, builder -> builder.pathSegment("oauth", "authorize").queryParam("response_type", ResponseType.CODE_AND_ID_TOKEN), ReactorAuthorizations::removeAuthorization)
+        return get(request, builder -> builder.pathSegment("oauth", "authorize").queryParam("response_type", ResponseType.CODE_AND_ID_TOKEN),
+            outbound -> {},
+            ReactorAuthorizations::removeAuthorization)
             .map(inbound -> inbound.responseHeaders().get(LOCATION))
             .checkpoint();
     }
@@ -120,8 +128,9 @@ public Mono<String> openIdWithTokenAndIdToken(AuthorizeByOpenIdWithImplicitGrant
             .checkpoint();
     }
 
-    private static void removeAuthorization(HttpHeaders httpHeaders) {
-        httpHeaders.remove(AUTHORIZATION);
+    private static Mono<HttpHeaders> removeAuthorization(HttpHeaders request) {
+        return Mono.just(request.remove(AUTHORIZATION));
     }
 
+
 }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/uaa/authorizations/ReactorAuthorizations.java

@@ -60,9 +60,13 @@ public Mono<Void> autoLogin(AutoLoginRequest request) {
     @Override
     public Mono<GetAutoLoginAuthenticationCodeResponse> getAuthenticationCode(GetAutoLoginAuthenticationCodeRequest request) {
         return post(request, GetAutoLoginAuthenticationCodeResponse.class, builder -> builder.pathSegment("autologin"),
+            outbound -> {
+            },
             outbound -> {
                 String encoded = Base64.getEncoder().encodeToString(new AsciiString(request.getClientId()).concat(":").concat(request.getClientSecret()).toByteArray());
                 outbound.set(AUTHORIZATION, BASIC_PREAMBLE + encoded);
+
+                return Mono.just(outbound);
             })
             .checkpoint();
     }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/uaa/serverinformation/ReactorServerInformation.java

@@ -41,7 +41,7 @@
 import static io.netty.handler.codec.http.HttpResponseStatus.FOUND;
 import static io.netty.handler.codec.http.HttpResponseStatus.OK;
 
-public final class ReactorInfoTest extends AbstractUaaApiTest {
+public final class ReactorServerInformationTest extends AbstractUaaApiTest {
 
     private final ReactorServerInformation info = new ReactorServerInformation(CONNECTION_CONTEXT, this.root, TOKEN_PROVIDER);
 

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/serverinformation/ReactorInfoTest.java renamed to cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/serverinformation/ReactorServerInformationTest.java

@@ -32,6 +32,7 @@
     <logger name="cloudfoundry-client.test"              level="${TEST_LOGGING_LEVEL:-INFO}"/>
     <logger name="cloudfoundry-client.token"             level="${CLIENT_LOGGING_LEVEL:-INFO}"/>
     <logger name="cloudfoundry-client.trust"             level="${CLIENT_LOGGING_LEVEL:-WARN}"/>
+    <logger name="cloudfoundry-client.wire"              level="${CLIENT_LOGGING_LEVEL:-INFO}"/>
     <logger name="example"                               level="DEBUG"/>
     <logger name="reactor.netty"                         level="INFO"/>
     <logger name="stream"                                level="INFO"/>