Improve login dialog

git-svn-id: https://svn.argeo.org/commons/trunk@4771 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java
index 7c7104577517c604252fb8a4f4c2cdddb0a69e17..5c83066ee007ea01a1a8182bb96f10e081a189fb 100644 (file)
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java
@@ -171,6 +171,6 @@ public abstract class AbstractLoginDialog extends TrayDialog implements
 
        protected void configureShell(Shell shell) {
                super.configureShell(shell);
-               shell.setText("Autentication");
+               shell.setText("Authentication");
        }
 }

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/keyring/KeyringLoginModule.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/keyring/KeyringLoginModule.java
deleted file mode 100644 (file)
index ba06f88..0000000
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/keyring/KeyringLoginModule.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.argeo.security.ui.keyring;
-
-import java.security.AccessController;
-import java.util.Map;
-import java.util.Set;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-
-import org.apache.commons.logging.LogConfigurationException;
-import org.argeo.util.crypto.PasswordBasedEncryption;
-
-public class KeyringLoginModule implements LoginModule {
-       private Subject subject;
-       private CallbackHandler callbackHandler;
-       private PasswordBasedEncryption passwordBasedEncryption;
-
-       public void initialize(Subject subject, CallbackHandler callbackHandler,
-                       Map<String, ?> sharedState, Map<String, ?> options) {
-               this.subject = subject;
-               if (subject == null) {
-                       subject = Subject.getSubject(AccessController.getContext());
-               }
-               this.callbackHandler = callbackHandler;
-       }
-
-       public boolean login() throws LoginException {
-               Set<PasswordBasedEncryption> pbes = subject
-                               .getPrivateCredentials(PasswordBasedEncryption.class);
-               if (pbes.size() > 0)
-                       return true;
-               PasswordCallback pc = new PasswordCallback("Master password", false);
-               Callback[] callbacks = { pc };
-               try {
-                       callbackHandler.handle(callbacks);
-                       passwordBasedEncryption = new PasswordBasedEncryption(
-                                       pc.getPassword());
-               } catch (Exception e) {
-                       throw new LogConfigurationException(e);
-               }
-               return true;
-       }
-
-       public boolean commit() throws LoginException {
-               if (passwordBasedEncryption != null)
-                       subject.getPrivateCredentials(PasswordBasedEncryption.class).add(
-                                       passwordBasedEncryption);
-               return true;
-       }
-
-       public boolean abort() throws LoginException {
-               return true;
-       }
-
-       public boolean logout() throws LoginException {
-               Set<PasswordBasedEncryption> pbes = subject
-                               .getPrivateCredentials(PasswordBasedEncryption.class);
-               pbes.clear();
-               return true;
-       }
-
-}