identity webapp

pom.xml

@@ -12,7 +12,7 @@
 	<description>RESThub identity management in order to allow you to build quickly identity functionnalities on your applications</description>
 
 	<properties>
-		<resthub.spring.stack.version>2.0-rc3</resthub.spring.stack.version>
+		<resthub.spring.stack.version>2.0.0</resthub.spring.stack.version>
 		<spring.security.version>3.1.3.RELEASE</spring.security.version>
 		<elasticsearch.spring.integration.version>0.0.2</elasticsearch.spring.integration.version>
 		<elasticsearch.version>0.20.0.RC1</elasticsearch.version>

resthub-identity-contract/src/main/java/org/resthub/identity/model/AbstractPermissionsOwner.java

@@ -17,8 +17,9 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 /**
@@ -121,6 +122,7 @@ public List<Role> getRoles() {
      * <b>Only used by Hibernate</b> Please use getRoles() instead.
      */
     @SuppressWarnings("unused")
+    @JsonProperty
     private void setRoles(List<Role> roles) {
         this.roles = roles;
     }
@@ -143,6 +145,7 @@ public List<Group> getGroups() {
      * <b>Only used by Hibernate</b> Please use getGroups() instead.
      */
     @SuppressWarnings("unused")
+    @JsonProperty
     private void setGroups(List<Group> groups) {
         this.groups = groups;
     }

resthub-identity-contract/src/main/java/org/resthub/identity/model/Role.java

@@ -36,6 +36,7 @@ public Role(String roleName) {
         this.setName(roleName);
     }
 
+
     @Id
     @GeneratedValue
     public Long getId() {

resthub-identity-core/src/main/java/org/resthub/identity/controller/GroupController.java

@@ -76,6 +76,7 @@ public Group create(@RequestBody Group group) {
     		throw new ExpectationFailedException(e.getMessage());
     	}
     }
+
 
     /** Override this methods in order to secure it **/
 
@@ -89,6 +90,7 @@ public Group update(@PathVariable("id") Long id, @RequestBody Group group) {
     	}
     }
 
+
     /** Override this methods in order to secure it **/
     @Secured({ "IM_GROUP_ADMIN", "IM_GROUP_READ" }) @Override
     public Iterable<Group> findAll() {

resthub-identity-core/src/main/java/org/resthub/identity/controller/UserController.java

@@ -62,6 +62,32 @@ public User update(@PathVariable("id") Long id, @RequestBody User user) {
     		throw new ExpectationFailedException(e.getMessage());
     	}
     }
+
+
+
+    @Secured({ "IM_USER_ADMIN" }) @RequestMapping(method = RequestMethod.DELETE, value = "name/{name}/roles") @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void removeAllRoleFromUser(@PathVariable("login") String login) {
+    	 List<Role> roles = this.service.getAllUserRoles(login);
+         if (roles == null) {
+             throw new NotFoundException();
+         }
+        for (Role r : roles){
+        	this.service.removeRoleFromUser(login, r.getName());
+        }
+
+    }
+
+    @Secured({ "IM_USER_ADMIN" }) @RequestMapping(method = RequestMethod.DELETE, value = "name/{name}/groups") @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void removeAllGroupFromUser(@PathVariable("login") String login) {
+    	 List<Group> groups = this.service.getAllUserGroups(login);
+         if (groups == null) {
+             throw new NotFoundException();
+         }
+        for (Group grp : groups){
+        	this.service.removeGroupFromUser(login, grp.getName());
+        }
+
+    }
 
     /** Override this methods in order to secure it **/
     @Secured({ "IM_USER_ADMIN", "IM_USER_READ" }) @Override

resthub-identity-core/src/main/resources/applicationContext.xml

@@ -36,9 +36,11 @@
 	<bean id="passwordEncoder"
 		class="org.springframework.security.authentication.encoding.ShaPasswordEncoder" />
 
+	<!-- Node for Embedded ES -->
 	<bean id="esNode"
 		class="fr.pilato.spring.elasticsearch.ElasticsearchNodeFactoryBean">
 	</bean>
+
 	<!-- Client for Embedded ES -->
     <bean id="esClient" class="fr.pilato.spring.elasticsearch.ElasticsearchClientFactoryBean"/> 
 

resthub-identity-core/src/test/java/org/resthub/identity/controller/GroupControllerWebTest.java

@@ -3,6 +3,7 @@
 
 import org.fest.assertions.api.Assertions;
 import org.resthub.identity.model.Group;
+import org.resthub.identity.model.Role;
 import org.resthub.identity.model.User;
 import org.resthub.test.AbstractWebTest;
 import org.resthub.web.JsonHelper;
@@ -56,7 +57,6 @@ protected Group udpateTestResource(Group r) {
         return r;
     }
 
-    // TODO : this test doesn't work
     @Test
     public void testShouldGetUsersFromGroup() {
 
@@ -91,4 +91,31 @@ public void testShouldGetUsersFromGroup() {
         Assertions.assertThat(usersFromGroup.contains(u.getLogin())).as("The list of users should contain our just added user").isTrue();
 
     }
+
+    @Test
+    public void deleteGroupWithRole() {
+
+    	/* Given a new group */
+        String groupName = "testGroup";
+        Group g = new Group();
+        g.setName(groupName);
+
+        Response response = this.request("api/group").jsonPost(g);
+        g = JsonHelper.deserialize(response.getBody(), Group.class);
+
+        /* Given a new user */
+        String roleName = "roleTest";
+
+        Role r = new Role(roleName);
+        response = this.request("api/role").jsonPost(r);
+        r = JsonHelper.deserialize(response.getBody(), Role.class);
+
+        /* Given a link between this user and the group */
+        this.request("api/group/name/" + groupName + "/roles/" + r.getName()).put("");
+
+        /* When I get the users of the group */
+        this.request("api/group/" + g.getId()).delete();
+
+
+    }
 }

resthub-identity-core/src/test/resources/es.properties

@@ -9,13 +9,6 @@ discovery.zen.ping.multicast.enabled=false
 node.local=true
 
 
-
-# Using less filesystem as possible
-index.store.type=memory
-index.store.fs.memory.enabled=true
-index.gateway.type=none
-gateway.type=none
-
 # If ES needs to write something, it's here
 path.data=D:/es/data