Changeset 1492 for trunk

Timestamp:

12/05/19 11:54:59 (4 years ago)

Author:

bnemhaus

Message:

You cannot nominate yourself as one of your trusted colleagues for pw recovery.

File:

• trunk/src/org/expeditee/auth/Actions.java (modified) (1 diff)

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

@@ -242 +242 @@
                         String colleagueOne = userData.get(AuthenticationTag.TrustedUserOne);
                         String colleagueTwo = userData.get(AuthenticationTag.TrustedUserTwo);
-                        AuthSubmitTrustedUsersPasswordRecovery(colleagueOne, colleagueTwo);
-//                      Path colleagueOnePath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueOne + "-credentials");
-//                      Path colleagueTwoPath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueTwo + "-credentials");
-//                      if (!colleagueOnePath.toFile().exists()) {
-//                              MessageBay.errorMessage("Your nominated trusted user: " + colleagueOne + " must exist in your contacts.");
-//                      } else if (!colleagueTwoPath.toFile().exists()) {
-//                              MessageBay.errorMessage("Your nominated trusted user: " + colleagueTwo + " must exist in your contacts.");
-//                      } else {
-//                              userData.put(AuthenticationTag.Username, UserSettings.UserName.get());
-//                              boolean success = submitTrustedUsersPasswordRecovery(userData);
-//                              if (success) {
-//                                      Collection<Item> toShow = getByData(currentFrame, "ShowOnProgress");
-//                                      for (Item i: toShow) {
-//                                              i.setVisible(true);
-//                                      }
-//                                      currentFrame.change();
-//                                      MessageBay.displayMessage("-------Messages sent-------");
-//                              }
-//                              FrameIO.SaveFrame(currentFrame);
-//                              DisplayController.requestRefresh(false);
-//                      }
+                        String username = UserSettings.UserName.get().toLowerCase();
+                        if (colleagueOne.toLowerCase().equals(username) || colleagueTwo.toLowerCase().equals(username)) {
+                                MessageBay.displayMessage("You cannot nominate yourself as one of your trusted colleagues.");
+                        } else {
+                                AuthSubmitTrustedUsersPasswordRecovery(colleagueOne, colleagueTwo);
+                        }
                 }
         }