Changeset 1472 for trunk

Timestamp:

12/03/19 11:29:52 (4 years ago)

Author:

bnemhaus

Message:

Some bug fixes to the password recovery process. Colleague has changed to User in some places.

File:

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

trunk/src/org/expeditee/auth/account/Password.java

@@ -166 +166 @@
                 Frame pwColleagueFrame = FrameIO.LoadFrame(username + number, FrameIO.PROFILE_PATH);
                 Collection<Text> textItems = pwColleagueFrame.getTextItems();
-                textItems.removeIf(text -> !text.getText().startsWith("Colleague"));
+                textItems.removeIf(text -> !text.getText().startsWith("User_"));
                 
                 String[] ret = new String[4];
@@ -172 +172 @@
                 while(it.hasNext()) {
                         String content = it.next().getText().toLowerCase().trim();
-                        if (content.contains("colleague_one:")) {
-                                ret[0] = content.replace("colleague_one:", "").trim();
-                        } else if (content.contains("colleague_two:")) {
-                                ret[1] = content.replace("colleague_two:", "").trim();
+                        if (content.contains("user_one:")) {
+                                ret[0] = content.replace("user_one:", "").trim();
+                        } else if (content.contains("user_two:")) {
+                                ret[1] = content.replace("user_two:", "").trim();
                         }
                 }
@@ -233 +233 @@
                         @Override
                         protected PasswordAuthentication getPasswordAuthentication() {
-                                return new PasswordAuthentication("noreply.expeditee", "intergalacticnumber");
+                                //return new PasswordAuthentication("noreply.expeditee", "intergalacticnumber");
+                                return new PasswordAuthentication("noreply.expeditee", "exped!tee");
                         };
                 });
@@ -252 +253 @@
                 Frame pwRecoveryFrame = FrameIO.LoadFrame(UserSettings.UserName.get() + AuthenticatorBrowser.PASSWORD_RECOVERY_FRAME);
                 Collection<Text> textItems = pwRecoveryFrame.getTextItems();
-                textItems.removeIf(t -> !t.getText().toLowerCase().startsWith("colleague"));
+                textItems.removeIf(t -> !t.getText().toLowerCase().startsWith("user_"));
                 
                 // Find colleague one and two text items.  Set appropriate values.
@@ -258 +259 @@
                 while (it.hasNext()) {
                         Text text = it.next();
-                        if (text.getText().toLowerCase().startsWith("colleague_one:")) {
-                                text.setText("Colleague_one: " + colleagueOne);
+                        if (text.getText().toLowerCase().startsWith("user_one:")) {
+                                text.setText("User_one: " + colleagueOne);
                                 Colleagues.User_One.set(colleagueOne);
-                        } else if (text.getText().toLowerCase().startsWith("colleague_two:")) {
-                                text.setText("Colleague_two:" + colleagueTwo);
+                        } else if (text.getText().toLowerCase().startsWith("user_two:")) {
+                                text.setText("User_two:" + colleagueTwo);
                                 Colleagues.User_Two.set(colleagueTwo);
                         }