Reset credentials in logout.

Author: dkocher

core/src/main/java/ch/cyberduck/core/CopyCredentialsHolder.java

@@ -213,11 +213,5 @@ public void save(final Host bookmark) {
         else {
             log.info("Skip writing credentials for bookmark {}", bookmark.getHostname());
         }
-        // Nullify password and tokens
-        log.debug("Reset credentials for {}", bookmark);
-        switch(bookmark.getProtocol().getStatefulness()) {
-            case stateless:
-                credentials.reset();
-        }
     }
 }

core/src/main/java/ch/cyberduck/core/KeychainLoginService.java

@@ -200,7 +200,9 @@ public void interrupt() throws BackgroundException {
         }
     }
 
-    protected abstract void logout() throws BackgroundException;
+    protected void logout() throws BackgroundException {
+        host.getCredentials().reset();
+    }
 
     /**
      * Close the connection to the remote host. Subsequent calls to #getClient() must return null.

core/src/main/java/ch/cyberduck/core/Session.java

@@ -106,7 +106,7 @@ public OAuth2AuthorizationService(final HttpTransport transport, final Host host
                                       final LoginCallback prompt) throws LoginCanceledException {
         this.transport = transport;
         this.host = host;
-        this.credentials = new CopyCredentialsHolder(host.getCredentials());
+        this.credentials = host.getCredentials();
         this.tokenServerUrl = tokenServerUrl;
         this.authorizationServerUrl = authorizationServerUrl;
         this.prompt = prompt;

oauth/src/main/java/ch/cyberduck/core/oauth/OAuth2AuthorizationService.java

@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.CopyCredentialsHolder;
 import ch.cyberduck.core.Credentials;
 import ch.cyberduck.core.Host;
 import ch.cyberduck.core.LoginCallback;
@@ -55,7 +54,7 @@ public abstract class STSRequestInterceptor extends STSAuthorizationService impl
 
     public STSRequestInterceptor(final Host host, final X509TrustManager trust, final X509KeyManager key, final LoginCallback prompt) {
         super(host, trust, key, prompt);
-        this.credentials = new CopyCredentialsHolder(host.getCredentials());
+        this.credentials = host.getCredentials();
         this.tokens = host.getCredentials().getTokens();
     }