9-feature-1-user-registration

.gitignore

@@ -1,14 +1,14 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff
+# entities.user_entities.User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
 
-# AWS User-specific
+# AWS entities.user_entities.User-specific
 .idea/**/aws.xml
 
 # Generated files

build.gradle

@@ -7,6 +7,8 @@ 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/BasicUser.java → src/main/java/Entities/user_entities/BasicUser.java

@@ -1,4 +1,6 @@
-public class BasicUser extends User{
+package Entities.user_entities;
+
+public class BasicUser extends User {
     public BasicUser(String Username, String Password, String Email){
         super(Username, Password, Email);
     }

src/main/java/User.java → src/main/java/Entities/user_entities/User.java

@@ -1,5 +1,7 @@
+package Entities.user_entities;
+import UseCase.Changeable;
 import java.io.Serializable;
-public abstract class User implements Serializable, Changeable{
+public abstract class User implements Serializable, Changeable {
     protected String username;
     protected String password;
     protected String email;
@@ -21,7 +23,7 @@ private String getPassword(){
     }
 
     @Override
-//    from Changeable
+//    from UseCase.Changeable
     public void changeFeature(String feature, String newFeature){
         if (feature == "Username"){
             this.username = newFeature;

src/main/java/UserFactory.java → src/main/java/Entities/user_entities/UserFactory.java

@@ -1,3 +1,5 @@
+package Entities.user_entities;
+
 public class UserFactory {
     //Following the factory design pattern, just in case in the future we decide to add various different types of Users
     public static User BirthUser(String Username, String Password, String Email, String type){

src/main/java/Changeable.java → src/main/java/UseCase/Changeable.java

@@ -1,3 +1,5 @@
+package UseCase;
+
 public interface Changeable {
     void changeFeature(String feature, String newFeature);
 }

src/main/java/UserDatabase.java → src/main/java/data_access/UserDatabase.java

@@ -1,32 +1,35 @@
+package data_access;
+
+import interface_adapters.IRetrieveList;
+import interface_adapters.user_registration_interface_adapters.UserExists;
+import Entities.user_entities.User;
+import Entities.user_entities.UserFactory;
+import use_cases.user_login_use_case.UserCreator;
+import interface_adapters.UserRetriever;
+
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
-public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList{
+public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList {
     File accounts;
     List<User> accountList;
+    public UserDatabase(){
+        this.accounts = new File("TestUserDatabase3.csv");
+        this.accountList = this.getList();
+    }
     public UserDatabase(File accounts){
+        if(!accounts.exists()){
+            try {
+                accounts.createNewFile();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
         this.accounts = accounts;
         this.accountList = this.getList();
     }
     @Override
     public boolean UserExists(String username, String email) {
-        /*User user = null;
-        try(FileInputStream fileIn = new FileInputStream(accounts);
-        ObjectInputStream in = new ObjectInputStream(fileIn)){
-            do{
-                try{
-                    user = (User)in.readObject();
-                }catch(NullPointerException e){
-                    user = null;
-                    break;
-                }
-            }while(!user.getEmail().equals(email) && !user.getUsername().equals(username));
-        }catch(IOException e){
-            e.printStackTrace();
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-        return user != null;*/
         for(User user: this.accountList){
             if(user.getUsername().equals(username) || user.getEmail().equals(email)){
                 return true;
@@ -41,10 +44,10 @@ public boolean UserExists(String username, String email) {
     @Override
     public void createUser(String username, String password, String email, String type){
         User newUser = UserFactory.BirthUser(username, password, email, type);
+        this.accountList.add(newUser);
         try(FileOutputStream fileOut = new FileOutputStream(accounts)){
             try(ObjectOutputStream out = new ObjectOutputStream(fileOut)){
-                out.writeObject(newUser);
-                this.accountList.add(newUser);
+                out.writeObject(this.accountList);
                 out.close();
                 fileOut.close();
             }catch(Exception e){
@@ -72,19 +75,14 @@ public User getUser(String username) {
     public List<User> getList() {
         List<User> users = new ArrayList<>();
         try(FileInputStream fileIn = new FileInputStream(accounts);
-            ObjectInputStream in = new ObjectInputStream(fileIn)){
-            /*User user = (User) in.readObject();*/
-            while(true){
-                try{
-                    User user = (User) in.readObject();
-                    users.add(user);}
-                catch(EOFException e){
-                    break;
-                }
-            }
-        }catch(Exception e){
-            e.printStackTrace();
+            ObjectInputStream in = new ObjectInputStream(fileIn)) {
+
+            users = (ArrayList<User>) in.readObject();
+            return users;
+        }catch(EOFException e){
+            return users;
+            } catch (IOException | ClassNotFoundException ex) {
+            throw new RuntimeException(ex);
         }
-        return users;
     }
 }

src/main/java/IRetrieveList.java → src/main/java/interface_adapters/IRetrieveList.java

@@ -1,3 +1,5 @@
+package interface_adapters;
+import Entities.user_entities.User;
 import java.util.List;
 
 public interface IRetrieveList {

src/main/java/interface_adapters/UserRetriever.java

@@ -0,0 +1,8 @@
+package interface_adapters;
+
+import Entities.user_entities.User;
+import interface_adapters.user_registration_interface_adapters.UserExists;
+
+public interface UserRetriever extends UserExists {
+    User getUser(String username);
+}

src/main/java/UserExists.java → src/main/java/interface_adapters/user_registration_interface_adapters/UserExists.java

@@ -1,3 +1,5 @@
+package interface_adapters.user_registration_interface_adapters;
+
 public interface UserExists {
     boolean UserExists(String username, String password);
 }

src/main/java/interface_adapters/user_registration_interface_adapters/UserRegistrationController.java

@@ -0,0 +1,116 @@
+package interface_adapters.user_registration_interface_adapters;
+
+import use_cases.user_login_use_case.UserCreator;
+import use_cases.user_login_use_case.verificationMethodFactory;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Random;
+public class UserRegistrationController implements UserVerifier, ActionListener, UserRegistrator {
+    private final String username;
+    private final String password;
+    private final String email;
+    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){
+        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.DISPOSE_ON_CLOSE);
+        JPanel verificationPanel = new JPanel();
+        verificationFrame.add(verificationPanel);
+
+        verificationPanel.setLayout(null);
+        JLabel verificationLabel = new JLabel("Verification Code");
+        verificationLabel.setBounds(10,25, 200, 25);
+        verificationCodeText = new JTextField();
+        verificationCodeText.setBounds(125, 20, 165, 25);
+
+        verificationPanel.add(verificationLabel);
+        verificationPanel.add(verificationCodeText);
+
+        //Success/Failure Labels
+        success = new JLabel("");
+        success.setBounds(10, 50, 100, 25);
+        verificationPanel.add(success);
+
+        JButton verifyButton = new JButton("verify");
+        verifyButton.setBounds(125, 50, 100, 25);
+        verificationPanel.add(verifyButton);
+        verifyButton.addActionListener(this);
+        verificationFrame.setVisible(true);
+
+        verificationMethodFactory mailMan = new verificationMethodFactory(email, "Email", code);
+        mailMan.deliverCode();
+    }
+
+    public void registerUser() {
+        if(this.userExists){
+            System.out.println("An account with this username or email already exists");
+            accountExistsMessage();
+        }else{
+            this.verify(email);
+        }
+    }
+
+    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) {
+        int verCode = Integer.parseInt(verificationCodeText.getText());
+        if(verCode == this.code){
+            database.createUser(this.username, this.password, this.email, "Basic");
+            System.out.println("Verification successful");
+        }else{
+            verificationSuccessMessage();
+        }
+    }
+}

src/main/java/interface_adapters/user_registration_interface_adapters/UserRegistrationGateway.java

@@ -0,0 +1,62 @@
+package interface_adapters.user_registration_interface_adapters;
+
+import use_cases.user_login_use_case.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/interface_adapters/user_registration_interface_adapters/UserRegistrator.java

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

src/main/java/interface_adapters/user_registration_interface_adapters/UserVerifier.java

@@ -0,0 +1,5 @@
+package interface_adapters.user_registration_interface_adapters;
+
+public interface UserVerifier {
+    void verify(String email);
+}