Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
This commit is contained in:
commit
1979d7ee69
@ -39,7 +39,8 @@ public class delegationServices {
|
||||
//still need to config
|
||||
public static void delegationProcesser() {
|
||||
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");
|
||||
Lrequest = null;
|
||||
} else {
|
||||
@ -64,6 +65,7 @@ public class delegationServices {
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (requesttype == 0) {
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
int CTOKEN = (int) Lrequest.get("Token");
|
||||
@ -237,7 +239,7 @@ public class delegationServices {
|
||||
} else {
|
||||
System.out.println("Sync Failure");
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("rid", Lrequest.get("rid"));
|
||||
searchQuery.append("rid",(int) Lrequest.get("rid"));
|
||||
|
||||
BasicDBObject updateQuery = new BasicDBObject();
|
||||
BasicDBObject updateQuery1 = new BasicDBObject();
|
||||
@ -433,8 +435,6 @@ public class delegationServices {
|
||||
updateQuery4.append("$set",
|
||||
new BasicDBObject().append("User", UserName));
|
||||
updateQuery5.append("$set",
|
||||
|
||||
|
||||
new BasicDBObject().append("Password", Password));
|
||||
updateQuery7.append("$set",
|
||||
new BasicDBObject().append("Email", Email));
|
||||
@ -547,6 +547,7 @@ public class delegationServices {
|
||||
updateQuery5.append("$set",
|
||||
|
||||
|
||||
|
||||
new BasicDBObject().append("Password", Password));
|
||||
updateQuery7.append("$set",
|
||||
new BasicDBObject().append("Email", Email));
|
||||
@ -613,7 +614,8 @@ public class delegationServices {
|
||||
//delegationTimer.trigger();
|
||||
}
|
||||
}
|
||||
if (requesttype == 10) {
|
||||
if (requesttype == 10)
|
||||
{
|
||||
delegationTimer.DeleteTargetRequest(ClientID);
|
||||
System.out.println("Account Creation Request");
|
||||
Document DServer = dCollection.find(eq("clientid",ClientID)).first();
|
||||
@ -630,9 +632,6 @@ public class delegationServices {
|
||||
try {
|
||||
Document DupeUser = accountS.find(eq("User", User)).first();
|
||||
String DUPE = (String) DupeUser.get("User");
|
||||
if (DUPE.equalsIgnoreCase(User)) {
|
||||
System.out.println("This Username Is Not Open");
|
||||
}
|
||||
BasicDBObject searchQuery = new BasicDBObject();
|
||||
searchQuery.append("clientid", ClientID);
|
||||
|
||||
@ -725,7 +724,6 @@ public class delegationServices {
|
||||
//delegationTimer.trigger();
|
||||
delegate();
|
||||
}
|
||||
|
||||
public static void Purge () {
|
||||
BasicDBObject searchQueryT = new BasicDBObject();
|
||||
BasicDBObject searchQueryF = new BasicDBObject();
|
||||
@ -752,12 +750,10 @@ public class delegationServices {
|
||||
System.out.println("Flushed a targeted request (RID) from the server");
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static void delegate() {
|
||||
} public static void delegate ()
|
||||
{
|
||||
userAuthetication();
|
||||
}
|
||||
|
||||
public static void userAuthetication (){
|
||||
try {
|
||||
delegationProcesser();
|
||||
|
Loading…
x
Reference in New Issue
Block a user