From d830f16a2b3b84fcce8e1411856951bf9b236b14 Mon Sep 17 00:00:00 2001
From: James Quinley <jsquinley@gmail.com>
Date: Mon, 14 Mar 2022 12:13:55 -0700
Subject: [PATCH] api updates, still working on fixing issue with path

---
 .../delegationServices.java                   | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
index 0a7dea6..06ecd0a 100644
--- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
+++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
@@ -112,11 +112,11 @@ public class delegationServices {
                     int requesttype = (int) Lrequest.get("type");
                     System.out.println("Got Type, Getting Doc ID");
                     RequestR = requesttype;
-                    //TODO Get this working, it broke and it wont get OBJ id
+
 
                     System.out.println("Delegation Has Started");
-                    if(requesttype == 0 || requesttype == 1 || requesttype == 2 || requesttype == 3 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype ==7 || requesttype == 8 || requesttype ==9 || requesttype ==10 || requesttype ==11 || requesttype ==12) {
-                        if (requesttype == 7 || requesttype == 12 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype == 19 || requesttype == 20) {
+                    if(requesttype == 0 || requesttype == 1 || requesttype == 2 || requesttype == 3 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype ==7 || requesttype == 8 || requesttype ==9 || requesttype ==10 || requesttype ==11 || requesttype ==12 || requesttype == 20) {
+                        if (requesttype == 7 || requesttype == 12 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype == 19 ) {
                             System.out.println("An Excluded Request (7MAL, 12S, 4C, 5C, 6C) Has Been Detected, Ignoring");
                             //Thinking of moving all purge timer call to here to centralize deletion decision.
                         }
@@ -232,12 +232,10 @@ public class delegationServices {
                             int CTOKEN = (int) Lrequest.get("Token");
                             System.out.println("Got Token.");
                             Document accountServer;
-                            String Password;
                             int Token;
                             String Fname;
                             String Path;
                             String UserName;
-                            String Email;
                             try {
                                 accountServer = accountS.find(eq("Token", CTOKEN)).first();
                                 Token = (int) accountServer.get("Token");
@@ -248,7 +246,6 @@ public class delegationServices {
                                         Token = (int) Lrequest.get("Token");
                                         Fname = (String) Lrequest.get("FName");
                                         Path = (String) Lrequest.get("Path");
-                                        Email = (String) Lrequest.get("Email");
                                         UserName = (String) Lrequest.get("User");
                                         System.out.println("Got info.");
                                         BasicDBObject searchQuery = new BasicDBObject();
@@ -257,38 +254,26 @@ public class delegationServices {
                                         SqS.append("clientid", ClientID);
 
                                         BasicDBObject updateQuery = new BasicDBObject();
-                                        BasicDBObject updateQuery1 = new BasicDBObject();
                                         BasicDBObject updateQuery2 = new BasicDBObject();
                                         BasicDBObject updateQuery3 = new BasicDBObject();
                                         BasicDBObject updateQuery4 = new BasicDBObject();
-                                        BasicDBObject updateQuery5 = new BasicDBObject();
                                         BasicDBObject updateQuery6 = new BasicDBObject();
-                                        BasicDBObject updateQuery7 = new BasicDBObject();
                                         System.out.println("Made Objects");
                                         updateQuery.append("$set",
                                                 new BasicDBObject().append("type", 12));
-                                        updateQuery1.append("$set",
-                                                new BasicDBObject().append("Token", Token));
                                         updateQuery2.append("$set",
                                                 new BasicDBObject().append("FName", Fname));
                                         updateQuery3.append("$set",
                                                 new BasicDBObject().append("Path", Path));
                                         updateQuery4.append("$set",
                                                 new BasicDBObject().append("User", UserName));
-                                        updateQuery7.append("$set",
-                                                new BasicDBObject().append("Email", Email));
                                         updateQuery6.append("$set",
                                                 new BasicDBObject().append("status", true));
-                                        updateQuery5.append("$set",
-                                                new BasicDBObject().append("Email", Email));
                                         dCollection.updateOne(SqS, updateQuery);
                                         dCollection.updateOne(SqS, updateQuery6);
-                                        accountS.updateOne(searchQuery, updateQuery1);
                                         accountS.updateOne(searchQuery, updateQuery2);
                                         accountS.updateOne(searchQuery, updateQuery3);
                                         accountS.updateOne(searchQuery, updateQuery4);
-                                        accountS.updateOne(searchQuery, updateQuery7);
-                                        accountS.updateOne(searchQuery, updateQuery5);
                                         System.out.println("Updated Account");
                                         //delegationTimer.trigger();
                                         delegationTimer.DeleteTargetRequest(ClientID);
@@ -787,6 +772,8 @@ public class delegationServices {
                                         new BasicDBObject().append("status", true));
                                 dCollection.updateOne(searchQuery, updateQuery);
                                 dCollection.updateOne(searchQuery, updateQuery1);
+                                System.out.println("User Exists");
+                                delegationTimer.DeleteTargetRequest(ClientID);
                             } catch (Exception exr) {
                                 System.out.println("Username Is Open");
                                 try {
@@ -842,7 +829,7 @@ public class delegationServices {
                             }
                         }
                     } else {
-                        System.out.println("Malformed Request, Non Recoverable");
+                        System.out.println("Malformed Request, Non Recoverable (Request Type Not Found)");
                         BasicDBObject searchQuery = new BasicDBObject();
                         searchQuery.append("clientid", ClientID);