Initialize with previously saved tokens if any.

Author: dkocher

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

@@ -50,7 +50,7 @@ public class OAuth2RequestInterceptor extends OAuth2AuthorizationService impleme
     /**
      * Currently valid tokens
      */
-    private OAuthTokens tokens = OAuthTokens.EMPTY;
+    private OAuthTokens tokens;
 
     public OAuth2RequestInterceptor(final HttpClient client, final Host host, final LoginCallback prompt) throws LoginCanceledException {
         this(client, host,
@@ -67,6 +67,7 @@ public OAuth2RequestInterceptor(final HttpClient client, final Host host, final
     public OAuth2RequestInterceptor(final HttpClient client, final Host host, final String tokenServerUrl, final String authorizationServerUrl,
                                     final String clientid, final String clientsecret, final List<String> scopes, final boolean pkce, final LoginCallback prompt) throws LoginCanceledException {
         super(client, host, tokenServerUrl, authorizationServerUrl, clientid, clientsecret, scopes, pkce, prompt);
+        this.tokens = host.getCredentials().getOauth();
     }
 
     @Override

s3/src/main/java/ch/cyberduck/core/sts/STSRequestInterceptor.java

@@ -46,7 +46,7 @@ public abstract class STSRequestInterceptor extends STSAuthorizationService impl
     /**
      * Currently valid tokens obtained from token service
      */
-    protected TemporaryAccessTokens tokens = TemporaryAccessTokens.EMPTY;
+    protected TemporaryAccessTokens tokens;
 
     /**
      * Static long-lived credentials
@@ -56,6 +56,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.tokens = host.getCredentials().getTokens();
     }
 
     /**