Merge branch '671-uaa-token-tests' into 2.x

Author: twoseat

integration-test/src/test/java/org/cloudfoundry/uaa/TokensTest.java

@@ -19,8 +19,10 @@
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.reactor.ConnectionContext;
 import org.cloudfoundry.reactor.TokenProvider;
+import org.cloudfoundry.uaa.authorizations.AuthorizeByAuthorizationCodeGrantApiRequest;
 import org.cloudfoundry.uaa.tokens.CheckTokenRequest;
 import org.cloudfoundry.uaa.tokens.GetTokenByAuthorizationCodeRequest;
+import org.cloudfoundry.uaa.tokens.GetTokenByAuthorizationCodeResponse;
 import org.cloudfoundry.uaa.tokens.GetTokenByClientCredentialsRequest;
 import org.cloudfoundry.uaa.tokens.GetTokenByClientCredentialsResponse;
 import org.cloudfoundry.uaa.tokens.GetTokenByOneTimePasscodeRequest;
@@ -33,6 +35,7 @@
 import org.cloudfoundry.uaa.tokens.GetTokenKeyResponse;
 import org.cloudfoundry.uaa.tokens.ListTokenKeysRequest;
 import org.cloudfoundry.uaa.tokens.RefreshTokenRequest;
+import org.cloudfoundry.uaa.tokens.RefreshTokenResponse;
 import org.cloudfoundry.uaa.tokens.TokenFormat;
 import org.cloudfoundry.uaa.tokens.TokenKey;
 import org.junit.Ignore;
@@ -43,7 +46,6 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -58,12 +60,18 @@ public final class TokensTest extends AbstractIntegrationTest {
     @Autowired
     private ConnectionContext connectionContext;
 
+    @Autowired
+    private String password;
+
     @Autowired
     private TokenProvider tokenProvider;
 
     @Autowired
     private UaaClient uaaClient;
 
+    @Autowired
+    private String username;
+
     @Test
     public void checkTokenNotAuthorized() {
         this.tokenProvider.getToken(this.connectionContext)
@@ -72,26 +80,25 @@ public void checkTokenNotAuthorized() {
                     .token(token)
                     .clientId(this.clientId)
                     .clientSecret(this.clientSecret)
-                    .scope("password.write")
-                    .scope("scim.userids")
+                    .scope("password.write", "scim.userids")
                     .build()))
             .as(StepVerifier::create)
             .consumeErrorWith(t -> assertThat(t).isInstanceOf(UaaException.class).hasMessage("access_denied: Access is denied"))
             .verify(Duration.ofMinutes(5));
     }
 
-    //TODO: Ready to Implement - use test authorizationCode
-    @Ignore("Ready to Implement - use test authorizationCode")
     @Test
     public void getTokenByAuthorizationCode() {
-        this.uaaClient.tokens()
-            .getByAuthorizationCode(GetTokenByAuthorizationCodeRequest.builder()
-                .authorizationCode("some auth code")
-                .clientId(this.clientId)
-                .clientSecret(this.clientSecret)
-                .build())
+        requestGetAuthorizationCode(this.uaaClient, this.clientId)
+            .then(authorizationCode -> this.uaaClient.tokens()
+                .getByAuthorizationCode(GetTokenByAuthorizationCodeRequest.builder()
+                    .authorizationCode(authorizationCode)
+                    .clientId(this.clientId)
+                    .clientSecret(this.clientSecret)
+                    .build()))
+            .map(GetTokenByAuthorizationCodeResponse::getTokenType)
             .as(StepVerifier::create)
-            .expectNextCount(1)
+            .expectNext("bearer")
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
@@ -111,52 +118,50 @@ public void getTokenByClientCredentials() {
             .verify(Duration.ofMinutes(5));
     }
 
-    //TODO: Ready to Implement - use test one-time passcode
-    @Ignore("Ready to Implement - use test one-time passcode")
+    //TODO: Ready to Implement - Await https://github.com/cloudfoundry/cf-java-client/issues/862 to get passcode
+    @Ignore("Ready to Implement - Await https://github.com/cloudfoundry/cf-java-client/issues/862 to get passcode")
     @Test
     public void getTokenByOneTimePasscode() {
         this.uaaClient.tokens()
             .getByOneTimePasscode(GetTokenByOneTimePasscodeRequest.builder()
-                .passcode("Some passcode")
+                .passcode("some passcode")
                 .clientId(this.clientId)
                 .clientSecret(this.clientSecret)
                 .tokenFormat(TokenFormat.OPAQUE)
                 .build())
-            .map(GetTokenByOneTimePasscodeResponse::getTokenType)
+            .map(GetTokenByOneTimePasscodeResponse::getAccessToken)
             .as(StepVerifier::create)
             .expectNext("bearer")
-            .expectComplete();
+            .expectComplete()
+            .verify(Duration.ofMinutes(5));
     }
 
-    //TODO: Ready to Implement - use test openid authorizationCode
-    @Ignore("Ready to Implement - use test openid authorizationCode")
     @Test
     public void getTokenByOpenId() {
-        this.uaaClient.tokens()
-            .getByOpenId(GetTokenByOpenIdRequest.builder()
-                .authorizationCode("Some authorization code")
-                .clientId(this.clientId)
-                .clientSecret(this.clientSecret)
-                .tokenFormat(TokenFormat.OPAQUE)
-                .build())
+        requestGetAuthorizationCode(this.uaaClient, this.clientId)
+            .then(authorizationCode -> this.uaaClient.tokens()
+                .getByOpenId(GetTokenByOpenIdRequest.builder()
+                    .authorizationCode(authorizationCode)
+                    .clientId(this.clientId)
+                    .clientSecret(this.clientSecret)
+                    .tokenFormat(TokenFormat.OPAQUE)
+                    .build()))
             .map(GetTokenByOpenIdResponse::getTokenType)
             .as(StepVerifier::create)
             .expectNext("bearer")
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
 
-    //TODO: Ready to Implement - use test username and password
-    @Ignore("Ready to Implement - use test username and password")
     @Test
     public void getTokenByPassword() {
         this.uaaClient.tokens()
             .getByPassword(GetTokenByPasswordRequest.builder()
-                .password("a-password")
-                .username("a-username")
                 .clientId(this.clientId)
                 .clientSecret(this.clientSecret)
+                .password(this.password)
                 .tokenFormat(TokenFormat.OPAQUE)
+                .username(this.username)
                 .build())
             .map(GetTokenByPasswordResponse::getTokenType)
             .as(StepVerifier::create)
@@ -199,21 +204,40 @@ public void listTokenKeys() {
             .verify(Duration.ofMinutes(5));
     }
 
-    //TODO: Ready to Implement - use test refresh token
-    @Ignore("Ready to Implement - use test refresh token")
     @Test
     public void refreshToken() {
-        this.uaaClient.tokens()
-            .refresh(RefreshTokenRequest.builder()
-                .tokenFormat(TokenFormat.OPAQUE)
-                .clientId(this.clientId)
-                .clientSecret(this.clientSecret)
-                .refreshToken("a-refresh-token")
-                .build())
+        getRequestToken(this.uaaClient, this.clientId, this.clientSecret, this.password, this.username)
+            .then(refreshToken -> this.uaaClient.tokens()
+                .refresh(RefreshTokenRequest.builder()
+                    .tokenFormat(TokenFormat.OPAQUE)
+                    .clientId(this.clientId)
+                    .clientSecret(this.clientSecret)
+                    .refreshToken(refreshToken)
+                    .build()))
+            .map(RefreshTokenResponse::getTokenType)
             .as(StepVerifier::create)
-            .expectNextCount(1)
+            .expectNext("bearer")
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }
 
+    private static Mono<String> getRequestToken(UaaClient uaaClient, String clientId, String clientSecret, String password, String username) {
+        return uaaClient.tokens()
+            .getByPassword(GetTokenByPasswordRequest.builder()
+                .clientId(clientId)
+                .clientSecret(clientSecret)
+                .password(password)
+                .tokenFormat(TokenFormat.OPAQUE)
+                .username(username)
+                .build())
+            .map(GetTokenByPasswordResponse::getRefreshToken);
+    }
+
+    private static Mono<String> requestGetAuthorizationCode(UaaClient uaaClient, String clientId) {
+        return uaaClient.authorizations()
+            .authorizationCodeGrantApi(AuthorizeByAuthorizationCodeGrantApiRequest.builder()
+                .clientId(clientId)
+                .build());
+    }
+
 }