Changeset 1363 for trunk/src/org/expeditee/auth/account/Authenticate.java

Timestamp:

05/17/19 14:37:12 (5 years ago)

Author:

bln4

Message:

It is now possible to complete the process of recovering access to a Expeditee account. Further work, in the form of frames in the authentication frameset, are to follow.
A refactoring/tidy up has also been completed.

File:

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

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

@@ -25 +25 @@
 import org.expeditee.auth.Actions;
 import org.expeditee.auth.AuthenticatorBrowser;
-import org.expeditee.auth.gui.MailBay;
+import org.expeditee.auth.mail.gui.MailBay;
 import org.expeditee.auth.tags.AuthenticationTag;
 import org.expeditee.gui.Browser;
@@ -41 +41 @@
 public class Authenticate implements CryptographyConstants {
 
+        /**
+         * Given a username and password, potentially login.  
+         * @param userdata
+         * @return AuthenticationResult.SuccessLogin if login works, AuthenticationResult.ErrorLoginNobody or AuthenticationResult.ErrorLoginUsernamePasswordCombo otherwise.
+         */
         public static AuthenticationResult login(Map<AuthenticationTag, String> userdata) {
                 String username = userdata.get(AuthenticationTag.Username);
@@ -76 +81 @@
                                         if(data != null && data.contains("MultiuserCredentials")) {
                                                 AuthenticatorBrowser.CREDENTIALS_FRAME = f.getNumber();
+                                        } else if (data != null && data.contains("PasswordColleagues")) {
+                                                AuthenticatorBrowser.PASSWORD_RECOVERY_FRAME = f.getNumber();
+                                        } else if (data != null && data.contains("SecretsFrame")) {
+                                                AuthenticatorBrowser.SECRETS_FRAME = f.getNumber();
                                         }
-                                }
+                                }
                         }
                         
@@ -103 +112 @@
                                         byte[] keyBytes = Base64.getDecoder().decode(keyEncoded);
                                         PrivateKey key = KeyFactory.getInstance(AsymmetricAlgorithm).generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
-                                        org.expeditee.auth.Mail.checkMail(key);
+                                        org.expeditee.auth.mail.Mail.checkMail(key);
                                 } else {
                                         res.additionalInfo.add("No private key present: your communication with other Expeditee users will be limited until this is resolved.");
@@ -129 +138 @@
         }
         
+        /**
+         * Logs out the current authenticated user.
+         * @return AuthenticationResult.SuccessLogout to signal the logout has occured.
+         */
         public static AuthenticationResult logout() {
                 // Set user to nobody.