Rename method.

Author: dkocher

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

@@ -130,7 +130,7 @@ public OAuthTokens validate(final OAuthTokens saved) throws BackgroundException
                 log.warn("Refresh expired tokens {}", saved);
                 // Refresh expired tokens
                 try {
-                    final OAuthTokens refreshed = this.refresh(saved);
+                    final OAuthTokens refreshed = this.authorizeWithRefreshToken(saved);
                     log.debug("Refreshed tokens {} for {}", refreshed, host);
                     return this.save(refreshed);
                 }
@@ -195,7 +195,7 @@ public OAuthTokens authorize() throws BackgroundException {
         // Save access token, refresh token and id token
         switch(flowType) {
             case AuthorizationCode:
-                response = this.authorizeWithCode(host, prompt);
+                response = this.authorizeWithCode(prompt);
                 break;
             case PasswordGrant:
                 response = this.authorizeWithPassword(credentials);
@@ -209,10 +209,10 @@ public OAuthTokens authorize() throws BackgroundException {
                         System.currentTimeMillis() + response.getExpiresInSeconds() * 1000, response.getIdToken());
     }
 
-    private IdTokenResponse authorizeWithCode(final Host bookmark, final LoginCallback prompt) throws BackgroundException {
+    private IdTokenResponse authorizeWithCode(final LoginCallback prompt) throws BackgroundException {
         log.debug("Request tokens with code");
-        if(HostPreferencesFactory.get(bookmark).getBoolean("oauth.browser.open.warn")) {
-            prompt.warn(bookmark,
+        if(HostPreferencesFactory.get(host).getBoolean("oauth.browser.open.warn")) {
+            prompt.warn(host,
                     LocaleFactory.localizedString("Provide additional login credentials", "Credentials"),
                     new StringAppender()
                             .append(LocaleFactory.localizedString("Open web browser to authenticate and obtain an authorization code", "Credentials"))
@@ -246,7 +246,7 @@ private IdTokenResponse authorizeWithCode(final Host bookmark, final LoginCallba
         final String authorizationCodeUrl = authorizationCodeUrlBuilder.build();
         log.debug("Open browser with URL {}", authorizationCodeUrl);
         final String authorizationCode = OAuth2AuthorizationCodeProviderFactory.get().prompt(
-                bookmark, prompt, authorizationCodeUrl, redirectUri, state);
+                host, prompt, authorizationCodeUrl, redirectUri, state);
         if(StringUtils.isBlank(authorizationCode)) {
             throw new LoginCanceledException();
         }
@@ -295,7 +295,7 @@ private IdTokenResponse authorizeWithPassword(final Credentials credentials) thr
         }
     }
 
-    public OAuthTokens refresh(final OAuthTokens tokens) throws BackgroundException {
+    public OAuthTokens authorizeWithRefreshToken(final OAuthTokens tokens) throws BackgroundException {
         if(StringUtils.isBlank(tokens.getRefreshToken())) {
             log.warn("Missing refresh token in {}", tokens);
             return this.authorize();

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

@@ -42,7 +42,7 @@ public boolean retryRequest(final HttpResponse response, final int executionCoun
             case HttpStatus.SC_UNAUTHORIZED:
                 try {
                     log.warn("Attempt to refresh OAuth tokens for failure {}", response);
-                    service.save(service.refresh(host.getCredentials().getOauth()));
+                    service.save(service.authorizeWithRefreshToken(host.getCredentials().getOauth()));
                     // Try again
                     return true;
                 }

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

@@ -72,7 +72,7 @@ public void process(final HttpRequest request, final HttpContext context) throws
             final OAuthTokens tokens = host.getCredentials().getOauth();
             if(tokens.isExpired()) {
                 try {
-                    this.save(this.refresh(tokens));
+                    this.save(this.authorizeWithRefreshToken(tokens));
                 }
                 catch(BackgroundException e) {
                     log.warn("Failure {} refreshing OAuth tokens {}", e, tokens);