Merge pull request #87 from aspiringdevslog/v1.2-toBeMerged

this commit resolves #37, #41, #62 and #63: v1.2 Security System; encryption and decryption of data files

docs/AboutUs.adoc

@@ -10,16 +10,16 @@ We are a team based in the http://www.comp.nus.edu.sg[School of Computing, Natio
 
 == Project Team
 
-=== Happytreat
-image::happytreat.png[width="150", align="left"]
+=== SIM MING HUI MELODIES
+image::Happytreat.png[width="150", align="left"]
 {empty}[http://github.com/happytreat[github]] [<<johndoe#, portfolio>>]
 
 Role: Developer +
 Responsibilities:
 
 '''
 
-=== ZhiWei94
+=== TAN ZHI WEI
 image::zhiwei94.png[width="150", align="left"]
 {empty}[http://github.com/ZhiWei94[github]] [<<johndoe#, portfolio>>]
 
@@ -28,7 +28,7 @@ Responsibilities:
 
 '''
 
-=== Chia Wen Kai
+=== CHIA WEN KAI
 image::souless94.png[width="150", align="left"]
 {empty}[http://github.com/souless94[github]] [<<johndoe#, portfolio>>]
 
@@ -37,14 +37,14 @@ Responsibilities:
 
 '''
 
-=== aspiringdevslog
+=== TANG WEE JIE LESLIE
 image::aspiringdevslog.png[width="150", align="left"]
 {empty}[http://github.com/aspiringdevslog[github]] [<<johndoe#, portfolio>>]
 
 Role: Developer +
 Responsibilities:
 
-=== nigelngyy
+=== NG YUAN YUN NIGEL
 image::nigelngyy.png[width="150", align="left"]
 {empty}[http://github.com/nigelngyy[github]] [<<johndoe#, portfolio>>]
 

docs/UserGuide.adoc

@@ -405,7 +405,7 @@ Login into the system. +
 Format: `login u/USERNAME pw/PASSWORD`
 Examples:
 
-* `login u/sampleUser pw/dontUseWeakPassword`
+* `login u/username pw/dontUseWeakPassword`
 
 === Changing password: `update_pw `
 

src/main/java/seedu/address/logic/commands/CreateCommand.java

@@ -1,5 +1,6 @@
 package seedu.address.logic.commands;
 
+import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PASSWORD;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_USERNAME;
@@ -10,12 +11,14 @@
 import seedu.address.model.person.Accounts;
 import seedu.address.storage.UserAccountStorage;
 
+//@@author aspiringdevslog
 /**
  * Creates a user for address book.
  */
 public class CreateCommand extends Command {
 
     public static final String COMMAND_WORD = "create";
+    private static boolean createIsSuccessful = false;
 
     //TODO: update MESSAGE_USAGE
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
@@ -27,8 +30,8 @@ public class CreateCommand extends Command {
             + PREFIX_USERNAME + "username "
             + PREFIX_PASSWORD + "password ";
 
-    public static final String MESSAGE_SUCCESS = "New user added: %1$s";
-    public static final String MESSAGE_FAILURE = "User already exist!";
+    private static final String MESSAGE_SUCCESS = "New user added successfully!";
+    private static final String MESSAGE_FAILURE = "Username already exist.";
 
     private final Accounts newAccount;
 
@@ -40,12 +43,21 @@ public CreateCommand(Accounts account) {
         newAccount = account;
 
         if (!UserAccountStorage.checkDuplicateUser(account.getUsername())) {
-            UserAccountStorage.addNewAccount(newAccount.getUsername(), newAccount.getPassword());
+            UserAccountStorage.addNewAccount(account.getUsername(), account.getPassword());
+            createIsSuccessful = true;
+        } else {
+            createIsSuccessful = false;
         }
     }
 
     @Override
     public CommandResult execute(Model model, CommandHistory history) throws CommandException {
-        return new CommandResult(String.format(MESSAGE_SUCCESS));
+        requireNonNull(model);
+
+        if (createIsSuccessful == true) {
+            return new CommandResult(String.format(MESSAGE_SUCCESS));
+        } else {
+            return new CommandResult(String.format(MESSAGE_FAILURE));
+        }
     }
 }

src/main/java/seedu/address/logic/commands/LoginCommand.java

@@ -1,5 +1,6 @@
 package seedu.address.logic.commands;
 
+import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_PASSWORD;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_USERNAME;
@@ -10,12 +11,14 @@
 import seedu.address.model.person.Accounts;
 import seedu.address.storage.UserAccountStorage;
 
+//@@author aspiringdevslog
 /**
  * Creates a user for address book.
  */
 public class LoginCommand extends Command {
 
     public static final String COMMAND_WORD = "login";
+    private static boolean loginIsSuccessful = false;
 
     //TODO: update MESSAGE_USAGE
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
@@ -27,23 +30,29 @@ public class LoginCommand extends Command {
             + PREFIX_USERNAME + "username "
             + PREFIX_PASSWORD + "password ";
 
-    public static final String MESSAGE_SUCCESS = "Login successful!";
-    public static final String MESSAGE_FAILURE = "Login failed!";
+    private static final String MESSAGE_SUCCESS = "Login successful!";
+    private static final String MESSAGE_FAILURE = "Login failed!";
     //TODO: throw exception message
 
     /**
      * Login
      */
     public LoginCommand(Accounts account) {
         if (UserAccountStorage.checkPasswordMatch(account.getUsername(), account.getPassword())) {
-            System.out.println(MESSAGE_SUCCESS);
+            loginIsSuccessful = true;
         } else {
-            System.out.println(MESSAGE_FAILURE);
+            loginIsSuccessful = false;
         }
     }
 
     @Override
     public CommandResult execute(Model model, CommandHistory history) throws CommandException {
-        return null;
+        requireNonNull(model);
+
+        if (loginIsSuccessful == true) {
+            return new CommandResult(String.format(MESSAGE_SUCCESS));
+        } else {
+            return new CommandResult(String.format(MESSAGE_FAILURE));
+        }
     }
 }

src/main/java/seedu/address/logic/parser/CreateCommandParser.java

@@ -10,8 +10,9 @@
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.person.Accounts;
 
+//@@author aspiringdevslog
 /**
- * Parses input arguments and creates a new AddCommand object
+ * Parses input arguments and creates a new CreateCommand object
  */
 public class CreateCommandParser {
 
@@ -25,11 +26,9 @@ public CreateCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_USERNAME, PREFIX_PASSWORD);
 
-
         String username = ParserUtil.parseUsername(argMultimap.getValue(PREFIX_USERNAME).get());
         String password = ParserUtil.parsePassword(argMultimap.getValue(PREFIX_PASSWORD).get());
 
-
         Accounts account = new Accounts(username, password);
 
         return new CreateCommand(account);

src/main/java/seedu/address/logic/parser/LoginCommandParser.java

@@ -10,6 +10,7 @@
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.person.Accounts;
 
+//@@author aspiringdevslog
 /**
  * Parses input arguments and creates a new AddCommand object
  */

src/main/java/seedu/address/logic/security/Encrypt.java

@@ -0,0 +1,17 @@
+package seedu.address.logic.security;
+
+//@@author aspiringdevslog
+
+/**
+ * Encrypts data before saving
+ */
+public class Encrypt {
+
+    public static String encryptString(String plainString) {
+        return plainString.concat("encrypt123456");
+    }
+
+    public static String decryptString(String encryptedString) {
+        return encryptedString.replace("encrypt123456", "");
+    }
+}

src/main/java/seedu/address/storage/UserAccountStorage.java

@@ -2,6 +2,10 @@
 
 import java.util.HashMap;
 
+import seedu.address.logic.security.Encrypt;
+
+//@@author aspiringdevslog
+
 /**
  * Storage of username and passwords
  */
@@ -12,12 +16,30 @@ public class UserAccountStorage {
     public UserAccountStorage() {
     }
 
+    /**
+     * @param username
+     * @param password
+     */
+
     public static void addNewAccount(String username, String password) {
-        userHashMap.put(username, password);
+        String encryptedPassword = Encrypt.encryptString(password);
+        userHashMap.put(username, encryptedPassword);
     }
 
+    /**
+     * @param username
+     * @param password
+     * @return
+     */
     public static boolean checkPasswordMatch(String username, String password) {
-        return userHashMap.get(username).equals(password);
+        String encryptedPassword = Encrypt.encryptString(password);
+        /*
+        TODO: remove this line, temporary to see output.
+        System.out.print("Encrypted password: " + encryptedPassword +
+        " User entered: " + password + " Stored in hashmap: " + userHashMap.get(username) + " Decrypted password: "
+        + Encrypt.decryptString(userHashMap.get(username)));
+         */
+        return userHashMap.get(username).equals(encryptedPassword);
     }
 
     public static boolean checkDuplicateUser(String username) {