Merge branch 'master' into issue-410

Author: seratch

json-logs/samples/scim/v1/Groups.json

@@ -1,10 +1,22 @@
 {
-  "totalResults": 12345,
-  "itemsPerPage": 12345,
-  "startIndex": 12345,
   "schemas": [
     ""
   ],
+  "id": "S00000000",
+  "displayName": "",
+  "members": [
+    {
+      "value": "W00000000",
+      "display": ""
+    }
+  ],
+  "meta": {
+    "created": "",
+    "location": "https://www.example.com/"
+  },
+  "totalResults": 12345,
+  "itemsPerPage": 12345,
+  "startIndex": 12345,
   "Resources": [
     {
       "schemas": [
@@ -57,9 +69,5 @@
         "location": "https://www.example.com/"
       }
     }
-  ],
-  "Errors": {
-    "description": "",
-    "code": 12345
-  }
+  ]
 }

json-logs/samples/scim/v1/Users.json

@@ -1,10 +1,42 @@
 {
-  "totalResults": 12345,
-  "itemsPerPage": 12345,
-  "startIndex": 12345,
   "schemas": [
     ""
   ],
+  "id": "W00000000",
+  "externalId": "",
+  "meta": {
+    "created": "",
+    "location": "https://www.example.com/"
+  },
+  "userName": "",
+  "nickName": "",
+  "name": {
+    "givenName": "",
+    "familyName": ""
+  },
+  "displayName": "",
+  "profileUrl": "https://www.example.com/",
+  "title": "",
+  "timezone": "",
+  "active": false,
+  "emails": [
+    {
+      "value": "",
+      "primary": false
+    }
+  ],
+  "photos": [
+    {
+      "value": "https://www.example.com/",
+      "type": ""
+    }
+  ],
+  "groups": [
+    ""
+  ],
+  "totalResults": 12345,
+  "itemsPerPage": 12345,
+  "startIndex": 12345,
   "Resources": [
     {
       "schemas": [
@@ -42,16 +74,8 @@
       ],
       "groups": [
         {
-          "schemas": [
-            "urn:scim:schemas:core:1.0",
-            "urn:scim:schemas:extension:enterprise:1.0"
-          ],
-          "id": "",
-          "displayName": "",
-          "meta": {
-            "created": "",
-            "location": ""
-          }
+          "value": "",
+          "display": ""
         }
       ],
       "addresses": [
@@ -82,41 +106,5 @@
         "manager": {}
       }
     }
-  ],
-  "Errors": {
-    "description": "",
-    "code": 12345
-  },
-  "id": "W00000000",
-  "externalId": "",
-  "meta": {
-    "created": "",
-    "location": "https://www.example.com/"
-  },
-  "userName": "",
-  "nickName": "",
-  "name": {
-    "givenName": "",
-    "familyName": ""
-  },
-  "displayName": "",
-  "profileUrl": "https://www.example.com/",
-  "title": "",
-  "timezone": "",
-  "active": false,
-  "emails": [
-    {
-      "value": "",
-      "primary": false
-    }
-  ],
-  "photos": [
-    {
-      "value": "https://www.example.com/",
-      "type": ""
-    }
-  ],
-  "groups": [
-    ""
   ]
 }

json-logs/samples/scim/v1/Users/00000000000.json

@@ -34,16 +34,8 @@
   ],
   "groups": [
     {
-      "schemas": [
-        "urn:scim:schemas:core:1.0",
-        "urn:scim:schemas:extension:enterprise:1.0"
-      ],
-      "id": "",
-      "displayName": "",
-      "meta": {
-        "created": "",
-        "location": ""
-      }
+      "value": "",
+      "display": ""
     }
   ],
   "addresses": [

slack-api-client/src/main/java/com/slack/api/scim/model/Group.java

@@ -24,5 +24,6 @@ public static class Meta {
     @Data
     public static class Member {
         private String value;
+        private String display;
     }
 }

slack-api-client/src/main/java/com/slack/api/scim/model/User.java

@@ -105,4 +105,10 @@ public static class Manager {
         }
     }
 
+    @Data
+    public static class Group {
+        private String value;
+        private String display;
+    }
+
 }

slack-api-client/src/test/java/test_with_remote_apis/scim/ApiTest.java

@@ -30,6 +30,19 @@ public static void tearDown() throws InterruptedException {
 
     String orgAdminToken = System.getenv(Constants.SLACK_SDK_TEST_GRID_ORG_ADMIN_USER_TOKEN);
 
+    private UsersCreateResponse createNewUser() throws IOException, SCIMApiException {
+        String userName = "user" + System.currentTimeMillis();
+        User newUser = new User();
+        newUser.setName(new User.Name());
+        newUser.getName().setGivenName("Kazuhiro");
+        newUser.getName().setFamilyName("Sera");
+        newUser.setUserName(userName);
+        User.Email email = new User.Email();
+        email.setValue("seratch+" + System.currentTimeMillis() + "@gmail.com");
+        newUser.setEmails(Arrays.asList(email));
+        return slack.scim(orgAdminToken).createUser(req -> req.user(newUser));
+    }
+
     @Test
     public void getServiceProviderConfigs() throws IOException, SCIMApiException {
         if (orgAdminToken != null) {
@@ -90,16 +103,7 @@ public void readUser_dummy() throws IOException {
     @Test
     public void createAndDeleteUser() throws Exception {
         if (orgAdminToken != null) {
-            String userName = "user" + System.currentTimeMillis();
-            User newUser = new User();
-            newUser.setName(new User.Name());
-            newUser.getName().setGivenName("Kazuhiro");
-            newUser.getName().setFamilyName("Sera");
-            newUser.setUserName(userName);
-            User.Email email = new User.Email();
-            email.setValue("seratch+" + System.currentTimeMillis() + "@gmail.com");
-            newUser.setEmails(Arrays.asList(email));
-            UsersCreateResponse creation = slack.scim(orgAdminToken).createUser(req -> req.user(newUser));
+            UsersCreateResponse creation = createNewUser();
             assertThat(creation.getId(), is(notNullValue()));
 
             UsersReadResponse readResp = slack.scim(orgAdminToken).readUser(req -> req.id(creation.getId()));
@@ -109,6 +113,7 @@ public void createAndDeleteUser() throws Exception {
             try {
                 // https://api.slack.com/scim#filter
                 // filter query matching the created data
+                String userName = creation.getUserName();
                 UsersSearchResponse searchResp = slack.scim(orgAdminToken).searchUsers(req -> req.count(1).filter("userName eq \"" + userName + "\""));
                 assertThat(searchResp.getItemsPerPage(), is(1));
                 assertThat(searchResp.getResources().size(), is(1));
@@ -167,7 +172,15 @@ public void groups() throws IOException, SCIMApiException {
             if (groups.getResources().size() == 0) {
                 Group newGroup = new Group();
                 newGroup.setDisplayName("Test Group" + System.currentTimeMillis());
-                slack.scim(orgAdminToken).createGroup(req -> req.group(newGroup));
+
+                Group.Member member = new Group.Member();
+                UsersCreateResponse newUser = createNewUser();
+                assertThat(newUser.getId(), is(notNullValue()));
+                member.setValue(newUser.getId());
+                newGroup.setMembers(Arrays.asList(member));
+
+                GroupsCreateResponse createdGroup = slack.scim(orgAdminToken).createGroup(req -> req.group(newGroup));
+                assertThat(createdGroup.getMembers().size(), is(1));
             }
 
             // pagination
@@ -192,6 +205,35 @@ public void groups() throws IOException, SCIMApiException {
         }
     }
 
+    @Test
+    public void groupAndUsers() throws IOException, SCIMApiException {
+        if (orgAdminToken != null) {
+            Group newGroup = new Group();
+            newGroup.setDisplayName("Test Group" + System.currentTimeMillis());
+            UsersCreateResponse newUser = createNewUser();
+            assertThat(newUser.getId(), is(notNullValue()));
+            try {
+                Group.Member member = new Group.Member();
+                member.setValue(newUser.getId());
+                newGroup.setMembers(Arrays.asList(member));
+                GroupsCreateResponse createdGroup = slack.scim(orgAdminToken).createGroup(req -> req.group(newGroup));
+                assertThat(createdGroup.getMembers().size(), is(1));
+                try {
+                    String userName = newUser.getUserName();
+                    UsersSearchResponse searchResp = slack.scim(orgAdminToken).searchUsers(req -> req.count(1).filter("userName eq \"" + userName + "\""));
+                    assertThat(searchResp.getResources().size(), is(1));
+                    assertThat(searchResp.getResources().get(0).getGroups().size(), is(1));
+                } finally {
+                    GroupsDeleteResponse groupDeletion = slack.scim(orgAdminToken).deleteGroup(req -> req.id(createdGroup.getId()));
+                    assertThat(groupDeletion, is(nullValue()));
+                }
+            } finally {
+                UsersDeleteResponse deletion = slack.scim(orgAdminToken).deleteUser(req -> req.id(newUser.getId()));
+                assertThat(deletion, is(nullValue()));
+            }
+        }
+    }
+
     @Test
     public void groups_dummy() throws IOException {
         try {

slack-api-client/src/test/java/util/sample_json_generation/JsonDataRecorder.java

@@ -197,14 +197,12 @@ private void initializeSCIMUser(JsonObject resourceObj) {
             User.Role sampleObject = ObjectInitializer.initProperties(new User.Role());
             objects.add(GsonFactory.createCamelCase(config).toJsonTree(sampleObject));
         }
-        if (resourceObj.get("groups") == null) {
-            resourceObj.add("groups", new JsonArray());
-        }
-        {
-            JsonArray objects = resourceObj.get("groups").getAsJsonArray();
-            clearAllElements(objects);
-            Group sampleObject = ObjectInitializer.initProperties(new Group());
-            objects.add(GsonFactory.createCamelCase(config).toJsonTree(sampleObject));
+        if (resourceObj.get("groups") != null) {
+            JsonArray groups = new JsonArray();
+            User.Group group = new User.Group();
+            ObjectInitializer.initProperties(group);
+            groups.add(GsonFactory.createCamelCase(config).toJsonTree(group));
+            resourceObj.add("groups", groups);
         }
     }