[W5.11][T13-3]Bhatt Paras Krishna

docs/UserGuide.adoc

@@ -29,6 +29,7 @@ Please refer to the <<DeveloperGuide#setting-up, Setting up>> section to learn h
 . `cd` into the project's `out\production\addressbook-level2` directory
 . Type `java seedu.addressbook.Main`, then Enter to execute
 . Now you can interact with the program through the CLI
+. Enter the username and password. The default username is 'user', and default password is 'pass'.
 
 == Changes from level 1
 

src/seedu/addressbook/Main.java

@@ -24,7 +24,6 @@ public class Main {
 
     /** Version info of the program. */
     public static final String VERSION = "AddressBook Level 2 - Version 1.0";
-
     private TextUi ui;
     private StorageFile storage;
     private AddressBook addressBook;

src/seedu/addressbook/commands/Command.java

@@ -13,9 +13,6 @@
  */
 public class Command {
     protected AddressBook addressBook;
-    protected List<? extends ReadOnlyPerson> relevantPersons;
-    private int targetIndex = -1;
-
     /**
      * @param targetIndex last visible listing index of the target person
      */
@@ -26,6 +23,9 @@ public Command(int targetIndex) {
     protected Command() {
     }
 
+    protected List<? extends ReadOnlyPerson> relevantPersons;
+    private int targetIndex = -1;
+
     /**
      * Constructs a feedback message to summarise an operation that displayed a listing of persons.
      *

src/seedu/addressbook/ui/TextUi.java

@@ -20,6 +20,11 @@
  * Text UI of the application.
  */
 public class TextUi {
+    private  static  final String USERNAME = "user";
+    private  static final String PASSWORD = "pass";
+    private static final String ENTER_USERID_PROMPT = "Enter the username and password: ";
+    private static final String PASSWORD_CORRECT_MESSAGE = "Granting access...";
+    private static final String PASSWORD_INCORRECT_MESSAGE = "Incorrect Username/Password...";
 
     /** A decorative prefix added to the beginning of lines printed by AddressBook */
     private static final String LINE_PREFIX = "|| ";
@@ -49,6 +54,16 @@ public TextUi() {
     public TextUi(InputStream in, PrintStream out) {
         this.in = new Scanner(in);
         this.out = out;
+        showToUser(ENTER_USERID_PROMPT);
+        String usernameEntered = this.getUserInput();
+        String passwordEntered = this.getUserInput();
+        while(!usernameEntered.equals(USERNAME) || !passwordEntered.equals(PASSWORD)) {
+            showToUser(PASSWORD_INCORRECT_MESSAGE);
+            showToUser(ENTER_USERID_PROMPT);
+            usernameEntered = this.getUserInput();
+            passwordEntered = this.getUserInput();
+        }
+        showToUser(PASSWORD_CORRECT_MESSAGE);
     }
 
     /**
@@ -72,6 +87,15 @@ private boolean isCommentLine(String rawInputLine) {
         return rawInputLine.trim().matches(COMMENT_LINE_FORMAT_REGEX);
     }
 
+    public String getUserInput() {
+        String fullInputLine = in.nextLine();
+
+        // silently consume all ignored lines
+        while (shouldIgnore(fullInputLine)) {
+            fullInputLine = in.nextLine();
+        }
+        return fullInputLine;
+    }
     /**
      * Prompts for the command and reads the text entered by the user.
      * Ignores empty, pure whitespace, and comment lines.
@@ -80,15 +104,9 @@ private boolean isCommentLine(String rawInputLine) {
      */
     public String getUserCommand() {
         out.print(LINE_PREFIX + "Enter command: ");
-        String fullInputLine = in.nextLine();
-
-        // silently consume all ignored lines
-        while (shouldIgnore(fullInputLine)) {
-            fullInputLine = in.nextLine();
-        }
-
-        showToUser("[Command entered:" + fullInputLine + "]");
-        return fullInputLine;
+        String input = getUserInput();
+        showToUser("[Command entered:" + input + "]");
+        return input;
     }
 
 

test/input2.txt

@@ -0,0 +1,15 @@
+##########################
+# should catch invalid password
+##########################
+asakn
+asskdjafnd
+asjdj
+akjdah
+askj
+sjakh
+## correct password
+user
+pass
+## to quit
+exit
+#########################