From ec8c5edeb17f07305e16250902002c669e556fc1 Mon Sep 17 00:00:00 2001 From: James Quinley <55860757+JamesQuinley@users.noreply.github.com> Date: Sat, 29 Jan 2022 16:37:19 -0800 Subject: [PATCH] Slight ajustment --- .../delegationServices.java | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index 859996b..752a800 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -48,23 +48,23 @@ public class delegationServices { //TODO ADD BAN CHECK TO PREVENT BAN CIRCUMNAVIGATION, THIS WILL BE ADDED LATER String username = (String) Lrequest.get("User"); String password = (String) Lrequest.get("Password"); - String CTOKEN = (String) Lrequest.get("Token"); + int CTOKEN = (int) Lrequest.get("Token"); int requesttype = (int) Lrequest.get("type"); if (requesttype == 0) { System.out.println("Sync Request (TKN)"); Document accountServer; String Password; - String Token; + int Token; String Fname; String Path; String UserName; String Email; try { accountServer = accountS.find(eq("Token", CTOKEN)).first(); - Password = (String) accountServer.get("Token"); + Token = (int) accountServer.get("Token"); if (accountServer.get("Status").equals("Active")) { - if (Password.equals(CTOKEN)) { - Token = (String) accountServer.get("Token"); + if (Token == CTOKEN) { + Token = (int) accountServer.get("Token"); Password = (String) accountServer.get("Password"); Fname = (String) accountServer.get("FName"); Path = (String) accountServer.get("Path"); @@ -85,7 +85,7 @@ public class delegationServices { updateQuery.append("$set", new BasicDBObject().append("type", 12)); updateQuery1.append("$set", - new BasicDBObject().append("token", Token)); + new BasicDBObject().append("Token", Token)); updateQuery2.append("$set", new BasicDBObject().append("Fname", Fname)); updateQuery3.append("$set", @@ -109,7 +109,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery7); //delegationTimer.trigger(); } else { - System.out.println("Login Failure"); + System.out.println("Sync Failure"); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -159,20 +159,20 @@ public class delegationServices { System.out.println("Sync Request (Write)"); Document accountServer; String Password; - String Token; + int Token; String Fname; String Path; String UserName; String Email; - String TKN; + try { accountServer = accountS.find(eq("Token", CTOKEN)).first(); - TKN = (String) accountServer.get("Token"); + Token = (int) accountServer.get("Token"); if (accountServer.get("Status").equals("Active")) { System.out.println("Account is OK"); - if (TKN.equals(CTOKEN)) { + if (Token == CTOKEN) { System.out.println("Logged In"); - Token = (String) Lrequest.get("Token"); + Token = (int) Lrequest.get("Token"); Password = (String) Lrequest.get("Password"); Fname = (String) Lrequest.get("FName"); Path = (String) Lrequest.get("Path"); @@ -220,7 +220,7 @@ public class delegationServices { System.out.println("Updated Account"); //delegationTimer.trigger(); } else { - System.out.println("Login Failure"); + System.out.println("Sync Failure"); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -268,7 +268,7 @@ public class delegationServices { System.out.println("Login Request (USR&PASS)"); Document accountServer; String Password; - String Token; + int Token; String Fname; String Path; String UserName; @@ -278,7 +278,7 @@ public class delegationServices { Password = (String) accountServer.get("Password"); if (accountServer.get("Status").equals("Active")) { if (Password.equals(password)) { - Token = (String) accountServer.get("Token"); + Token = (int) accountServer.get("Token"); Fname = (String) accountServer.get("FName"); Path = (String) accountServer.get("Path"); Email = (String) accountServer.get("Email"); @@ -369,7 +369,7 @@ public class delegationServices { System.out.println("Login Request (TKN)"); // Document TResolve = dCollection.find(eq("type", 3)).first(); Document accountServer; - String TKN; + int TKN; String Password; String Fname; String Path; @@ -377,9 +377,10 @@ public class delegationServices { String Email; try { accountServer = accountS.find(eq("Token", CTOKEN)).first(); - TKN = (String) accountServer.get("Token"); + TKN = (int) accountServer.get("Token"); if (accountServer.get("Status").equals("Active")) { - if (TKN.equals(CTOKEN)) { + if (TKN == CTOKEN) { + TKN = (int) accountServer.get("Token"); Password = (String) accountServer.get("Password"); Fname = (String) accountServer.get("FName"); Path = (String) accountServer.get("Path"); @@ -396,6 +397,7 @@ public class delegationServices { BasicDBObject updateQuery5 = new BasicDBObject(); BasicDBObject updateQuery6 = new BasicDBObject(); BasicDBObject updateQuery7 = new BasicDBObject(); + BasicDBObject updateQuery8 = new BasicDBObject(); updateQuery.append("$set", new BasicDBObject().append("type", 8)); updateQuery2.append("$set", @@ -410,13 +412,16 @@ public class delegationServices { new BasicDBObject().append("Email", Email)); updateQuery6.append("$set", new BasicDBObject().append("status", true)); - // System.out.println("Sending Info To Forwarding Server"); + updateQuery8.append("$set", + new BasicDBObject().append("Token", TKN)); + System.out.println("Sending Info To Forwarding Server"); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery2); dCollection.updateOne(searchQuery, updateQuery3); dCollection.updateOne(searchQuery, updateQuery4); dCollection.updateOne(searchQuery, updateQuery5); dCollection.updateOne(searchQuery, updateQuery6); + dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery7); //delegationTimer.trigger(); } else {