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

Fixes crashes on banned users for web requests. This version is live.

Browse Source
This commit is contained in:
James Quinley 2022-12-23 12:12:04 -08:00
parent 1feeb21ce2
commit 8179c3e0ef
3 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.idea/artifacts/AOTSKBetaServer.xml generated
View File

@ -1,25 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="AOTSKBetaServer">
<output-path>$PROJECT_DIR$/out/artifacts/AOTSKBetaServer</output-path>
<root id="archive" name="AOTSKBetaServer.jar">
<element id="module-output" name="AOTSK-Login-Delegation-Server" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/sun/mail/javax.mail/1.6.2/javax.mail-1.6.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/mail/javax.mail-api/1.6.2/javax.mail-api-1.6.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/jfoenix/jfoenix/8.0.10/jfoenix-8.0.10.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/controlsfx/controlsfx/11.1.1/controlsfx-11.1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/jsoup/jsoup/1.14.2/jsoup-1.14.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/4.3.2/mongodb-driver-core-4.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-sync/4.3.2/mongodb-driver-sync-4.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/mongodb/bson/4.3.2/bson-4.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/theokanning/openai-gpt3-java/api/0.4.0/api-0.4.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/net/lingala/zip4j/zip4j/2.6.1/zip4j-2.6.1.jar" path-in-jar="/" />
</root>
</artifact>
</component>

2
.idea/artifacts/AOTSK_Login_Delegation_Server_jar.xml generated
View File

@ -1,7 +1,7 @@
<component name="ArtifactManager"> <component name="ArtifactManager">
<artifact type="jar" build-on-make="true" name="AOTSK-Login-Delegation-Server:jar"> <artifact type="jar" build-on-make="true" name="AOTSK-Login-Delegation-Server:jar">
<output-path>$PROJECT_DIR$/out/artifacts/AOTSK_Login_Delegation_Server_jar</output-path> <output-path>$PROJECT_DIR$/out/artifacts/AOTSK_Login_Delegation_Server_jar</output-path>
<root id="archive" name="AOTSK-Login-Delegation-Server.jar"> <root id="archive" name="ProdServer.jar">
<element id="module-output" name="AOTSK-Login-Delegation-Server" /> <element id="module-output" name="AOTSK-Login-Delegation-Server" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar" path-in-jar="/" /> <element id="extracted-dir" path="$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/theokanning/openai-gpt3-java/api/0.4.0/api-0.4.0.jar" path-in-jar="/" /> <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/theokanning/openai-gpt3-java/api/0.4.0/api-0.4.0.jar" path-in-jar="/" />

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

@ -1137,8 +1137,13 @@ public class delegationServices {
//Above makes UUID, will be remade if it already exists. //Above makes UUID, will be remade if it already exists.
try { try {
Document DupeUser = accountS.find(eq("User", User)).first();
String DUPE = (String) DupeUser.get("User"); Document DupeEmail = accountS.find(eq("Email", Email)).first();
String DUPEEMAIL = (String) DupeEmail.get("Email");
if (DUPEEMAIL.equals(null)) {
Document DupeUser = accountS.find(eq("User", User)).first();
String DUPE = (String) DupeUser.get("User");
}
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id", ClientID); searchQuery.append("_id", ClientID);
@ -1152,7 +1157,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id")); delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id"));
} catch (Exception exr) { } catch (Exception exr) {
System.out.println("Username Is Open"); System.out.println("Username & Email Is Open");
try { try {
Document DupeToken = accountS.find(eq("Token", Token)).first(); Document DupeToken = accountS.find(eq("Token", Token)).first();
String DupeToke1n = (String) DupeToken.get("Token"); String DupeToke1n = (String) DupeToken.get("Token");
@ -1880,7 +1885,8 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id")); delegationTimer.DeleteTargetRequestByID(objid);
System.out.println("Deleted");
} }
} else { } else {
@ -1957,13 +1963,13 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id")); delegationTimer.DeleteTargetRequestByID(objid);
} }
} }
} else { } else {
System.out.println("Banned Account"); System.out.println("Banned Account");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("_id",Lrequest.get("_id").toString()); searchQuery.append("_id",Lrequest.get("_id"));
BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject();
@ -1973,7 +1979,7 @@ public class delegationServices {
new BasicDBObject().append("status", true)); new BasicDBObject().append("status", true));
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id").toString()); delegationTimer.DeleteTargetRequestByID(objid);
} }
} catch (Exception ERC) { } catch (Exception ERC) {
System.out.println("Something Went Wrong: " + ERC.getLocalizedMessage()); System.out.println("Something Went Wrong: " + ERC.getLocalizedMessage());
@ -1989,7 +1995,7 @@ public class delegationServices {
dCollection.updateOne(searchQuery, updateQuery); dCollection.updateOne(searchQuery, updateQuery);
dCollection.updateOne(searchQuery, updateQuery1); dCollection.updateOne(searchQuery, updateQuery1);
//delegationTimer.trigger(); //delegationTimer.trigger();
delegationTimer.DeleteTargetRequestByID(Lrequest.get("_id")); delegationTimer.DeleteTargetRequestByID(objid);
} }
} }