From 8941c924902bd05c7fa70f2258e9aab97bd21ed5 Mon Sep 17 00:00:00 2001 From: James Quinley Date: Wed, 4 May 2022 19:58:29 -0700 Subject: [PATCH] Should work with game now. --- ... => AOTSK_Login_Delegation_Server_jar.xml} | 32 +++++++++---------- .../delegationServices.java | 13 ++++++-- .../com/jamesquinley/META-INF/MANIFEST.MF | 2 -- 3 files changed, 26 insertions(+), 21 deletions(-) rename .idea/artifacts/{AotskLoginServer_jar.xml => AOTSK_Login_Delegation_Server_jar.xml} (88%) delete mode 100644 src/main/java/com/jamesquinley/META-INF/MANIFEST.MF diff --git a/.idea/artifacts/AotskLoginServer_jar.xml b/.idea/artifacts/AOTSK_Login_Delegation_Server_jar.xml similarity index 88% rename from .idea/artifacts/AotskLoginServer_jar.xml rename to .idea/artifacts/AOTSK_Login_Delegation_Server_jar.xml index babf643..17a16fb 100644 --- a/.idea/artifacts/AotskLoginServer_jar.xml +++ b/.idea/artifacts/AOTSK_Login_Delegation_Server_jar.xml @@ -1,25 +1,25 @@ - - $PROJECT_DIR$/out/artifacts/AotskLoginServer_jar - - - - - - - - - - - + + $PROJECT_DIR$/out/artifacts/AOTSK_Login_Delegation_Server_jar + + - + + + - - + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index b4aea89..30cee1f 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -10,6 +10,8 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.bson.Document; +import java.util.UUID; + import static com.mongodb.client.model.Filters.eq; import static java.util.concurrent.TimeUnit.SECONDS; @@ -124,7 +126,7 @@ public class delegationServices { 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 || requesttype == 20 || requesttype == 21 || requesttype == 41) { + 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 || requesttype == 21 || requesttype == 41 || requesttype == 18) { if ( requesttype == 7 || requesttype == 12 || requesttype == 4 || requesttype == 5 || requesttype == 6 || requesttype == 19 || requesttype == 12) { 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. @@ -538,6 +540,7 @@ public class delegationServices { updateQuery8.append("$set", new BasicDBObject().append("Token", TKN)); System.out.println("Sending Info To Forwarding Server"); + dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery2); dCollection.updateOne(searchQuery, updateQuery3); @@ -600,7 +603,7 @@ public class delegationServices { } if (requesttype == 18) { //TOKEN LOGIN FOR GAME, DOES NOT SEND EMAIL, LAUNCHER WILL NOT USE THIS. - System.out.println("Login Request (TKN)"); + System.out.println("Game Login"); int CTOKEN = (int) Lrequest.get("Token"); Document accountServer; int TKN; @@ -609,6 +612,7 @@ public class delegationServices { String Path; String UserName; String Email; + String Uid; try { accountServer = accountS.find(eq("Token", CTOKEN)).first(); TKN = (int) accountServer.get("Token"); @@ -619,7 +623,7 @@ public class delegationServices { Fname = (String) accountServer.get("FName"); Path = (String) accountServer.get("Path"); Email = (String) accountServer.get("Email"); - + Uid = (String) accountServer.get("Uid"); UserName = (String) accountServer.get("User"); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); @@ -632,6 +636,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", @@ -762,6 +767,7 @@ public class delegationServices { } } } catch (Exception exrs) { + UUID uid = UUID.randomUUID(); System.out.println("Token Free (Main)"); System.out.println("Creating."); Document createForm = new Document(); @@ -778,6 +784,7 @@ public class delegationServices { createForm.append("Token", tokenSTGEN); createForm.append("Control", 1); createForm.append("Upgrade", 0); + //createForm.append("Uid",uid); createForm.append("lastNet", Macid); accountS.insertOne(createForm); FnetInit.append("User", User); diff --git a/src/main/java/com/jamesquinley/META-INF/MANIFEST.MF b/src/main/java/com/jamesquinley/META-INF/MANIFEST.MF deleted file mode 100644 index 59499bc..0000000 --- a/src/main/java/com/jamesquinley/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -