Implemented Email verification

Author: Madhavan7

build.gradle

@@ -8,6 +8,7 @@ repositories {
 
 dependencies {
     implementation 'javax.mail:javax.mail-api:1.6.2'
+    implementation 'com.sun.mail:javax.mail:1.6.2'
     implementation 'junit:junit:4.13.1'
     testImplementation('org.junit.jupiter:junit-jupiter:5.6.0')
 }

src/main/java/Controllers/UserRegistrationUseCase.java

@@ -1,4 +1,4 @@
-package Controllers;
+package ControllersPresentersGateways;
 import Entities.User;
 import java.util.List;
 

src/main/java/Controllers/IRetrieveList.java renamed to src/main/java/ControllersPresentersGateways/IRetrieveList.java

@@ -1,4 +1,4 @@
-package Controllers;
+package ControllersPresentersGateways;
 
 public interface UserExists {
     boolean UserExists(String username, String password);

src/main/java/Controllers/UserExists.java renamed to src/main/java/ControllersPresentersGateways/UserExists.java

@@ -1,36 +1,47 @@
-package UI;
+package ControllersPresentersGateways;
 
-import Controllers.UserRegistrationUseCase;
+import UseCase.UserCreator;
 import UseCase.UserVerifier;
 import UseCase.verificationMethodFactory;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Random;
-public class UserRegistrationController implements UserVerifier, ActionListener, UserRegistrationUseCase {
+public class UserRegistrationController implements UserVerifier, ActionListener, UserRegistrator {
     private final String username;
     private final String password;
     private final String email;
-    private UserDatabase database;
+    private String preference;
+    private boolean userExists = false;
+    private UserCreator database;
     Random random;
     private final int code;
     private JTextField verificationCodeText;
     private JLabel success;
 
-    public UserRegistrationController(int code, String Username, String Password, String email, UserDatabase database){
+    /*public UserRegistrationController(int code, String Username, String Password, String email, UserDatabase database){
         this.code = code;
         this.username = Username;
         this.password = Password;
         this.email = email;
         this.database = database;
+    }*/
+
+    public UserRegistrationController(UserRegistrationGateway properties){
+        this.username = properties.getUsername();
+        this.password = properties.getPassword();
+        this.email = properties.getEmail();
+        this.userExists = properties.isUserExists();
+        this.code = properties.getCode();
+        this.database = properties.getDatabase();
     }
 
     //Asks for the verification code from the user, and matches it with this.code to potentially verify the user
     public void verify(String email){
         JFrame verificationFrame = new JFrame();
         verificationFrame.setSize(400, 200);
-        verificationFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        verificationFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         JPanel verificationPanel = new JPanel();
         verificationFrame.add(verificationPanel);
 
@@ -59,18 +70,39 @@ public void verify(String email){
     }
 
     public void registerUser() {
-        if(database.UserExists(this.username, this.email)){
-            System.out.println("A user with this username or email already exists");
+        if(this.userExists){
+            System.out.println("An account with this username or email already exists");
+            accountExistsMessage();
         }else{
             this.verify(email);
         }
     }
 
-    //For testing purposes
-    /*public static void main(String[] args){
-        UI.UserVerificationUI ver = new UI.UserVerificationUI(389);
-        ver.verify("abc");
-    }*/
+    public static void accountExistsMessage(){
+        JFrame accountExistsFrame = new JFrame();
+        accountExistsFrame.setSize(400, 100);
+        accountExistsFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        JPanel accountExistsPanel = new JPanel();
+        accountExistsPanel.setLayout(null);
+        accountExistsFrame.add(accountExistsPanel);
+        JLabel errorMessage = new JLabel("An account with this username or email already exists");
+        errorMessage.setBounds(10,20, 350, 20);
+        accountExistsPanel.add(errorMessage);
+        accountExistsFrame.setVisible(true);
+    }
+
+    public static void verificationSuccessMessage(){
+        JFrame verificationSuccessFrame = new JFrame();
+        verificationSuccessFrame.setSize(400, 100);
+        verificationSuccessFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        JPanel verificationSuccessPanel = new JPanel();
+        verificationSuccessPanel.setLayout(null);
+        verificationSuccessFrame.add(verificationSuccessPanel);
+        JLabel errorMessage = new JLabel("Could not verify please try again");
+        errorMessage.setBounds(10,20, 350, 20);
+        verificationSuccessPanel.add(errorMessage);
+        verificationSuccessFrame.setVisible(true);
+    }
 
     @Override
     public void actionPerformed(ActionEvent e) {
@@ -79,7 +111,7 @@ public void actionPerformed(ActionEvent e) {
             database.createUser(this.username, this.password, this.email, "Basic");
             System.out.println("Verification successful");
         }else{
-            System.out.println("Could not verify please try again");
+            verificationSuccessMessage();
         }
     }
 }

src/main/java/UI/UserRegistrationController.java renamed to src/main/java/ControllersPresentersGateways/UserRegistrationController.java

@@ -0,0 +1,62 @@
+package ControllersPresentersGateways;
+
+import UseCase.UserCreator;
+
+public class UserRegistrationGateway {
+    private String username;
+    private String password;
+    private String email;
+    private boolean userExists = false;
+    private int code;
+    private UserCreator database;
+
+    private String preference;
+
+    public void setUsername(String username){
+        this.username = username;
+    }
+    public String getUsername(){
+        return this.username;
+    }
+
+    public void setPassword(String password){
+        this.password = password;
+    }
+    public String getPassword(){
+        return this.password;
+    }
+
+    public void setEmail(String email){
+        this.email = email;
+    }
+    public String getEmail(){
+        return this.email;
+    }
+
+    public void setUserExists(boolean userExists) {
+        this.userExists = userExists;
+    }
+
+    public boolean isUserExists() {
+        return userExists;
+    }
+
+    public int getCode() {
+        return code;
+    }
+    public void setCode(int code){
+        this.code = code;
+    }
+
+    public void setDatabase(UserCreator database) {
+        this.database = database;
+    }
+
+    public UserCreator getDatabase(){
+        return this.database;
+    }
+
+    public void setPreference(String preference) {
+        this.preference = preference;
+    }
+}

src/main/java/ControllersPresentersGateways/UserRegistrationGateway.java

@@ -0,0 +1,5 @@
+package ControllersPresentersGateways;
+
+public interface UserRegistrator {
+    void registerUser();
+}

src/main/java/ControllersPresentersGateways/UserRegistrator.java

@@ -1,7 +1,7 @@
 package UI;
 
-import Controllers.IRetrieveList;
-import Controllers.UserExists;
+import ControllersPresentersGateways.IRetrieveList;
+import ControllersPresentersGateways.UserExists;
 import Entities.User;
 import Entities.UserFactory;
 import UseCase.UserCreator;
@@ -78,14 +78,6 @@ public List<User> getList() {
             ObjectInputStream in = new ObjectInputStream(fileIn)) {
 
             users = (ArrayList<User>) in.readObject();
-            /*
-            while(true){
-                try{
-                    Entities.User user = (Entities.User) in.readObject();
-                    users.add(user);}
-                catch(EOFException e){
-                    break;
-                }*/
             return users;
         }catch(EOFException e){
             return users;

src/main/java/UI/UserDatabase.java

@@ -1,9 +1,12 @@
 package UI;
 
+import ControllersPresentersGateways.UserRegistrationController;
+import ControllersPresentersGateways.UserRegistrationGateway;
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.util.Random;
 
 public class UserRegistrationUI implements ActionListener {
     private final UserDatabase database;
@@ -12,16 +15,16 @@ public class UserRegistrationUI implements ActionListener {
     private JTextField passwordText;
     private JTextField emailText;
     private JButton register;
-
+    private static JButton phoneVerify = new JButton("Phone");
+    private static JButton emailVerify = new JButton("Email");
     private final int code;
 
     public UserRegistrationUI(UserDatabase database) {
         this.database = database;
         /*TODO: For now the code is 389 for testing purposes, but once UI.UserVerificationUI.sendVerificationCode() is
             implemented this will be a random integer.
         */
-        /*code = new Random().nextInt(1244254);*/
-        code = 389;
+        code = new Random().nextInt(1244254);
     }
     void GetUserCredentials(){
         //Front end related objects
@@ -72,22 +75,27 @@ void GetUserCredentials(){
 
         registerFrame.setVisible(true);
     }
-    /*@Override*/
-    /*public void registerUser(String username, String password, String email) {
-        if(database.UserExists(username, email)){
-            registrationSuccess.setText("The username or password is already in use, please try again");
-        }else{
-            registrationSuccess.setText("Please verify to create your account");
-            UserVerificationUI verifyUser = new UserVerificationUI(code, email);
-            if(verifyUser.verify(email)){
-                database.createUser(username, password, email, "Basic");
-                registrationSuccess.setText("Your account is now created");
-            }else{
-                registrationSuccess.setText("You could not be verified, please try again");
-            };
-        }
-    }*/
-    //For Testing purposes
+
+    public void getPreferredDeliveryMethod(){
+        JFrame preference = new JFrame();
+        preference.setSize(400, 200);
+        JPanel preferancePanel = new JPanel();
+        preference.add(preferancePanel);
+
+        JLabel message = new JLabel("Send verification code via:");
+        message.setBounds(30, 120, 300, 20);
+        preferancePanel.add(message);
+
+        emailVerify.setBounds(30, 150, 140, 25);
+        emailVerify.addActionListener(this);
+        phoneVerify.setBounds(150, 150, 140, 25);
+        phoneVerify.addActionListener(this);
+        preferancePanel.add(emailVerify);
+        preferancePanel.add(phoneVerify);
+        preference.setVisible(true);
+
+    }
+
     public static void main(String[] args){
         UserDatabase testDB = new UserDatabase(new File("Test5"));
         System.out.println(testDB.UserExists("RandomUser", "[email protected]"));
@@ -102,7 +110,20 @@ public void actionPerformed(ActionEvent e) {
         String username = usernameText.getText();
         String password = passwordText.getText();
         String email = emailText.getText();
-        UserRegistrationController verifyUser = new UserRegistrationController(code, username, password, email, database);
-        verifyUser.registerUser();
+
+        UserRegistrationGateway properties = new UserRegistrationGateway();
+        properties.setUsername(username);
+        properties.setPassword(password);
+        properties.setEmail(email);
+        properties.setUserExists(database.UserExists(username, email));
+        properties.setCode(code);
+        properties.setDatabase(this.database);
+        getPreferredDeliveryMethod();
+        //Not an error below, we just have not implemented sending code via phone yet.
+        if(e.getSource() == emailVerify || e.getSource() == phoneVerify){
+            properties.setPreference("Email");
+            UserRegistrationController verifyUser = new UserRegistrationController(properties);
+            verifyUser.registerUser();
+        }
     }
 }

src/main/java/UI/UserRegistrationUI.java

@@ -1,10 +1,50 @@
 package UseCase;
+import java.util.Properties;
+import javax.mail.*;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
 
-import javax.mail.Session;
 public class EmailDelivery implements ISendVerificationCode {
     public void sendVerificationCode(String email, int code){
         /*TODO: When this is implemented, the verification code will be sent to the email specified by String email*/
         System.out.println("Verification code sent to " + email);
 
+        //email address we will send the code to
+        String to = email;
+
+        //email address we are sending from
+        String from = "[email protected]";
+
+        //Get System properties
+        Properties properties = System.getProperties();
+
+        //Setting up the mail server
+        properties.put("mail.smtp.host", "smtp.gmail.com");
+        properties.put("mail.smtp.port", "465");
+        properties.put("mail.smtp.ssl.enable", "true");
+        properties.put("mail.smtp.auth", "true");
+
+        Session session = Session.getInstance(properties, new javax.mail.Authenticator(){
+            @Override
+            protected PasswordAuthentication getPasswordAuthentication() {
+                return new PasswordAuthentication("[email protected]", "gker cnno jcxv psou");
+            }
+        });
+
+        session.setDebug(true);
+
+        try{
+            MimeMessage message = new MimeMessage(session);
+            message.setFrom(from);
+            message.addRecipient(Message.RecipientType.TO, new InternetAddress(to));
+            message.setSubject("Verification Code for registration");
+            message.setText("The verification code for your account is " + code + ". If this was not you, you can safely " +
+                    "ignore this email");
+            Transport.send(message);
+            System.out.println("success");
+        } catch (MessagingException e) {
+            throw new RuntimeException(e);
+        }
+
     }
 }