Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
This commit is contained in:
James Quinley 2022-02-17 20:54:22 -08:00
commit 1979d7ee69

View File

@ -39,7 +39,8 @@ public class delegationServices {
//still need to config //still need to config
public static void delegationProcesser() { public static void delegationProcesser() {
Document Lrequest = dCollection.find(eq("status", false)).first(); Document Lrequest = dCollection.find(eq("status", false)).first();
if ((boolean) Lrequest.get("status") == true) { if ((boolean) Lrequest.get("status") == true)
{
System.out.println("This request was completed, ignoring"); System.out.println("This request was completed, ignoring");
Lrequest = null; Lrequest = null;
} else { } else {
@ -64,6 +65,7 @@ public class delegationServices {
} }
if (requesttype == 0) { if (requesttype == 0) {
delegationTimer.DeleteTargetRequest(ClientID); delegationTimer.DeleteTargetRequest(ClientID);
int CTOKEN = (int) Lrequest.get("Token"); int CTOKEN = (int) Lrequest.get("Token");
@ -237,7 +239,7 @@ public class delegationServices {
} else { } else {
System.out.println("Sync Failure"); System.out.println("Sync Failure");
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("rid", Lrequest.get("rid")); searchQuery.append("rid",(int) Lrequest.get("rid"));
BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery = new BasicDBObject();
BasicDBObject updateQuery1 = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject();
@ -433,8 +435,6 @@ public class delegationServices {
updateQuery4.append("$set", updateQuery4.append("$set",
new BasicDBObject().append("User", UserName)); new BasicDBObject().append("User", UserName));
updateQuery5.append("$set", updateQuery5.append("$set",
new BasicDBObject().append("Password", Password)); new BasicDBObject().append("Password", Password));
updateQuery7.append("$set", updateQuery7.append("$set",
new BasicDBObject().append("Email", Email)); new BasicDBObject().append("Email", Email));
@ -547,6 +547,7 @@ public class delegationServices {
updateQuery5.append("$set", updateQuery5.append("$set",
new BasicDBObject().append("Password", Password)); new BasicDBObject().append("Password", Password));
updateQuery7.append("$set", updateQuery7.append("$set",
new BasicDBObject().append("Email", Email)); new BasicDBObject().append("Email", Email));
@ -613,7 +614,8 @@ public class delegationServices {
//delegationTimer.trigger(); //delegationTimer.trigger();
} }
} }
if (requesttype == 10) { if (requesttype == 10)
{
delegationTimer.DeleteTargetRequest(ClientID); delegationTimer.DeleteTargetRequest(ClientID);
System.out.println("Account Creation Request"); System.out.println("Account Creation Request");
Document DServer = dCollection.find(eq("clientid",ClientID)).first(); Document DServer = dCollection.find(eq("clientid",ClientID)).first();
@ -630,9 +632,6 @@ public class delegationServices {
try { try {
Document DupeUser = accountS.find(eq("User", User)).first(); Document DupeUser = accountS.find(eq("User", User)).first();
String DUPE = (String) DupeUser.get("User"); String DUPE = (String) DupeUser.get("User");
if (DUPE.equalsIgnoreCase(User)) {
System.out.println("This Username Is Not Open");
}
BasicDBObject searchQuery = new BasicDBObject(); BasicDBObject searchQuery = new BasicDBObject();
searchQuery.append("clientid", ClientID); searchQuery.append("clientid", ClientID);
@ -725,7 +724,6 @@ public class delegationServices {
//delegationTimer.trigger(); //delegationTimer.trigger();
delegate(); delegate();
} }
public static void Purge () { public static void Purge () {
BasicDBObject searchQueryT = new BasicDBObject(); BasicDBObject searchQueryT = new BasicDBObject();
BasicDBObject searchQueryF = new BasicDBObject(); BasicDBObject searchQueryF = new BasicDBObject();
@ -752,12 +750,10 @@ public class delegationServices {
System.out.println("Flushed a targeted request (RID) from the server"); System.out.println("Flushed a targeted request (RID) from the server");
} } public static void delegate ()
{
public static void delegate() {
userAuthetication(); userAuthetication();
} }
public static void userAuthetication (){ public static void userAuthetication (){
try { try {
delegationProcesser(); delegationProcesser();