Merge pull request #20 from Pardus-LiderAhenk/development

password set as null
Pardus-LiderAhenk · Sep 28, 2023 · d24b6c9 · d24b6c9
2 parents dd3ef9e + 5a3ff1e
commit d24b6c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/main/java/tr/org/lider/controllers/ServerController.java b/src/main/java/tr/org/lider/controllers/ServerController.java
@@ -142,10 +142,15 @@ public ResponseEntity<Boolean> isServerReachable(
     public  ResponseEntity<List<ServerImpl>> getServerList() throws Throwable {
 
 		HttpHeaders headers = new HttpHeaders();
+		List<ServerImpl> serverList = serverService.serverList();
+
+		for (ServerImpl server : serverList) {
+	        server.setPassword(null);
+	    }
 		try {
 			return ResponseEntity
 				.status(HttpStatus.OK)
-				.body(serverService.serverList());
+				.body(serverList);
 		}
 		catch (Exception e) {
 
@@ -253,10 +258,13 @@ public ResponseEntity<ServerImpl> updateServer(@RequestBody ServerImpl server) t
 	@GetMapping(value = "/get-data", produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<ServerImpl>> getServerData() {
 		try {
-
+			List<ServerImpl> serverList = serverService.findServerAll();
+			for (ServerImpl server : serverList) {
+		        server.setPassword(null);
+		    }
 			return ResponseEntity
 					.status(HttpStatus.OK)
-					.body(serverService.findServerAll());
+					.body(serverList);
 		} 
 		catch (DataAccessException e) {
 			logger.error("Error updated server: " + e.getCause().getMessage());
@@ -266,7 +274,6 @@ public ResponseEntity<List<ServerImpl>> getServerData() {
     				.headers(headers)
     				.build();
 		}		
-
 	}
 
 }	
diff --git a/src/main/java/tr/org/lider/services/ServerService.java b/src/main/java/tr/org/lider/services/ServerService.java
@@ -214,8 +214,10 @@ public ServerImpl update(ServerImpl server) throws Exception {
 			existServer.setDescription(server.getDescription());
 
 		}
-
-		return serverRepository.save(existServer);
+		serverRepository.save(existServer);
+		ServerImpl existServer2 = findServerID(server.getId());
+		existServer2.setPassword(null);
+		return existServer2;
 	}