diff --git a/src/main/java/com/jamesquinley/Asecure/electronicMailHandler.java b/src/main/java/com/jamesquinley/Asecure/electronicMailHandler.java index 9f068ec..3a76ead 100644 --- a/src/main/java/com/jamesquinley/Asecure/electronicMailHandler.java +++ b/src/main/java/com/jamesquinley/Asecure/electronicMailHandler.java @@ -17,7 +17,7 @@ public class electronicMailHandler { static final String senderPassword = "dcixokaivbyxbmnj"; static final String emailSMTPserver = "smtp.gmail.com"; static final String emailSMTPPort = "465"; - public static void Onboarding(String receiverEmail, String User) { + public static void Onboarding(String receiverEmail, String User, String UUID) { //get date for email Date date = new Date(); SimpleDateFormat formatter = new SimpleDateFormat("MM/dd/yy"); @@ -53,10 +53,9 @@ public class electronicMailHandler { } catch (Exception e) { e.printStackTrace(); System.err.println("Email ONBOARD Not sent due to an error"); - secureCalls.banAction(receiverEmail); - if (e instanceof SendFailedException) { - secureCalls.banAction(receiverEmail); - } + secureCalls.banAction(UUID); + System.out.println("Banned user due to invalid email."); + } } public static void newLocation (String receiverEmail, String User, String Adr, String OldAdr) { diff --git a/src/main/java/com/jamesquinley/Asecure/secureCalls.java b/src/main/java/com/jamesquinley/Asecure/secureCalls.java index e454160..4bc8cac 100644 --- a/src/main/java/com/jamesquinley/Asecure/secureCalls.java +++ b/src/main/java/com/jamesquinley/Asecure/secureCalls.java @@ -13,9 +13,9 @@ public class secureCalls { runnable.run(); } - public static void banAction (String email) + public static void banAction (String UUID) { - delegationServices.banUserEmail(email); + delegationServices.banUserID(UUID); } public static void oneTimeKeyEmail (String email, String key, String user) { diff --git a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java index 29a73be..92b696b 100644 --- a/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java +++ b/src/main/java/com/jamesquinley/DelegationServices/delegationServices.java @@ -80,19 +80,15 @@ public class delegationServices { public static String lastNet = null; public static String Macid = null; - public static void banUserEmail (String email) + public static void banUserID(String UUID) { BasicDBObject searchQuery = new BasicDBObject(); - searchQuery.append("Email", email); + searchQuery.append("UUID", UUID); BasicDBObject updateQuery2 = new BasicDBObject(); updateQuery2.append("$set", new BasicDBObject().append("Status",false)); accountS.updateOne(searchQuery, updateQuery2); } - public static void banUserID(String ID) - { - - } public static void delegationProcesser() { Document Filter; @@ -1145,7 +1141,7 @@ public class delegationServices { FNETDOC.insertOne(FnetInit); BasicDBObject searchQuery = new BasicDBObject(); searchQuery.append("clientid", ClientID); - electronicMailHandler.Onboarding(Email, User); + electronicMailHandler.Onboarding(Email, User,UUID); BasicDBObject updateQuery = new BasicDBObject(); BasicDBObject updateQuery1 = new BasicDBObject(); updateQuery.append("$set",