From 8c215819b13d9f288df5061a44325fff92d8e3b1 Mon Sep 17 00:00:00 2001 From: James Quinley <55860757+JamesQuinley@users.noreply.github.com> Date: Tue, 25 Jan 2022 15:00:46 -0800 Subject: [PATCH] Improvements and bugfixes, token logins now complete. --- .../DelegationServices/delegationServices.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index 1368f08..b1ea918 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -45,12 +45,15 @@ public class delegationServices { String password = (String) Lrequest.get("Password"); int requesttype = (int) Lrequest.get("type"); if (requesttype == 0) { -//sync read request +System.out.println("Sync Request (Read)"); + //sync read request } if (requesttype == 1) { //sync write request + System.out.println("Sync Request (Write)"); } if (requesttype == 2) { + System.out.println("Login Request (USR&PASS)"); Document accountServer; String Password; String Token; @@ -135,6 +138,7 @@ public class delegationServices { } } if (requesttype == 3) { + System.out.println("Login Request (TKN)"); Document TResolve = dCollection.find(eq("status", false)).first(); String CTOKEN = (String) TResolve.get("Token"); Document accountServer; @@ -145,7 +149,7 @@ public class delegationServices { String UserName; String Email; try { - accountServer = accountS.find(eq("Token", username)).first(); + accountServer = accountS.find(eq("Token", CTOKEN)).first(); Password = (String) accountServer.get("Token"); if (Password.equals(CTOKEN)) { Token = (String) accountServer.get("Token"); @@ -244,10 +248,9 @@ public class delegationServices { } public static void userAuthetication (Document doc){ try { - System.out.println("1"); delegationProcesser(); } catch (Exception exr) { - System.out.println("Pending Authentication Completed"); + System.out.println("No Pending Authentication"); delegationTimer.trigger(); } }