Changeset 1231 for trunk

Timestamp:

02/04/19 13:44:32 (5 years ago)

Author:

bln4

Message:

See last

File:

• trunk/src/org/expeditee/auth/Actions.java (modified) (5 diffs)

trunk/src/org/expeditee/auth/Actions.java

@@ -82 +82 @@
         public static void AuthCreateAccount() throws Exception {
                 final Collection<Text> textItems = DisplayController.getCurrentFrame().getTextItems();
-                final Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, AuthenticationTag.Username, AuthenticationTag.Password, AuthenticationTag.PasswordAgain);
+                final Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.Username, AuthenticationTag.Password, AuthenticationTag.PasswordAgain);
                 if (userdata.isPresent()) { 
                         final Map<AuthenticationTag, String> userData = userdata.get();
@@ -105 +105 @@
         public static void AuthLogin() throws Exception {
                 final Collection<Text> textItems = DisplayController.getCurrentFrame().getTextItems();
-                final Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, AuthenticationTag.Username, AuthenticationTag.Password);
+                final Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.Username, AuthenticationTag.Password);
                 if (userdata.isPresent()) { 
                         login(userdata.get());
@@ -133 +133 @@
                         MessageBay.errorMessage("You must be logged in to change your password.");
                 } else {
-                        final Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, AuthenticationTag.Password, AuthenticationTag.NewPassword, AuthenticationTag.NewPasswordAgain);
+                        final Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.Password, AuthenticationTag.NewPassword, AuthenticationTag.NewPasswordAgain);
                         if (userdata.isPresent()) {
                                 final Map<AuthenticationTag, String> userData = userdata.get();
@@ -158 +158 @@
                         MessageBay.errorMessage("You must be logged in to perform this action.");
                 } else { 
-                        Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, AuthenticationTag.Email);
+                        Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.Email);
                         if (userdata.isPresent()) {
                                 Map<AuthenticationTag, String> userData = userdata.get();
@@ -211 +211 @@
                         MessageBay.errorMessage("You must be logged in to perform this action.");
                 } else {
-                        Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, AuthenticationTag.ColleagueOne, AuthenticationTag.ColleagueTwo);
+                        Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.ColleagueOne, AuthenticationTag.ColleagueTwo);
                         if (userdata.isPresent()) {
                                 Map<AuthenticationTag, String> userData = userdata.get();