Changeset 1287 for trunk

Timestamp:

04/05/19 13:21:26 (5 years ago)

Author:

bln4

Message:

Updated VM property auth to expeditee.authentication.
Added two static functions to AuthenticationBrowser to help with the language used to determine if a user is authenticated (isAuthenticated and isAuthenticationRequired)

Location:

trunk/src/org/expeditee

Files:

• auth/AuthenticatorBrowser.java (modified) (1 diff)
• gui/Browser.java (modified) (3 diffs)
• gui/FrameIO.java (modified) (1 diff)
• settings/UserSettings.java (modified) (2 diffs)

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

@@ -90 +90 @@
         }
         
+        public static boolean isAuthenticationRequired() {
+                return Boolean.getBoolean("expeditee.authentication");
+        }
+        
+        public static boolean isAuthenticated() {
+                return isAuthenticationRequired() && !UserSettings.UserName.get().equals(Browser.USER_NOBODY);
+        }
+        
         private AuthenticatorBrowser() throws KeyStoreException, FileNotFoundException, IOException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException {
                 super("Authentication");

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

@@ -165 +165 @@
          */
         public static void main(String[] args) {
-                if (Boolean.getBoolean("auth")) {
+                if (Boolean.getBoolean("expeditee.authentication")) {
                         String starting_user_name = System.getProperty("user.name");
                         System.setProperty("startinguser.name", starting_user_name);
@@ -203 +203 @@
         
         public static void init() {
-                if (Boolean.getBoolean("auth")) {
+                if (Boolean.getBoolean("expeditee.authentication")) {
                         try {
                                 _theBrowser = AuthenticatorBrowser.getInstance();
@@ -274 +274 @@
                 Frame userProfile = loadProfiles();
 
-                if (!Boolean.getBoolean("auth")) {
+                if (!Boolean.getBoolean("expeditee.authentication")) {
                         String userName = UserSettings.ProfileName.get();
                         FrameIO.setupPersonalResources(userName);

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

@@ -165 +165 @@
                 }
                 
-                if (!UserSettings.PublicAndPrivateResources || UserSettings.UserName.get().equals(Browser.USER_NOBODY)) {
+                if (!UserSettings.PublicAndPrivateResources || !AuthenticatorBrowser.isAuthenticated()) {
                         
                         if (System.getProperty("user.name").equals(Browser.USER_NOBODY)) {

trunk/src/org/expeditee/settings/UserSettings.java

@@ -30 +30 @@
 import org.expeditee.agents.mail.MailSession;
 import org.expeditee.agents.wordprocessing.JSpellChecker;
-import org.expeditee.gui.Browser;
+import org.expeditee.auth.AuthenticatorBrowser;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -241 +241 @@
 
         public static void appendDefaultFolders() {
-                if (PublicAndPrivateResources && !UserSettings.UserName.get().equals(Browser.USER_NOBODY)) {
+                if (PublicAndPrivateResources && AuthenticatorBrowser.isAuthenticated()) {
                         // The comments here explain how things have changed with the new regime.
                         // FrameDirs