Skip to content

Commit 32273db

Browse files
kullfarkullfar
committed
Add debug output to OAuth2Service (thanks to https://github.com/rbarbey)
1 parent 9e4d14b commit 32273db

File tree

17 files changed

+440
-62
lines changed

17 files changed

+440
-62
lines changed

‎changelog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[SNAPSHOT]
2+
* Add debug output to OAuth2Service (thanks to https://github.com/rbarbey)
3+
14
[6.7.0]
25
* Add OAuth2 support for Meetup.com (thanks to https://github.com/stevedes77)
36
* upgrade okhttp to 4.0.1 and security fix for jackson-databind 2.9.9.1

‎scribejava-apis/src/main/java/com/github/scribejava/apis/FacebookApi.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,28 @@ public ClientAuthentication getClientAuthentication() {
7171
return RequestBodyAuthenticationScheme.instance();
7272
}
7373

74+
/**
75+
* @param apiKey apiKey
76+
* @param apiSecret apiSecret
77+
* @param callback callback
78+
* @param defaultScope defaultScope
79+
* @param responseType responseType
80+
* @param userAgent userAgent
81+
* @param httpClientConfig httpClientConfig
82+
* @param httpClient httpClient
83+
* @return FacebookService
84+
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
85+
* java.lang.String, java.io.OutputStream, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
86+
* com.github.scribejava.core.httpclient.HttpClient)}
87+
*/
88+
@Deprecated
89+
@Override
90+
public FacebookService createService(String apiKey, String apiSecret, String callback, String defaultScope,
91+
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
92+
return createService(apiKey, apiSecret, callback, defaultScope, responseType, null, userAgent, httpClientConfig,
93+
httpClient);
94+
}
95+
7496
@Override
7597
public FacebookService createService(String apiKey, String apiSecret, String callback, String defaultScope,
7698
String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,

‎scribejava-apis/src/main/java/com/github/scribejava/apis/ImgurApi.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ protected ImgurApi() {
1616
}
1717

1818
private static class InstanceHolder {
19+
1920
private static final ImgurApi INSTANCE = new ImgurApi();
2021
}
2122

@@ -55,6 +56,28 @@ protected String getAuthorizationBaseUrl() {
5556
throw new UnsupportedOperationException("use getAuthorizationUrl instead");
5657
}
5758

59+
/**
60+
* @param apiKey apiKey
61+
* @param apiSecret apiSecret
62+
* @param callback callback
63+
* @param defaultScope defaultScope
64+
* @param responseType responseType
65+
* @param userAgent userAgent
66+
* @param httpClientConfig httpClientConfig
67+
* @param httpClient httpClient
68+
* @return ImgurOAuthService
69+
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
70+
* java.lang.String, java.io.OutputStream, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
71+
* com.github.scribejava.core.httpclient.HttpClient)}
72+
*/
73+
@Deprecated
74+
@Override
75+
public ImgurOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
76+
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
77+
return createService(apiKey, apiSecret, callback, defaultScope, responseType, null, userAgent, httpClientConfig,
78+
httpClient);
79+
}
80+
5881
@Override
5982
public ImgurOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
6083
String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,

‎scribejava-apis/src/main/java/com/github/scribejava/apis/MailruApi.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ protected MailruApi() {
1313
}
1414

1515
private static class InstanceHolder {
16+
1617
private static final MailruApi INSTANCE = new MailruApi();
1718
}
1819

@@ -30,6 +31,28 @@ protected String getAuthorizationBaseUrl() {
3031
return "https://connect.mail.ru/oauth/authorize";
3132
}
3233

34+
/**
35+
* @param apiKey apiKey
36+
* @param apiSecret apiSecret
37+
* @param callback callback
38+
* @param defaultScope defaultScope
39+
* @param responseType responseType
40+
* @param userAgent userAgent
41+
* @param httpClientConfig httpClientConfig
42+
* @param httpClient httpClient
43+
* @return MailruOAuthService
44+
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
45+
* java.lang.String, java.io.OutputStream, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
46+
* com.github.scribejava.core.httpclient.HttpClient)}
47+
*/
48+
@Deprecated
49+
@Override
50+
public MailruOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
51+
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
52+
return createService(apiKey, apiSecret, callback, defaultScope, responseType, null, userAgent, httpClientConfig,
53+
httpClient);
54+
}
55+
3356
@Override
3457
public MailruOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
3558
String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,

‎scribejava-apis/src/main/java/com/github/scribejava/apis/OdnoklassnikiApi.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ protected OdnoklassnikiApi() {
1717
}
1818

1919
private static class InstanceHolder {
20+
2021
private static final OdnoklassnikiApi INSTANCE = new OdnoklassnikiApi();
2122
}
2223

@@ -34,6 +35,29 @@ protected String getAuthorizationBaseUrl() {
3435
return "https://connect.ok.ru/oauth/authorize";
3536
}
3637

38+
/**
39+
* @param apiKey apiKey
40+
* @param apiSecret apiSecret
41+
* @param callback callback
42+
* @param defaultScope defaultScope
43+
* @param responseType responseType
44+
* @param userAgent userAgent
45+
* @param httpClientConfig httpClientConfig
46+
* @param httpClient httpClient
47+
* @return OdnoklassnikiOAuthService
48+
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
49+
* java.lang.String, java.io.OutputStream, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
50+
* com.github.scribejava.core.httpclient.HttpClient)}
51+
*/
52+
@Deprecated
53+
@Override
54+
public OdnoklassnikiOAuthService createService(String apiKey, String apiSecret, String callback,
55+
String defaultScope, String responseType, String userAgent, HttpClientConfig httpClientConfig,
56+
HttpClient httpClient) {
57+
return createService(apiKey, apiSecret, callback, defaultScope, responseType, null, userAgent, httpClientConfig,
58+
httpClient);
59+
}
60+
3761
@Override
3862
public OdnoklassnikiOAuthService createService(String apiKey, String apiSecret, String callback,
3963
String defaultScope, String responseType, OutputStream debugStream, String userAgent,

‎scribejava-apis/src/main/java/com/github/scribejava/apis/WunderlistAPI.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.github.scribejava.core.builder.api.DefaultApi20;
77
import com.github.scribejava.core.httpclient.HttpClient;
88
import com.github.scribejava.core.httpclient.HttpClientConfig;
9-
import com.github.scribejava.core.oauth.OAuth20Service;
109
import com.github.scribejava.core.oauth2.bearersignature.BearerSignature;
1110
import com.github.scribejava.core.oauth2.bearersignature.BearerSignatureURIQueryParameter;
1211
import com.github.scribejava.core.oauth2.clientauthentication.ClientAuthentication;
@@ -49,8 +48,30 @@ public ClientAuthentication getClientAuthentication() {
4948
return RequestBodyAuthenticationScheme.instance();
5049
}
5150

51+
/**
52+
* @param apiKey apiKey
53+
* @param apiSecret apiSecret
54+
* @param callback callback
55+
* @param defaultScope defaultScope
56+
* @param responseType responseType
57+
* @param userAgent userAgent
58+
* @param httpClientConfig httpClientConfig
59+
* @param httpClient httpClient
60+
* @return WunderlistOAuthService
61+
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
62+
* java.lang.String, java.io.OutputStream, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
63+
* com.github.scribejava.core.httpclient.HttpClient)}
64+
*/
65+
@Deprecated
5266
@Override
53-
public OAuth20Service createService(String apiKey, String apiSecret, String callback, String defaultScope,
67+
public WunderlistOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
68+
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
69+
return createService(apiKey, apiSecret, callback, defaultScope, responseType, null, userAgent, httpClientConfig,
70+
httpClient);
71+
}
72+
73+
@Override
74+
public WunderlistOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
5475
String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,
5576
HttpClient httpClient) {
5677
return new WunderlistOAuthService(this, apiKey, apiSecret, callback, defaultScope, responseType, debugStream,

‎scribejava-apis/src/main/java/com/github/scribejava/apis/facebook/FacebookService.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.scribejava.apis.facebook;
22

3-
import com.github.scribejava.core.builder.api.DefaultApi20;
3+
import com.github.scribejava.apis.FacebookApi;
44
import com.github.scribejava.core.httpclient.HttpClient;
55
import com.github.scribejava.core.httpclient.HttpClientConfig;
66
import com.github.scribejava.core.model.OAuthRequest;
@@ -15,7 +15,28 @@
1515

1616
public class FacebookService extends OAuth20Service {
1717

18-
public FacebookService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String defaultScope,
18+
/**
19+
* @param api api
20+
* @param apiKey apiKey
21+
* @param apiSecret apiSecret
22+
* @param callback callback
23+
* @param defaultScope defaultScope
24+
* @param responseType responseType
25+
* @param userAgent userAgent
26+
* @param httpClientConfig httpClientConfig
27+
* @param httpClient httpClient
28+
* @deprecated use {@link #FacebookService(com.github.scribejava.apis.FacebookApi, java.lang.String,
29+
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.io.OutputStream, java.lang.String,
30+
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient) }
31+
*/
32+
@Deprecated
33+
public FacebookService(FacebookApi api, String apiKey, String apiSecret, String callback, String defaultScope,
34+
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
35+
this(api, apiKey, apiSecret, callback, defaultScope, responseType, null, userAgent, httpClientConfig,
36+
httpClient);
37+
}
38+
39+
public FacebookService(FacebookApi api, String apiKey, String apiSecret, String callback, String defaultScope,
1940
String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,
2041
HttpClient httpClient) {
2142
super(api, apiKey, apiSecret, callback, defaultScope, responseType, debugStream, userAgent, httpClientConfig,

‎scribejava-apis/src/main/java/com/github/scribejava/apis/imgur/ImgurOAuthService.java‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,28 @@
1414

1515
public class ImgurOAuthService extends OAuth20Service {
1616

17-
public ImgurOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String defaultScope,
17+
/**
18+
* @param api api
19+
* @param apiKey apiKey
20+
* @param apiSecret apiSecret
21+
* @param callback callback
22+
* @param defaultScope defaultScope
23+
* @param responseType responseType
24+
* @param userAgent userAgent
25+
* @param httpClientConfig httpClientConfig
26+
* @param httpClient httpClient
27+
* @deprecated use {@link #ImgurOAuthService(com.github.scribejava.apis.ImgurApi, java.lang.String,
28+
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.io.OutputStream, java.lang.String,
29+
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient) }
30+
*/
31+
@Deprecated
32+
public ImgurOAuthService(ImgurApi api, String apiKey, String apiSecret, String callback, String defaultScope,
33+
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
34+
this(api, apiKey, apiSecret, callback, defaultScope, responseType, null, userAgent, httpClientConfig,
35+
httpClient);
36+
}
37+
38+
public ImgurOAuthService(ImgurApi api, String apiKey, String apiSecret, String callback, String defaultScope,
1839
String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,
1940
HttpClient httpClient) {
2041
super(api, apiKey, apiSecret, callback, defaultScope, responseType, debugStream, userAgent, httpClientConfig,

‎scribejava-apis/src/main/java/com/github/scribejava/apis/mailru/MailruOAuthService.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.github.scribejava.apis.mailru;
22

3+
import com.github.scribejava.apis.MailruApi;
34
import java.net.URLDecoder;
45
import java.util.Map;
56
import java.util.TreeMap;
6-
import com.github.scribejava.core.builder.api.DefaultApi20;
77
import com.github.scribejava.core.httpclient.HttpClient;
88
import com.github.scribejava.core.httpclient.HttpClientConfig;
99
import com.github.scribejava.core.model.OAuthRequest;
@@ -18,7 +18,28 @@
1818

1919
public class MailruOAuthService extends OAuth20Service {
2020

21-
public MailruOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback, String defaultScope,
21+
/**
22+
* @param api api
23+
* @param apiKey apiKey
24+
* @param apiSecret apiSecret
25+
* @param callback callback
26+
* @param defaultScope defaultScope
27+
* @param responseType responseType
28+
* @param userAgent userAgent
29+
* @param httpClientConfig httpClientConfig
30+
* @param httpClient httpClient
31+
* @deprecated use {@link #MailruOAuthService(com.github.scribejava.apis.MailruApi, java.lang.String,
32+
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.io.OutputStream, java.lang.String,
33+
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient) }
34+
*/
35+
@Deprecated
36+
public MailruOAuthService(MailruApi api, String apiKey, String apiSecret, String callback, String defaultScope,
37+
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
38+
this(api, apiKey, apiSecret, callback, defaultScope, responseType, null, userAgent, httpClientConfig,
39+
httpClient);
40+
}
41+
42+
public MailruOAuthService(MailruApi api, String apiKey, String apiSecret, String callback, String defaultScope,
2243
String responseType, OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig,
2344
HttpClient httpClient) {
2445
super(api, apiKey, apiSecret, callback, defaultScope, responseType, debugStream, userAgent, httpClientConfig,

‎scribejava-apis/src/main/java/com/github/scribejava/apis/odnoklassniki/OdnoklassnikiOAuthService.java‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.scribejava.apis.odnoklassniki;
22

3-
import com.github.scribejava.core.builder.api.DefaultApi20;
3+
import com.github.scribejava.apis.OdnoklassnikiApi;
44
import com.github.scribejava.core.httpclient.HttpClient;
55
import com.github.scribejava.core.httpclient.HttpClientConfig;
66
import com.github.scribejava.core.model.OAuthRequest;
@@ -21,7 +21,29 @@
2121

2222
public class OdnoklassnikiOAuthService extends OAuth20Service {
2323

24-
public OdnoklassnikiOAuthService(DefaultApi20 api, String apiKey, String apiSecret, String callback,
24+
/**
25+
* @param api api
26+
* @param apiKey apiKey
27+
* @param apiSecret apiSecret
28+
* @param callback callback
29+
* @param defaultScope defaultScope
30+
* @param responseType responseType
31+
* @param userAgent userAgent
32+
* @param httpClientConfig httpClientConfig
33+
* @param httpClient httpClient
34+
* @deprecated use {@link #OdnoklassnikiOAuthService(com.github.scribejava.apis.OdnoklassnikiApi, java.lang.String,
35+
* java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.io.OutputStream, java.lang.String,
36+
* com.github.scribejava.core.httpclient.HttpClientConfig, com.github.scribejava.core.httpclient.HttpClient) }
37+
*/
38+
@Deprecated
39+
public OdnoklassnikiOAuthService(OdnoklassnikiApi api, String apiKey, String apiSecret, String callback,
40+
String defaultScope, String responseType, String userAgent, HttpClientConfig httpClientConfig,
41+
HttpClient httpClient) {
42+
this(api, apiKey, apiSecret, callback, defaultScope, responseType, null, userAgent, httpClientConfig,
43+
httpClient);
44+
}
45+
46+
public OdnoklassnikiOAuthService(OdnoklassnikiApi api, String apiKey, String apiSecret, String callback,
2547
String defaultScope, String responseType, OutputStream debugStream, String userAgent,
2648
HttpClientConfig httpClientConfig, HttpClient httpClient) {
2749
super(api, apiKey, apiSecret, callback, defaultScope, responseType, debugStream, userAgent, httpClientConfig,

0 commit comments

Comments
 (0)