Changeset 1316 for trunk

Timestamp:

04/16/19 10:41:54 (5 years ago)

Author:

bln4

Message:

Fixed exceptions being thrown incorrectly in following situations:

Incorrect login
Existing account on account creation
ToggleBay action run but not logged in

Location:

trunk/src/org/expeditee

Files:

• auth/Actions.java (modified) (2 diffs)
• auth/account/Authenticate.java (modified) (1 diff)
• gui/FrameIO.java (modified) (2 diffs)

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

@@ -111 +111 @@
          */
         public static void ToggleBay() throws KeyStoreException, FileNotFoundException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException, IOException, ParseException {
+                if (!AuthenticatorBrowser.isAuthenticated()) return;
                 if (!DisplayController.isMailMode()) {
                         MailBay.ensureLink();
@@ -160 +161 @@
                         Map<AuthenticationTag, String> userData = userdata.get();
                         
-                        // A profile already existing with 'username' means an account cannot be created with that username.
-                        if (FrameIO.LoadProfile(userData.get(AuthenticationTag.Username)) != null) {
+                        // A profile already existing with 'username' means an account cannot be created with that username.                    
+                        if (FrameIO.getProfilesList().contains(userData.get(AuthenticationTag.Username))) {
                                 MessageBay.errorMessage(Constants.ERROR_PROFILE_NAME_PREEXISTS);
                                 return;

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

@@ -59 +59 @@
                         personalKey = AuthenticatorBrowser.getInstance().getSecretKey(username, password);
                 } catch (Exception e) {
+                        return AuthenticationResult.ErrorLoginUsernamePasswordCombo;
+                }
+                
+                if (personalKey == null) {
                         return AuthenticationResult.ErrorLoginUsernamePasswordCombo;
                 }

trunk/src/org/expeditee/gui/FrameIO.java

@@ -376 +376 @@
                         List<String> directoriesToSearch = FolderSettings.FrameDirs.getAbsoluteDirs();
                         
-                        if (AuthenticatorBrowser.Authenticated) {
-                                // if we are running Expeditee Authenticated, consult user profile as location for framesets first
-                                String profilePath = FrameIO.PROFILE_PATH + UserSettings.UserName.get() + File.separator;
-                                directoriesToSearch.add(0, profilePath);
-                        } 
+//                      if (AuthenticatorBrowser.Authenticated) {
+//                              // if we are running Expeditee Authenticated, consult user profile as location for framesets first
+//                              String profilePath = FrameIO.PROFILE_PATH + UserSettings.UserName.get() + File.separator;
+//                              directoriesToSearch.add(0, profilePath);
+//                      } 
                         
                         for (String path : directoriesToSearch) {
@@ -425 +425 @@
                 list.deleteCharAt(list.length() - 1);
                 return list.toString();
+        }
+        
+        /**
+         * Gets a list of all the profiles available to the user
+         * 
+         * @return a list containing all the available framesets on separate lines
+         */
+        public static List<String> getProfilesList() {
+                List<File> potentialProfiles = Arrays.asList(new File(FrameIO.PROFILE_PATH).listFiles());
+                potentialProfiles.removeIf(file -> !file.isDirectory());
+                return potentialProfiles.stream().map(dir -> dir.getName()).collect(Collectors.toList());
         }