Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd9dc32a

Browse files
authored
Fix Github API access to no longer use deprecated auth methods (#169)
1 parent2408ce8 commitd9dc32a

File tree

2 files changed

+16
-16
lines changed
  • stubbornjava-common/src/main/java/com/stubbornjava/common
  • stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/github

2 files changed

+16
-16
lines changed

‎stubbornjava-common/src/main/java/com/stubbornjava/common/HttpClient.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
importorg.slf4j.Logger;
1919
importorg.slf4j.LoggerFactory;
2020

21+
importokhttp3.Credentials;
2122
importokhttp3.Dispatcher;
2223
importokhttp3.Interceptor;
2324
importokhttp3.Interceptor.Chain;
@@ -60,6 +61,15 @@ public static Interceptor getHeaderInterceptor(String name, String value) {
6061
};
6162
}
6263

64+
publicstaticInterceptorbasicAuth(Stringuser,Stringpassword) {
65+
return (Chainchain) -> {
66+
Requestorig =chain.request();
67+
Stringcredential =Credentials.basic(user,password);
68+
RequestnewRequest =orig.newBuilder().addHeader("Authorization",credential).build();
69+
returnchain.proceed(newRequest);
70+
};
71+
}
72+
6373
// {{start:client}}
6474
privatestaticfinalOkHttpClientclient;
6575
static {

‎stubbornjava-webapp/src/main/java/com/stubbornjava/webapp/github/GitHubApi.java‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
importcom.stubbornjava.common.Json;
1616
importcom.stubbornjava.common.Retry;
1717

18+
importokhttp3.Authenticator;
19+
importokhttp3.Credentials;
1820
importokhttp3.HttpUrl;
19-
importokhttp3.Interceptor;
20-
importokhttp3.Interceptor.Chain;
2121
importokhttp3.OkHttpClient;
2222
importokhttp3.Request;
23+
importokhttp3.Response;
24+
importokhttp3.Route;
2325

2426
publicclassGitHubApi {
2527
privatestaticfinalLoggerlogger =LoggerFactory.getLogger(GitHubApi.class);
@@ -97,22 +99,10 @@ public GitHubApi build() {
9799
OkHttpClientclient =HttpClient.globalClient()
98100
.newBuilder()
99101
.addInterceptor(HttpClient.getHeaderInterceptor("Accept",VERSION_HEADER))
100-
.addInterceptor(GitHubApi.gitHubAuth(clientId,clientSecret,ref))
102+
.addInterceptor(HttpClient.basicAuth(clientId,clientSecret))
103+
.addNetworkInterceptor(HttpClient.getLoggingInterceptor())
101104
.build();
102105
returnnewGitHubApi(client);
103106
}
104107
}
105-
106-
privatestaticInterceptorgitHubAuth(StringclientId,StringclientSecret,Stringref) {
107-
return (Chainchain) -> {
108-
Requestorig =chain.request();
109-
HttpUrlurl =orig.url().newBuilder()
110-
.addQueryParameter("client_id",clientId)
111-
.addQueryParameter("client_secret",clientSecret)
112-
.addQueryParameter("ref",ref)
113-
.build();
114-
RequestnewRequest =orig.newBuilder().url(url).build();
115-
returnchain.proceed(newRequest);
116-
};
117-
}
118108
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp