Merge pull request #52 from Arquisoft/development

update stable version : update of last stable changes

Author: thewillyhuman

.gitignore

@@ -82,4 +82,6 @@ local.properties
 
 .idea/
 participants0.iml
-participants_i2b.iml
+participants_i2b.iml
+/.gradle/
+/build/

README.md

@@ -33,15 +33,15 @@ Contributions to the project are welcomed and encouraged! Please see the [Contri
 These instructions give the most direct path to work with the project.
 
 ### System Requirements
-As the project is developed in java macOS, Windows and Linux distros are natively supported. Of course you will need the lastest jdk available. Also, depending on where are you going to run the database will need internet conection or MongoDB installed and running on your machine.
+As the project is developed in java macOS, Windows and Linux distributions are natively supported. Of course you will need the latest JDK available. Also, depending on where are you going to run the database, you will need internet connection or MongoDB installed and running on your machine.
 
 #### Java Development Kit (JDK)
-A Java Development Kit (JDK) is a program development environment for writing Java applets and applications. It consists of a runtime environment that "sits on top" of the operating system layer as well as the tools and programming that developers need to compile, debug, and run applets and applications written in the Java language.
+A Java Development Kit (JDK) is a program development environment for writing Java applets and applications. It consists of a runtime environment that "sits on top" of the operating system layer as well as the tools and programming that developers need to compile, debug, and run applets and applications written in the Java programming language.
 
-If you do not has the lastest stable version download you can download it [here](http://www.oracle.com/technetwork/java/javase/downloads).
+If you do not has the latest stable version download you can download it [here](http://www.oracle.com/technetwork/java/javase/downloads).
 
 #### MongoDB
-This project uses MongoDB as the database. You can check how to use it on [MongoDB install](https://github.com/Arquisoft/participants_i2b/wiki/MongoDB). By defatult a dummy server is up and running, its configured at the file `applications.properties`. Change this configuration as needed, should not interfeer with the module itself.
+This project uses MongoDB as the database. You can check how to use it on [MongoDB install](https://github.com/Arquisoft/participants_i2b/wiki/MongoDB). By defatult a dummy server is up and running, it´s configured at the file `applications.properties`. Change this configuration as needed, should not interfeer with the module itself.
 
 #### Jasypt
 This project uses Jasypt to encrypt the passwords. You don't need to download it as far as its dependency its imported from maven central, but you can check it [here](http://www.jasypt.org/).
@@ -95,15 +95,23 @@ user interface manually you'll have to introduce this document:
     "location" : "10N10W",
     "email" : "[email protected]",
     "kindCode" : "1",
-    "id" : "00000000A",
+    "id" : "45170000A",
     "password" : "khZZwjdhWwVbMdmOvz9eqBfKR1N6A+CdFBDM9c1dQduUnGewQyPRlBxB4Q6wT7Cq"
 }
 ```
 
 And as data use:
- - login: 00000000A
+ - login: 45170000A
  - password: 4[[j[frVCUMJ>hU
  - Kind of agent: Person
 
  If you have the data and the database running and the application still reports a 404 Not Found when it shouldn't
  try deleting the document and adding it again.
+
+As an alternative, you can perform tests on the REST service by executing the next function in the command line:
+
+```bash
+curl -H "Content-Type: application/json" -X POST -d '{"login":"45170000A","password":"4[[j[frVCUMJ>hU", "kind":1}' http://localhost:8080/user
+```
+
+ Take into account that the parameters passed in the function are the same as the previous JSON file, so they have to be synchronised.

pom.xml

@@ -4,6 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>es.uniovi.asw</groupId>
+	<artifactId>agents_i3a</artifactId>
 	<name>agents_i3a</name>
 	<version>0.0.1</version>
 
@@ -12,31 +13,31 @@
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>1.4.3.RELEASE</version>
 	</parent>
-	
+
 	<dependencies>
 		<dependency>
-	    		<groupId>com.github.computer-engineering-uniovi</groupId>
-	    		<artifactId>swift</artifactId>
-	    		<version>1.1</version>
+			<groupId>com.github.computer-engineering-uniovi</groupId>
+			<artifactId>swift</artifactId>
+			<version>1.1</version>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		
+
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
-		  <groupId>org.springframework.test.htmlunit</groupId>
-		  <artifactId>spring-test-htmlunit</artifactId>
-		  <version>1.0.0.RC1</version>
-		  <scope>test</scope>
+			<groupId>org.springframework.test.htmlunit</groupId>
+			<artifactId>spring-test-htmlunit</artifactId>
+			<version>1.0.0.RC1</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
@@ -59,52 +60,52 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-test</artifactId>
 		</dependency>
-		
+
 		<!-- Jasypt Depencency -->
 		<dependency>
-  			<groupId>org.jasypt</groupId>
-   			<artifactId>jasypt</artifactId>
-   			<version>1.9.2</version>
-  		</dependency>
+			<groupId>org.jasypt</groupId>
+			<artifactId>jasypt</artifactId>
+			<version>1.9.2</version>
+		</dependency>
 
 		<!-- MongoDB Dependency -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-mongodb</artifactId>
 		</dependency>
 
-        <dependency>
-            <groupId>org.glassfish.jersey.ext</groupId>
-            <artifactId>jersey-spring3</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.ext</groupId>
+			<artifactId>jersey-spring3</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-web</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-beans</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-context</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
 		<!-- Apache commons-csv -->
 		<dependency>
-		    <groupId>org.apache.commons</groupId>
-		    <artifactId>commons-csv</artifactId>
-		    <version>1.5</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-csv</artifactId>
+			<version>1.5</version>
 		</dependency>
 
 
@@ -143,7 +144,7 @@
 				</executions>
 			</plugin>
 		</plugins>
-		
+
 	</build>
 
 	<reporting>
@@ -200,8 +201,8 @@
 			<url>https://repo.spring.io/libs-release</url>
 		</repository>
 		<repository>
-		    <id>jitpack.io</id>
-		    <url>https://jitpack.io</url>
+			<id>jitpack.io</id>
+			<url>https://jitpack.io</url>
 		</repository>
 	</repositories>
 
@@ -212,5 +213,5 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-	<artifactId>agents_i3a</artifactId>
+	
 </project>

src/main/java/domain/Agent.java

@@ -16,6 +16,10 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 import Foundation.CSVFile;
 import Foundation.URL;
 
@@ -26,6 +30,7 @@
  * @since 06/02/2017
  */
 @Document(collection = "users")
+@JsonPropertyOrder({ "name", "location", "email", "id", "kind", "kindCode" })
 public class Agent implements Comparable<Agent> {
 
     @Id
@@ -108,6 +113,8 @@ public String getEmail() {
     /**
      * @return the password of the user.
      */
+    @JsonIgnore
+    @JsonProperty(value = "user_password")
     public String getPassword() {
 	return password;
     }

src/main/java/view/ParticipantsController.java

@@ -10,17 +10,12 @@
  * 
  */
 package view;
-
-import javax.servlet.http.HttpSession;
-
-import org.jasypt.util.password.StrongPasswordEncryptor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import domain.Agent;
 import domain.AgentLoginData;
@@ -52,7 +47,7 @@ public String getParticipantInfo(Model model) {
     // This method process an POST html request once fulfilled the login.html form
     // (clicking in the "Enter" button).
     @RequestMapping(value = "/userForm", method = RequestMethod.POST)
-    public String showInfo(Model model, @ModelAttribute AgentLoginData data, HttpSession session) {
+    public String showInfo(Model model, @ModelAttribute AgentLoginData data) {
 	Agent user = participantsService.getParticipant(data.getLogin(), data.getPassword(), data.getKind());
 	if (user == null) {
 	    throw new UserNotFoundException();
@@ -64,30 +59,7 @@ public String showInfo(Model model, @ModelAttribute AgentLoginData data, HttpSes
 	    model.addAttribute("id", user.getId());
 	    model.addAttribute("kindCode", user.getKindCode());
 	    model.addAttribute("user", user);
-	    session.setAttribute("user", user);
 	    return "data";
 	}
     }
-
-    @RequestMapping(value = "/passMenu", method = RequestMethod.GET)
-    public String showMenu(Model model) {
-	// Just in case there must be more processing.
-	return "changePassword";
-    }
-
-    @RequestMapping(value = "/userChangePassword", method = RequestMethod.POST)
-    public String changePassword(Model model, @RequestParam String password, @RequestParam String newPassword,
-	    @RequestParam String newPasswordConfirm, HttpSession session) {
-	
-	Agent loggedUser = (Agent) session.getAttribute("user");
-	
-	if (new StrongPasswordEncryptor().checkPassword(password, loggedUser.getPassword())
-		&& newPassword.equals(newPasswordConfirm)) {
-	    
-	    participantsService.updateInfo(loggedUser, newPassword);
-	    return "data";
-	}
-	return "changePassword";
-    }
-
 }

src/main/resources/templates/data.html

@@ -25,7 +25,7 @@
   <div class="container-fluid well span6">
 
     <div class="col-md-6">
-      <strong>Account information</strong>
+      <h1><strong>Account information</strong></h1>
       <div class="table-responsive">
         <table class="table table-condensed table-responsive table-user-information">
           <tbody>
@@ -80,11 +80,12 @@
                 <span th:text="${kind}" />
               </td>
             </tr>
+            <tr><td></td><td></td></tr>
           </tbody>
         </table>
       </div>
     </div>
-    <a class="btn btn-primary glyphicon glyphicon-cog " href="/passMenu">Change password</a>
+    <!-- <a class="btn btn-primary glyphicon glyphicon-cog " href="/passMenu">Change password</a> -->
   </div>
 
 

src/test/java/domainTests/AgentTest.java

@@ -18,7 +18,6 @@
 import org.jasypt.util.password.StrongPasswordEncryptor;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter.DataWithMediaType;
 
 import Foundation.CSVFile;
 import Foundation.URL;

src/test/java/viewTests/ParticipantsDataControllerTest.java

@@ -143,33 +143,4 @@ public void testForIncorrectPassword() throws Exception {
 		.content(payload.getBytes());
 	mockMvc.perform(request).andDo(print()).andExpect(status().isNotFound());
     }
-
-    @Test
-    public void testChangePassword() throws Exception {
-	MockHttpSession session = new MockHttpSession();
-
-	// We check we have the proper credentials
-	MockHttpServletRequestBuilder request = post("/userForm").session(session).param("login", maria.getId())
-		.param("password", plainPassword).param("kind", Integer.toString(maria.getKindCode()));
-	mockMvc.perform(request).andExpect(status().isOk());
-
-	// We change it
-	request = post("/userChangePassword").session(session).param("password", plainPassword)
-		.param("newPassword", "HOLA").param("newPasswordConfirm", "HOLA");
-	mockMvc.perform(request).andExpect(status().isOk());
-
-	String payload = String.format(QUERY_STRING, maria.getId(), "HOLA", maria.getKindCode());
-
-	// We check password has changed
-	request = post("/user").session(session).contentType(MediaType.APPLICATION_JSON).content(payload.getBytes());
-	mockMvc.perform(request).andDo(print()).andExpect(status().isOk())
-		.andExpect(jsonPath("$.name", is(maria.getName())))
-		.andExpect(jsonPath("$.location", is(maria.getLocation())))
-		.andExpect(jsonPath("$.email", is(maria.getEmail())))
-		.andExpect(jsonPath("$.id", is(maria.getId())))
-		.andExpect(jsonPath("$.kind", is(maria.getKind())))
-		.andExpect(jsonPath("$.kindCode", is(maria.getKindCode())));
-
-    }
-
 }