diff --git a/.gitignore b/.gitignore index fbe4338aad4ce9779d2842f304de8a97668fd31a..e227131245711e1d35269ca181af91b3ee50493a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ .DS_Store -**/bin/*.class +**/bin/**/*.class antifurto/ \ No newline at end of file diff --git a/WebServer/public/index.html b/WebServer/public/index.html index a13a04e58b2362758548a7e03741f4f6409e67f3..64a122d15c5c165feef2e93aa8c72521c75fa032 100644 --- a/WebServer/public/index.html +++ b/WebServer/public/index.html @@ -135,7 +135,7 @@ </button> <div class="position-absolute top-0 end-10px"> <span> - Antifurto: + Scenari: </span> <button type="button" class="btn btn-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" id="scenari-stato-antifurto"> OFF diff --git a/WebServer/src/code/Helper.java b/WebServer/src/code/Helper.java index ccd449efdcf353804e3f94aa85041dcdeea0efcb..0c10526f897c0d503a9f02682ad02ebbed4e4fc6 100644 --- a/WebServer/src/code/Helper.java +++ b/WebServer/src/code/Helper.java @@ -26,7 +26,6 @@ public class Helper { } public static void sendResponseOk(String response, HttpsExchange exchange) throws IOException { - System.out.println(response); sendResponse(exchange, response, 200); } diff --git a/domainManager/Domain/bin/code/DeleteHandler.class b/domainManager/Domain/bin/code/DeleteHandler.class index 0dd90e2686f440a857af2a509f6c9ba0234802d8..9809026f1523bf0e87b5d7bc1b15787c81d17e1b 100644 Binary files a/domainManager/Domain/bin/code/DeleteHandler.class and b/domainManager/Domain/bin/code/DeleteHandler.class differ diff --git a/domainManager/Domain/bin/db/DBC.class b/domainManager/Domain/bin/db/DBC.class index b85887cf5868415af7029bff73b88112a0242292..41369d865bfd4fa099bbbab5b98eceddff014192 100644 Binary files a/domainManager/Domain/bin/db/DBC.class and b/domainManager/Domain/bin/db/DBC.class differ diff --git a/domainManager/Domain/src/code/DeleteHandler.java b/domainManager/Domain/src/code/DeleteHandler.java index 99b152a8944ebb89eda90e0adce0223206c8c278..04a5af7b4e9a6dd180df2f3c4f21006a11c8f94b 100644 --- a/domainManager/Domain/src/code/DeleteHandler.java +++ b/domainManager/Domain/src/code/DeleteHandler.java @@ -29,17 +29,15 @@ public class DeleteHandler implements HttpHandler { Helper.sendCors(he, 405); return; } - // String query = requestedUri.getRawQuery(); - String body = Helper.readBody(he.getRequestBody()); String user; - if ((user = Helper.checkTokenGetUser(he)) == null) { Helper.sendCors(he, 401); return; } + String body = Helper.readBody(he.getRequestBody()); try { String dominio = new JSONObject(body).getString("domain"); diff --git a/domainManager/Domain/src/db/DBC.java b/domainManager/Domain/src/db/DBC.java index fdeb3089e6a8168b4e174d7ada8bc056d8c5b9f4..d5f5fe6ab460bb580a49a804d4ddd69a64216bfe 100644 --- a/domainManager/Domain/src/db/DBC.java +++ b/domainManager/Domain/src/db/DBC.java @@ -52,7 +52,7 @@ public class DBC { // ResultSet result =statement.executeQuery(sql); // Dominio res=new Dominio(); - while (result.next()) { + if (result.next()) { String dom = result.getString("Domain"); String desc = result.getString("Desc");