Dec 19, 2020 · Dec 19, 2020
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/HttpClient.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/HttpClient.java
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import okhttp3.Credentials;
 import okhttp3.Dispatcher;
 import okhttp3.Interceptor;
 import okhttp3.Interceptor.Chain;
        };
    }

    public static Interceptor basicAuth(String user, String password) {
        return (Chain chain) -> {
            Request orig = chain.request();
            String credential = Credentials.basic(user, password);
            Request newRequest = orig.newBuilder().addHeader("Authorization", credential).build();
            return chain.proceed(newRequest);
        };
    }

    // {{start:client}}
    private static final OkHttpClient client;
    static {
diff --git a/stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/github/GitHubApi.java b/stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/github/GitHubApi.java
 import com.stubbornjava.common.Json;
 import com.stubbornjava.common.Retry;

 import okhttp3.Authenticator;
 import okhttp3.Credentials;
 import okhttp3.HttpUrl;
 import okhttp3.Interceptor;
 import okhttp3.Interceptor.Chain;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.Route;

 public class GitHubApi {
    private static final Logger logger = LoggerFactory.getLogger(GitHubApi.class);
            OkHttpClient client = HttpClient.globalClient()
                .newBuilder()
                .addInterceptor(HttpClient.getHeaderInterceptor("Accept", VERSION_HEADER))
                .addInterceptor(GitHubApi.gitHubAuth(clientId, clientSecret, ref))
                .addInterceptor(HttpClient.basicAuth(clientId, clientSecret))
                .addNetworkInterceptor(HttpClient.getLoggingInterceptor())
                .build();
            return new GitHubApi(client);
        }
    }

    private static Interceptor gitHubAuth(String clientId, String clientSecret, String ref) {
        return (Chain chain) -> {
            Request orig = chain.request();
            HttpUrl url = orig.url().newBuilder()
                              .addQueryParameter("client_id", clientId)
                              .addQueryParameter("client_secret", clientSecret)
                              .addQueryParameter("ref", ref)
                              .build();
            Request newRequest = orig.newBuilder().url(url).build();
            return chain.proceed(newRequest);
        };
    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,6 +18,7 @@
		import org.slf4j.Logger;
		import org.slf4j.LoggerFactory;

		import okhttp3.Credentials;
		import okhttp3.Dispatcher;
		import okhttp3.Interceptor;
		import okhttp3.Interceptor.Chain;
Expand DownExpand Up		@@ -60,6 +61,15 @@ public static Interceptor getHeaderInterceptor(String name, String value) {
		};
		}

		public static Interceptor basicAuth(String user, String password) {
		return (Chain chain) -> {
		Request orig = chain.request();
		String credential = Credentials.basic(user, password);
		Request newRequest = orig.newBuilder().addHeader("Authorization", credential).build();
		return chain.proceed(newRequest);
		};
		}

		// {{start:client}}
		private static final OkHttpClient client;
		static {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,11 +15,13 @@
		import com.stubbornjava.common.Json;
		import com.stubbornjava.common.Retry;

		import okhttp3.Authenticator;
		import okhttp3.Credentials;
		import okhttp3.HttpUrl;
		import okhttp3.Interceptor;
		import okhttp3.Interceptor.Chain;
		import okhttp3.OkHttpClient;
		import okhttp3.Request;
		import okhttp3.Response;
		import okhttp3.Route;

		public class GitHubApi {
		private static final Logger logger = LoggerFactory.getLogger(GitHubApi.class);
Expand DownExpand Up		@@ -97,22 +99,10 @@ public GitHubApi build() {
		OkHttpClient client = HttpClient.globalClient()
		.newBuilder()
		.addInterceptor(HttpClient.getHeaderInterceptor("Accept", VERSION_HEADER))
		.addInterceptor(GitHubApi.gitHubAuth(clientId, clientSecret, ref))
		.addInterceptor(HttpClient.basicAuth(clientId, clientSecret))
		.addNetworkInterceptor(HttpClient.getLoggingInterceptor())
		.build();
		return new GitHubApi(client);
		}
		}

		private static Interceptor gitHubAuth(String clientId, String clientSecret, String ref) {
		return (Chain chain) -> {
		Request orig = chain.request();
		HttpUrl url = orig.url().newBuilder()
		.addQueryParameter("client_id", clientId)
		.addQueryParameter("client_secret", clientSecret)
		.addQueryParameter("ref", ref)
		.build();
		Request newRequest = orig.newBuilder().url(url).build();
		return chain.proceed(newRequest);
		};
		}
		}