Revize 1c632f96

#10228 implementace komunikace s autentizacni aplikaci.

pom.xml

@@ -97 +97 @@
 			<version>${com.fasterxml.jackson.core.version}</version>
 		</dependency>
 
-
+	<!-- Security library -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
 
 
 		<!-- Junit libraries for unit tests-->

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/controller/UserController.java

@@ -50 +50 @@
         UserModelStatusCodes statusCode = userService.loginUser(user);
 
         String jwtToken = null;
-        if (statusCode.statusCode == 200)
-            jwtToken = "token";
+        if (statusCode.getStatusCode() == 200) {
+            jwtToken = response.getBody();
+        }
+
 
         return getResponseEntity(statusCode, jwtToken);
     }
@@ -76 +78 @@
      */
     private ResponseEntity<String> getResponseEntity(UserModelStatusCodes statusCode, String jwtToken) {
         String message = this.generateResponseObject(statusCode, jwtToken);
-        int code = statusCode.statusCode;
+        int code = statusCode.getStatusCode();
         return new ResponseEntity<>(message, HttpStatus.valueOf(code));
     }
 
@@ -88 +90 @@
      */
     private String generateResponseObject(UserModelStatusCodes code, String jwtToken) {
         HashMap<String, String> json = new HashMap<>();
-        json.put("msg", code.label);
+        json.put("message", code.getLabel());
         if (jwtToken != null) {
             json.put("jwtToken", jwtToken);
         }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/dials/UserModelStatusCodes.java

@@ -13 +13 @@
     USER_CREATION_FAILED("Error occurred while creating user",503),
     USER_LOGGED_OUT("User logged out.",200);
 
-    public final String label;
-    public final int statusCode;
+    private final String label;
+    private final int statusCode;
 
     UserModelStatusCodes(String s, int i) {
         this.label = s;
         this.statusCode = i;
     }
 
+    public int getStatusCode(){
+        return this.statusCode;
+    }
+    public String getLabel(){
+        return this.label;
+    }
+
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/UserService.java

@@ -28 +28 @@
      */
     public UserModelStatusCodes logoutUser(User user);
 
+    public User getUserByName(String name);
+
 
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/UserServiceImpl.java

@@ -124 +124 @@
         if (u == null) {
             return UserModelStatusCodes.USER_LOGIN_FAILED;
         }
-        //TODO request to OAuth for authentication
         final boolean passwordMatches = comparePassword(password,u.getPassword());
 
         return (!passwordMatches ? UserModelStatusCodes.USER_LOGIN_FAILED : UserModelStatusCodes.USER_LOGGED_IN);
@@ -151 +150 @@
         //TODO with OAuth app
         return UserModelStatusCodes.USER_LOGGED_OUT;
     }
+
+    @Override
+    public User getUserByName(String name) {
+        return this.userRepository.findByName(name);
+    }
+
+
 }

src/test/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/controller/UserControllerTest.java

@@ -99 +99 @@
 
     @Test
     public void loginValidUser() throws Exception {
-        Mockito.when(userService.loginUser(any())).thenReturn(UserModelStatusCodes.USER_LOGGED_IN);
+        Mockito.when(userService.verifyUser(any())).thenReturn(UserModelStatusCodes.USER_LOGGED_IN);
         HashMap<String,String> map = new HashMap<>();
         map.put("name","pepa");
         map.put("password","ahojSvete");
@@ -119 +119 @@
 
     @Test
     public void loginInValidUser() throws Exception {
-        Mockito.when(userService.loginUser(any())).thenReturn(UserModelStatusCodes.USER_LOGIN_FAILED);
+        Mockito.when(userService.verifyUser(any())).thenReturn(UserModelStatusCodes.USER_LOGIN_FAILED);
         HashMap<String,String> map = new HashMap<>();
         map.put("name","pepa");
         map.put("password","ahojSvete");

src/test/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/UserServiceImpTest.java

@@ -202 +202 @@
         Mockito.when(userRepository.findByName(mockUser.getName())).thenReturn(mockUser);
 
         String name = "test";
-        UserModelStatusCodes foundCode = userService.loginUser(new User(name, ""));
+        UserModelStatusCodes foundCode = userService.verifyUser(new User(name, ""));
 
         assertEquals(foundCode, UserModelStatusCodes.USER_LOGGED_IN);
     }
@@ -217 +217 @@
         //Mockito.when(userRepository.findByName(mockUser.getName())).thenReturn(mockUser);
 
         String name = "notest";
-        UserModelStatusCodes foundCode = userService.loginUser(new User(name, ""));
+        UserModelStatusCodes foundCode = userService.verifyUser(new User(name, ""));
 
         assertEquals(foundCode, UserModelStatusCodes.USER_LOGIN_FAILED);
     }