Changeset 1316 for trunk/src/org/expeditee/auth

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/auth

Files:

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

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;
                 }