JamesQ/MatchmakingBackend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This server build fixes issues with not sending user UUID, which caused client auth issues with other features.

Browse Source
This commit is contained in:
James Quinley 2023-01-07 21:37:47 -08:00
parent b43a7996aa
commit 19821f663a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
View File

@ -556,9 +556,10 @@ public class delegationServices {
BasicDBObject updateQuery6 = new BasicDBObject(); BasicDBObject updateQuery6 = new BasicDBObject();
BasicDBObject updateQuery7 = new BasicDBObject(); BasicDBObject updateQuery7 = new BasicDBObject();
BasicDBObject updateQuery8 = new BasicDBObject(); BasicDBObject updateQuery8 = new BasicDBObject();
BasicDBObject updateQuery10 = new BasicDBObject();
//below if is used for custom greetings, and home messages, for holidays and such. (Also right before update ops) //below if is used for custom greetings, and home messages, for holidays and such. (Also right before update ops)
BasicDBObject updateQuery9 = new BasicDBObject(); BasicDBObject updateQuery9 = new BasicDBObject();
BasicDBObject updateQuery10 = new BasicDBObject(); BasicDBObject updateQuery12 = new BasicDBObject();
updateQuery.append("$set", updateQuery.append("$set",
new BasicDBObject().append("type", 8)); new BasicDBObject().append("type", 8));
updateQuery1.append("$set", updateQuery1.append("$set",
@ -581,14 +582,14 @@ public class delegationServices {
BasicDBObject updateQuery11 = new BasicDBObject(); BasicDBObject updateQuery11 = new BasicDBObject();
updateQuery11.append("$set", updateQuery11.append("$set",
new BasicDBObject().append("home", Filter.get("valHome"))); new BasicDBObject().append("home", Filter.get("valHome")));
updateQuery9.append("$set", updateQuery12.append("$set",
new BasicDBObject().append("hs",true)); new BasicDBObject().append("hs",true));
dCollection.updateOne(searchQuery, updateQuery11); dCollection.updateOne(searchQuery, updateQuery11);
dCollection.updateOne(searchQuery, updateQuery9); dCollection.updateOne(searchQuery, updateQuery12);
} else { } else {
updateQuery9.append("$set", updateQuery12.append("$set",
new BasicDBObject().append("hs",false)); new BasicDBObject().append("hs",false));
dCollection.updateOne(searchQuery, updateQuery9); dCollection.updateOne(searchQuery, updateQuery12);
} }
/* /*
if (Filter.get("customGreeting").equals(true)) { if (Filter.get("customGreeting").equals(true)) {
@ -849,6 +850,7 @@ public class delegationServices {
BasicDBObject updateQuery7 = new BasicDBObject(); BasicDBObject updateQuery7 = new BasicDBObject();
BasicDBObject updateQuery8 = new BasicDBObject(); BasicDBObject updateQuery8 = new BasicDBObject();
BasicDBObject updateQuery9 = new BasicDBObject(); BasicDBObject updateQuery9 = new BasicDBObject();
BasicDBObject updateQuery10 = new BasicDBObject();
updateQuery.append("$set", updateQuery.append("$set",
new BasicDBObject().append("type", 8)); new BasicDBObject().append("type", 8));
updateQuery2.append("$set", updateQuery2.append("$set",
@ -869,14 +871,14 @@ public class delegationServices {
BasicDBObject updateQuery11 = new BasicDBObject(); BasicDBObject updateQuery11 = new BasicDBObject();
updateQuery11.append("$set", updateQuery11.append("$set",
new BasicDBObject().append("home", Filter.get("valHome"))); new BasicDBObject().append("home", Filter.get("valHome")));
updateQuery9.append("$set", updateQuery10.append("$set",
new BasicDBObject().append("hs",true)); new BasicDBObject().append("hs",true));
dCollection.updateOne(searchQuery, updateQuery11); dCollection.updateOne(searchQuery, updateQuery11);
dCollection.updateOne(searchQuery, updateQuery9); dCollection.updateOne(searchQuery, updateQuery10);
} else { } else {
updateQuery9.append("$set", updateQuery10.append("$set",
new BasicDBObject().append("hs",false)); new BasicDBObject().append("hs",false));
dCollection.updateOne(searchQuery, updateQuery9); dCollection.updateOne(searchQuery, updateQuery10);
} }
System.out.println("Sending Info To Forwarding Server"); System.out.println("Sending Info To Forwarding Server");
dCollection.updateOne(searchQuery, updateQuery8); dCollection.updateOne(searchQuery, updateQuery8);
@ -1753,7 +1755,7 @@ public class delegationServices {
if (requesttype == 67) { if (requesttype == 67) {
String OTK = "keyNotSetDueToError(ERR24)"; String OTK = "keyNotSetDueToError(ERR24)";
Boolean keyStatus = false; Boolean keyStatus = false;
//default false, since will be set to true if the mesurement exists on linked account //default false, since will be set to true if the measurement exists on linked account
String accountUUID = (String) Lrequest.get("uuid"); String accountUUID = (String) Lrequest.get("uuid");
Document linkedAccount = accountS.find(eq("UUID", accountUUID)).first(); Document linkedAccount = accountS.find(eq("UUID", accountUUID)).first();
try { try {