Merge remote-tracking branch 'origin/master'

This commit is contained in:
James Quinley 2023-04-27 19:23:57 -07:00
commit fa19618264

View File

@ -68,6 +68,8 @@ public class delegationServices {
//TODO get switcher working, NPE currently triggers on post init, move below code block into if statement, or outside of it so it will do the same thing regardless of t/f switch output
static ConnectionString AccountCon = new ConnectionString("mongodb://accountserver:x2sJ8Qu0VVMifNLX@192.168.1.5:27017/account?retryWrites=true&w=majority");
//mongodb://localhost:27017
//mongodb://accountserver:x2sJ8Qu0VVMifNLX@192.168.1.5:27017/account?retryWrites=true&w=majority
static MongoClientSettings AccountSettings = MongoClientSettings.builder()
.applyConnectionString(AccountCon)
.applyToSocketSettings(builder ->
@ -92,22 +94,18 @@ public class delegationServices {
}
public static void delegationProcesser() {
Boolean cid = false;
Boolean mac = false;
Document Filter;
Object ClientID = null;
try {
try {
ClientID = Lrequest.get("_id");
cid = true;
} catch (Exception exrp) {
System.out.println("This request has opted out of CID.");
}
try {
Macid = (String) Lrequest.get("net");
mac = true;
} catch (Exception exrp) {
System.out.println("This request has opted out of CID.");
System.out.println("This request has opted out of NET.");
}
String RG = (String) Lrequest.get("rg");