Changeset 1334 for trunk/src/org/expeditee/auth/AuthenticatorBrowser.java

Timestamp:

04/29/19 13:13:48 (5 years ago)

Author:

bln4

Message:

Refactoring only

File:

• trunk/src/org/expeditee/auth/AuthenticatorBrowser.java (modified) (7 diffs)

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

@@ -44 +44 @@
 
 import org.expeditee.actions.Actions;
-import org.expeditee.auth.tags.Constants;
 import org.expeditee.core.Dimension;
 import org.expeditee.core.Point;
@@ -182 +181 @@
                 final File keyStoreFile = new File(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME);
                 if (!keyStoreFile.exists()) { 
-                        keyStore.load(null, Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
+                        keyStore.load(null, "ExpediteeAuthPassword".toCharArray());
                 } else {
                         try (final InputStream in = new FileInputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME)) {
-                                keyStore.load(in, Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
+                                keyStore.load(in, "ExpediteeAuthPassword".toCharArray());
                         }
                 }
@@ -324 +323 @@
                 final KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(password.toCharArray());
                 keyStore.setEntry(label, entry, entryPassword);
-                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
+                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
         }
         
@@ -335 +334 @@
                         } else if (entry.getSecretKey().getEncoded() == TRUE) {
                                 keyStore.deleteEntry(email + username);
-                                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
+                                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
                                 return true;
                         } else { return false; }
@@ -354 +353 @@
                 final KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(intergalacticNumber.toCharArray());
                 keyStore.setEntry(email + username, entry, entryPassword);
-                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
+                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
                 
                 return intergalacticNumber;
@@ -392 +391 @@
                 KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(KeyList.PersonalKey.get().getText().toCharArray());
                 keyStore.setEntry(username + "colleaguesRequested", entry, entryPassword);
-                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
+                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
         }
         
@@ -399 +398 @@
                 KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(KeyList.PersonalKey.get().getText().toCharArray());
                 keyStore.setEntry(username + "colleaguesRequested", entry, entryPassword);
-                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), Constants.CREDENTIALS_KEYSTORE_PASSWORD.toCharArray());
+                keyStore.store(new FileOutputStream(FrameIO.PARENT_FOLDER + KEYSTOREFILENAME), "ExpediteeAuthPassword".toCharArray());
         }