Merge branch 'enable-tokens-tests'

Author: Paul Harris

cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/users/_Invite.java

@@ -52,12 +52,14 @@ abstract class _Invite {
      * The invite link
      */
     @JsonProperty("inviteLink")
+    @Nullable
     abstract String getInviteLink();
 
     /**
      * The origin
      */
     @JsonProperty("origin")
+    @Nullable
     abstract String getOrigin();
 
     /**
@@ -70,6 +72,7 @@ abstract class _Invite {
      * The user id
      */
     @JsonProperty("userId")
+    @Nullable
     abstract String getUserId();
 
 }

integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java

@@ -76,7 +76,10 @@ public class IntegrationTestConfiguration {
 
     private static final List<String> GROUPS = Arrays.asList(
         "cloud_controller.admin",
+        "scim.create",
+        "scim.invite",
         "scim.read",
+        "scim.userids",
         "scim.write",
         "zones.read",
         "zones.write");
@@ -85,7 +88,11 @@ public class IntegrationTestConfiguration {
         "cloud_controller.admin",
         "cloud_controller.read",
         "cloud_controller.write",
+        "password.write",
+        "scim.create",
+        "scim.invite",
         "scim.read",
+        "scim.userids",
         "scim.write",
         "uaa.user",
         "zones.read",

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

@@ -18,47 +18,61 @@
 
 import org.cloudfoundry.AbstractIntegrationTest;
 import org.cloudfoundry.uaa.users.ChangeUserPasswordRequest;
+import org.cloudfoundry.uaa.users.ChangeUserPasswordResponse;
 import org.cloudfoundry.uaa.users.CreateUserRequest;
 import org.cloudfoundry.uaa.users.CreateUserResponse;
 import org.cloudfoundry.uaa.users.DeleteUserRequest;
 import org.cloudfoundry.uaa.users.DeleteUserResponse;
 import org.cloudfoundry.uaa.users.Email;
 import org.cloudfoundry.uaa.users.GetUserVerificationLinkRequest;
+import org.cloudfoundry.uaa.users.GetUserVerificationLinkResponse;
+import org.cloudfoundry.uaa.users.Invite;
 import org.cloudfoundry.uaa.users.InviteUsersRequest;
+import org.cloudfoundry.uaa.users.InviteUsersResponse;
 import org.cloudfoundry.uaa.users.ListUsersRequest;
 import org.cloudfoundry.uaa.users.ListUsersResponse;
 import org.cloudfoundry.uaa.users.LookupUserIdsRequest;
+import org.cloudfoundry.uaa.users.LookupUserIdsResponse;
 import org.cloudfoundry.uaa.users.Name;
 import org.cloudfoundry.uaa.users.UpdateUserRequest;
 import org.cloudfoundry.uaa.users.User;
+import org.cloudfoundry.uaa.users.UserId;
 import org.cloudfoundry.uaa.users.VerifyUserRequest;
 import org.cloudfoundry.uaa.users.VerifyUserResponse;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public final class UsersTest extends AbstractIntegrationTest {
 
+    @Autowired
+    private String password;
+
     @Autowired
     private UaaClient uaaClient;
 
-    @Ignore("TODO: finish story https://www.pivotaltracker.com/projects/816799/stories/122457091 to grant password.write scope")
+    @Autowired
+    private String username;
+
     @Test
     public void changePassword() {
-        String userName = getUserName();
 
-        createUserId(this.uaaClient, userName)
+        getUserIdByUsername(this.uaaClient, this.username)
             .then(userId -> this.uaaClient.users()
                 .changePassword(ChangeUserPasswordRequest.builder()
-                    .oldPassword("test-password")
+                    .oldPassword(this.password)
                     .password("test-new-password")
                     .userId(userId)
                     .build()))
-            .subscribe(this.testSubscriber());
+            .subscribe(this.<ChangeUserPasswordResponse>testSubscriber()
+                .assertThat(response -> {
+                    assertEquals("password updated", response.getMessage());
+                    assertEquals("ok", response.getStatus());
+                }));
     }
 
     @Test
@@ -102,7 +116,6 @@ public void delete() {
                 .assertEquals(0));
     }
 
-    @Ignore("TODO: finish story https://www.pivotaltracker.com/projects/816799/stories/122457091 to grant scim.create, zones.uaa.admin scopes")
     @Test
     public void getVerificationLink() {
         String userName = getUserName();
@@ -113,18 +126,25 @@ public void getVerificationLink() {
                     .redirectUri("test-redirect-uri")
                     .userId(userId)
                     .build()))
-            .subscribe(this.testSubscriber());
+            .map(GetUserVerificationLinkResponse::getVerifyLink)
+            .subscribe(this.<String>testSubscriber()
+                .assertThat(location -> assertTrue(location.contains("/verify_user?code="))));
     }
 
-    @Ignore("TODO: finish story https://www.pivotaltracker.com/projects/816799/stories/122457091 to grant scim.invite scope")
     @Test
     public void invite() {
         this.uaaClient.users()
             .invite(InviteUsersRequest.builder()
                 .email("test-email-address")
                 .redirectUri("test-redirect-uri")
                 .build())
-            .subscribe(this.testSubscriber());
+            .flatMapIterable(InviteUsersResponse::getFailedInvites)
+            .single()
+            .subscribe(this.<Invite>testSubscriber()
+                .assertThat(invite -> {
+                    assertEquals("test-email-address", invite.getEmail());
+                    assertEquals("provider.ambiguous", invite.getErrorCode());
+                }));
     }
 
     @Test
@@ -136,14 +156,12 @@ public void list() {
                 .list(ListUsersRequest.builder()
                     .filter(String.format("id eq \"%s\"", userId))
                     .build()))
-            .map(ListUsersResponse::getResources)
-            .flatMap(Flux::fromIterable)
+            .flatMapIterable(ListUsersResponse::getResources)
             .map(User::getUserName)
             .subscribe(this.testSubscriber()
                 .assertEquals(userName));
     }
 
-    @Ignore("TODO: finish story https://www.pivotaltracker.com/projects/816799/stories/122457091 to grant scim.userids scope")
     @Test
     public void lookup() {
         String userName = getUserName();
@@ -153,7 +171,10 @@ public void lookup() {
                 .lookup(LookupUserIdsRequest.builder()
                     .filter(String.format("id eq \"%s\"", userId))
                     .build()))
-            .subscribe(this.testSubscriber());
+            .flatMapIterable(LookupUserIdsResponse::getResources)
+            .map(UserId::getUserName)
+            .subscribe(this.testSubscriber()
+                .assertEquals(userName));
     }
 
     @Test
@@ -200,6 +221,13 @@ private static Mono<String> createUserId(UaaClient uaaClient, String userName) {
             .map(CreateUserResponse::getId);
     }
 
+    private static Mono<String> getUserIdByUsername(UaaClient uaaClient, String username) {
+        return requestLookupByUsername(uaaClient, username)
+            .flatMapIterable(LookupUserIdsResponse::getResources)
+            .map(UserId::getId)
+            .single();
+    }
+
     private static Mono<CreateUserResponse> requestCreateUser(UaaClient uaaClient, String userName) {
         return uaaClient.users()
             .create(CreateUserRequest.builder()
@@ -212,6 +240,7 @@ private static Mono<CreateUserResponse> requestCreateUser(UaaClient uaaClient, S
                     .givenName("test-given-name")
                     .build())
                 .password("test-password")
+                .verified(false)
                 .userName(userName)
                 .build());
     }
@@ -223,4 +252,11 @@ private static Mono<ListUsersResponse> requestListUsers(UaaClient uaaClient, Str
                 .build());
     }
 
+    private static Mono<LookupUserIdsResponse> requestLookupByUsername(UaaClient uaaClient, String username) {
+        return uaaClient.users()
+            .lookup(LookupUserIdsRequest.builder()
+                .filter(String.format("userName eq \"%s\"", username))
+                .build());
+    }
+
 }