diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index 0af213d..069996b 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -67,6 +67,7 @@ public class delegationServices { if (requesttype == 0) { + delegationTimer.DeleteTargetRequest(ClientID); int CTOKEN = (int) Lrequest.get("Token"); System.out.println("Sync Request (Read)"); Document accountServer; @@ -135,7 +136,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); + //delegationTimer.trigger(); } } else { @@ -151,7 +152,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); + } } catch(MongoCommandException ERC){ System.out.println("Malformed Request"); @@ -167,13 +168,14 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); + } } //sync read request //TODO This has issues, and won't get past line 171. Working on a fix for that. if (requesttype == 1) { + delegationTimer.DeleteTargetRequest(ClientID); System.out.println("Sync Request (Write)"); int CTOKEN = (int) Lrequest.get("Token"); Document accountServer; @@ -235,7 +237,6 @@ public class delegationServices { accountS.updateOne(searchQuery, updateQuery7); System.out.println("Updated Account"); //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); } else { System.out.println("Sync Failure"); BasicDBObject searchQuery = new BasicDBObject(); @@ -250,7 +251,6 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); } } else { System.out.println("Banned Account"); @@ -265,7 +265,6 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); } } catch(MongoCommandException ERC){ System.out.println("Malformed Request"); @@ -281,10 +280,10 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); } } if (requesttype == 2) { + delegationTimer.DeleteTargetRequest(ClientID); System.out.println("Login Request (USR&PASS)"); String username = (String) Lrequest.get("User"); String password = (String) Lrequest.get("Password"); @@ -344,7 +343,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery6); dCollection.updateOne(searchQuery, updateQuery7); //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); + } else { BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -358,7 +357,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); + } } else { System.out.println("Banned Account"); @@ -373,7 +372,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); + } } catch (Exception ERC) { BasicDBObject searchQuery = new BasicDBObject(); @@ -388,11 +387,12 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); + } } if (requesttype == 3) { + delegationTimer.DeleteTargetRequest(ClientID); System.out.println("Login Request (TKN)"); int CTOKEN = (int) Lrequest.get("Token"); // Document TResolve = dCollection.find(eq("type", 3)).first(); @@ -453,7 +453,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery7); //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); + } else { System.out.println("Login Failure"); BasicDBObject searchQuery = new BasicDBObject(); @@ -468,7 +468,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); //delegationTimer.trigger(); - delegationTimer.DeleteTargetRequest(ClientID); + } } else { System.out.println("Banned Account"); @@ -483,7 +483,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); + } } catch (MongoCommandException ERC) { System.out.println("Malformed Request"); @@ -498,7 +498,7 @@ public class delegationServices { new BasicDBObject().append("status", true)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); - delegationTimer.DeleteTargetRequest(ClientID); + //delegationTimer.trigger(); } } @@ -520,7 +520,7 @@ public class delegationServices { Lrequest.append("status",true); dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery); - delegationTimer.DeleteTargetRequest(ClientID); + }