diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index f522fbf..5641f71 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -51,17 +51,17 @@ public class delegationServices { if (requesttype == 7) { System.out.println("An Excluded Request (7MAL) Has Been Detected, Ignoring"); } - String username = (String) Lrequest.get("User"); - String password = (String) Lrequest.get("Password"); + try { ClientID = (int) Lrequest.get("clientid"); } catch (Exception exrp) { System.out.println("Failed To Get Client ID"); } - int CTOKEN = (int) Lrequest.get("Token"); + if (requesttype == 0) { + int CTOKEN = (int) Lrequest.get("Token"); System.out.println("Sync Request (Read)"); Document accountServer; String Password; @@ -165,6 +165,7 @@ public class delegationServices { //TODO This has issues, and won't get past line 171. Working on a fix for that. if (requesttype == 1) { System.out.println("Sync Request (Write)"); + int CTOKEN = (int) Lrequest.get("Token"); Document accountServer; String Password; int Token; @@ -271,6 +272,8 @@ public class delegationServices { } if (requesttype == 2) { System.out.println("Login Request (USR&PASS)"); + String username = (String) Lrequest.get("User"); + String password = (String) Lrequest.get("Password"); Document accountServer; String Password; int Token; @@ -372,6 +375,7 @@ public class delegationServices { } if (requesttype == 3) { System.out.println("Login Request (TKN)"); + int CTOKEN = (int) Lrequest.get("Token"); // Document TResolve = dCollection.find(eq("type", 3)).first(); Document accountServer; int TKN;