From 489196ea2a51e3c1b559c13482abcbe7e24db636 Mon Sep 17 00:00:00 2001 From: James Quinley Date: Fri, 5 Aug 2022 22:26:47 -0700 Subject: [PATCH] UUID is sent at login via token and U&P. It will not be sent to any other request. This is to allow for it to download the UUID (Also used for friends requests in the future, and in the near future global pingable ids and session tracking.) --- .../delegationServices.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index 92b696b..97afbb1 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -42,7 +42,7 @@ public class delegationServices { .build(); dClient = MongoClients.create(scReadsettings); dClientDatabase = dClient.getDatabase("DelegationRequest"); - dCollection = dClientDatabase.getCollection("accountRequest"); + dCollection = dClientDatabase.getCollection("accountRequestBeta"); RGFilterDB = dClient.getDatabase("rgcon"); RGFilter = RGFilterDB.getCollection("blocked"); } else @@ -444,6 +444,8 @@ public class delegationServices { String Path; String UserName; String Email; + String keychainUUID; + Boolean accountKeyStatus = false; try { accountServer = accountS.find(eq("User", username)).first(); @@ -512,8 +514,6 @@ public class delegationServices { else { System.out.println("RS14"); - System.out.println(password + "From Client"); - System.out.println(Password + "From Trusted Server"); if (Password.equals(password)) { System.out.println("R3c"); Token = (int) accountServer.get("Token"); @@ -522,6 +522,7 @@ public class delegationServices { Email = (String) accountServer.get("Email"); UserName = (String) accountServer.get("User"); lastNet = (String) accountServer.get("lastNet"); + keychainUUID = (String) accountServer.get("UUID"); localNet.macRead(Macid, lastNet, Email, UserName, Token); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -533,6 +534,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)); updateQuery1.append("$set", @@ -549,6 +551,8 @@ public class delegationServices { new BasicDBObject().append("Email", Email)); updateQuery6.append("$set", new BasicDBObject().append("status", true)); + updateQuery8.append("$set", + new BasicDBObject().append("keychainUUID", keychainUUID)); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery2); @@ -557,6 +561,7 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery5); dCollection.updateOne(searchQuery, updateQuery6); dCollection.updateOne(searchQuery, updateQuery7); + dCollection.updateOne(searchQuery, updateQuery8); //delegationTimer.trigger(); delegationTimer.DeleteTargetRequest(ClientID); } else { @@ -776,6 +781,7 @@ public class delegationServices { String Path; String UserName; String Email; + String keychainUUID; try { accountServer = accountS.find(eq("Token", CTOKEN)).first(); TKN = (int) accountServer.get("Token"); @@ -788,6 +794,7 @@ public class delegationServices { Email = (String) accountServer.get("Email"); UserName = (String) accountServer.get("User"); lastNet = (String) accountServer.get("lastNet"); + keychainUUID = (String) accountServer.get("UUID"); localNet.macRead(Macid, lastNet, Email, UserName, TKN); // com.jamesquinley.Asecure.emailVerify.SendEmailThroughGmail(Email, UserName); BasicDBObject searchQuery = new BasicDBObject(); @@ -801,6 +808,7 @@ public class delegationServices { BasicDBObject updateQuery6 = new BasicDBObject(); BasicDBObject updateQuery7 = new BasicDBObject(); BasicDBObject updateQuery8 = new BasicDBObject(); + BasicDBObject updateQuery9 = new BasicDBObject(); updateQuery.append("$set", new BasicDBObject().append("type", 8)); updateQuery2.append("$set", @@ -813,10 +821,12 @@ public class delegationServices { new BasicDBObject().append("Password", Password)); updateQuery7.append("$set", new BasicDBObject().append("Email", Email)); - updateQuery6.append("$set", - new BasicDBObject().append("status", true)); updateQuery8.append("$set", new BasicDBObject().append("Token", TKN)); + updateQuery9.append("$set", + new BasicDBObject().append("keychainUUID", keychainUUID)); + updateQuery6.append("$set", + new BasicDBObject().append("status", true)); System.out.println("Sending Info To Forwarding Server"); dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery); @@ -824,9 +834,10 @@ public class delegationServices { dCollection.updateOne(searchQuery, updateQuery3); dCollection.updateOne(searchQuery, updateQuery4); dCollection.updateOne(searchQuery, updateQuery5); - dCollection.updateOne(searchQuery, updateQuery6); dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery7); + dCollection.updateOne(searchQuery, updateQuery9); + dCollection.updateOne(searchQuery, updateQuery6); //delegationTimer.trigger(); delegationTimer.DeleteTargetRequest(ClientID); } else {