Skip to content

Commit e088788

Browse files
s-gromovs-gromov
committed
remove Verifier object, we just need Strings, 'code' for OAuth2 and 'oauthVerifier' for OAuth1
1 parent a3ff12d commit e088788

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+107
-176
lines changed

‎changelog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* make JSON Access Token Extractor be the default for OAuth 2.0 (according to RFC 6749)
55
* drop Google OAuth 1.0 support (OAuth 1.0 was officially deprecated by Google)
66
* add response_type parameter to the ServiceBuilder/OAuthConfig to use not only "code" for authorization code
7+
* remove Verifier object, we just need Strings, 'code' for OAuth2 and 'oauthVerifier' for OAuth1
78

89
[2.3.0]
910
* Stack Exchange authentication via OAuth 2.0 (stackoverflow.com, askubuntu.com, etc.).

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/GoogleOAuthServiceImpl.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.github.scribejava.core.model.AbstractRequest;
55
import com.github.scribejava.core.model.OAuthConfig;
66
import com.github.scribejava.core.model.OAuthConstants;
7-
import com.github.scribejava.core.model.Verifier;
87
import com.github.scribejava.core.oauth.OAuth20Service;
98

109
public class GoogleOAuthServiceImpl extends OAuth20Service {
@@ -14,8 +13,8 @@ public GoogleOAuthServiceImpl(DefaultApi20 api, OAuthConfig config) {
1413
}
1514

1615
@Override
17-
protected <T extends AbstractRequest> T createAccessTokenRequest(Verifier verifier, T request) {
18-
super.createAccessTokenRequest(verifier, request);
16+
protected <T extends AbstractRequest> T createAccessTokenRequest(String code, T request) {
17+
super.createAccessTokenRequest(code, request);
1918
if (!getConfig().hasGrantType()) {
2019
request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.AUTHORIZATION_CODE);
2120
}

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/ImgurOAuthServiceImpl.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.github.scribejava.core.model.OAuth2AccessToken;
77
import com.github.scribejava.core.model.OAuthConfig;
88
import com.github.scribejava.core.model.OAuthConstants;
9-
import com.github.scribejava.core.model.Verifier;
109
import com.github.scribejava.core.oauth.OAuth20Service;
1110

1211
public class ImgurOAuthServiceImpl extends OAuth20Service {
@@ -16,17 +15,17 @@ public ImgurOAuthServiceImpl(DefaultApi20 api, OAuthConfig config) {
1615
}
1716

1817
@Override
19-
protected <T extends AbstractRequest> T createAccessTokenRequest(Verifier verifier, T request) {
18+
protected <T extends AbstractRequest> T createAccessTokenRequest(String oauthVerifier, T request) {
2019
final OAuthConfig config = getConfig();
2120
request.addBodyParameter(OAuthConstants.CLIENT_ID, config.getApiKey());
2221
request.addBodyParameter(OAuthConstants.CLIENT_SECRET, config.getApiSecret());
2322

2423
if (ImgurApi.isOob(config)) {
2524
request.addBodyParameter(OAuthConstants.GRANT_TYPE, "pin");
26-
request.addBodyParameter("pin", verifier.getValue());
25+
request.addBodyParameter("pin", oauthVerifier);
2726
} else {
2827
request.addBodyParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.AUTHORIZATION_CODE);
29-
request.addBodyParameter(OAuthConstants.CODE, verifier.getValue());
28+
request.addBodyParameter(OAuthConstants.CODE, oauthVerifier);
3029
}
3130
return request;
3231
}

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/LinkedIn20ServiceImpl.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.github.scribejava.core.model.OAuth2AccessToken;
66
import com.github.scribejava.core.model.OAuthConfig;
77
import com.github.scribejava.core.model.OAuthConstants;
8-
import com.github.scribejava.core.model.Verifier;
98
import com.github.scribejava.core.oauth.OAuth20Service;
109

1110
public class LinkedIn20ServiceImpl extends OAuth20Service {
@@ -20,8 +19,8 @@ public void signRequest(OAuth2AccessToken accessToken, AbstractRequest request)
2019
}
2120

2221
@Override
23-
protected <T extends AbstractRequest> T createAccessTokenRequest(Verifier verifier, T request) {
24-
super.createAccessTokenRequest(verifier, request);
22+
protected <T extends AbstractRequest> T createAccessTokenRequest(String code, T request) {
23+
super.createAccessTokenRequest(code, request);
2524
if (!getConfig().hasGrantType()) {
2625
request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.AUTHORIZATION_CODE);
2726
}

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/MailruOAuthServiceImpl.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.github.scribejava.core.model.OAuth2AccessToken;
1212
import com.github.scribejava.core.model.OAuthConfig;
1313
import com.github.scribejava.core.model.OAuthConstants;
14-
import com.github.scribejava.core.model.Verifier;
1514
import com.github.scribejava.core.oauth.OAuth20Service;
1615

1716
public class MailruOAuthServiceImpl extends OAuth20Service {
@@ -52,8 +51,8 @@ public void signRequest(OAuth2AccessToken accessToken, AbstractRequest request)
5251
}
5352

5453
@Override
55-
protected <T extends AbstractRequest> T createAccessTokenRequest(Verifier verifier, T request) {
56-
super.createAccessTokenRequest(verifier, request);
54+
protected <T extends AbstractRequest> T createAccessTokenRequest(String code, T request) {
55+
super.createAccessTokenRequest(code, request);
5756
if (!getConfig().hasGrantType()) {
5857
request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.AUTHORIZATION_CODE);
5958
}

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/AWeberExample.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.github.scribejava.core.model.OAuthRequest;
99
import com.github.scribejava.core.model.Response;
1010
import com.github.scribejava.core.model.Verb;
11-
import com.github.scribejava.core.model.Verifier;
1211
import com.github.scribejava.core.oauth.OAuth10aService;
1312

1413
public abstract class AWeberExample {
@@ -40,12 +39,12 @@ public static void main(String... args) {
4039
System.out.println(service.getAuthorizationUrl(requestToken));
4140
System.out.println("And paste the verifier here");
4241
System.out.print(">>");
43-
final Verifier verifier = new Verifier(in.nextLine());
42+
final String oauthVerifier = in.nextLine();
4443
System.out.println();
4544

4645
// Trade the Request Token and Verfier for the Access Token
4746
System.out.println("Trading the Request Token for an Access Token...");
48-
final OAuth1AccessToken accessToken = service.getAccessToken(requestToken, verifier);
47+
final OAuth1AccessToken accessToken = service.getAccessToken(requestToken, oauthVerifier);
4948
System.out.println("Got the Access Token!");
5049
System.out.println("(if your curious it looks like this: " + accessToken
5150
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/DiggExample.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.github.scribejava.core.model.OAuthRequest;
99
import com.github.scribejava.core.model.Response;
1010
import com.github.scribejava.core.model.Verb;
11-
import com.github.scribejava.core.model.Verifier;
1211
import com.github.scribejava.core.oauth.OAuth10aService;
1312

1413
public abstract class DiggExample {
@@ -43,12 +42,12 @@ public static void main(String... args) {
4342
System.out.println(authorizationUrl);
4443
System.out.println("And paste the authorization code here");
4544
System.out.print(">>");
46-
final Verifier verifier = new Verifier(in.nextLine());
45+
final String oauthVerifier = in.nextLine();
4746
System.out.println();
4847

4948
// Trade the Request Token and Verfier for the Access Token
5049
System.out.println("Trading the Request Token for an Access Token...");
51-
final OAuth1AccessToken accessToken = service.getAccessToken(requestToken, verifier);
50+
final OAuth1AccessToken accessToken = service.getAccessToken(requestToken, oauthVerifier);
5251
System.out.println("Got the Access Token!");
5352
System.out.println("(if your curious it looks like this: " + accessToken
5453
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookAsyncExample.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.github.scribejava.core.model.Response;
1313
import com.github.scribejava.core.model.ScribeJavaConfig;
1414
import com.github.scribejava.core.model.Verb;
15-
import com.github.scribejava.core.model.Verifier;
1615
import com.github.scribejava.core.oauth.OAuth20Service;
1716

1817
public abstract class FacebookAsyncExample {
@@ -55,7 +54,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
5554
System.out.println(authorizationUrl);
5655
System.out.println("And paste the authorization code here");
5756
System.out.print(">>");
58-
final Verifier verifier = new Verifier(in.nextLine());
57+
final String code = in.nextLine();
5958
System.out.println();
6059

6160
System.out.println("And paste the state from server here. We have set 'secretState'='" + secretState + "'.");
@@ -72,7 +71,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
7271

7372
// Trade the Request Token and Verfier for the Access Token
7473
System.out.println("Trading the Request Token for an Access Token...");
75-
final OAuth2AccessToken accessToken = service.getAccessTokenAsync(verifier, null).get();
74+
final OAuth2AccessToken accessToken = service.getAccessTokenAsync(code, null).get();
7675
System.out.println("Got the Access Token!");
7776
System.out.println("(if your curious it looks like this: " + accessToken
7877
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookExample.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.github.scribejava.core.model.OAuthRequest;
99
import com.github.scribejava.core.model.Response;
1010
import com.github.scribejava.core.model.Verb;
11-
import com.github.scribejava.core.model.Verifier;
1211
import com.github.scribejava.core.oauth.OAuth20Service;
1312

1413
public abstract class FacebookExample {
@@ -41,7 +40,7 @@ public static void main(String... args) {
4140
System.out.println(authorizationUrl);
4241
System.out.println("And paste the authorization code here");
4342
System.out.print(">>");
44-
final Verifier verifier = new Verifier(in.nextLine());
43+
final String code = in.nextLine();
4544
System.out.println();
4645

4746
System.out.println("And paste the state from server here. We have set 'secretState'='" + secretState + "'.");
@@ -58,7 +57,7 @@ public static void main(String... args) {
5857

5958
// Trade the Request Token and Verfier for the Access Token
6059
System.out.println("Trading the Request Token for an Access Token...");
61-
final OAuth2AccessToken accessToken = service.getAccessToken(verifier);
60+
final OAuth2AccessToken accessToken = service.getAccessToken(code);
6261
System.out.println("Got the Access Token!");
6362
System.out.println("(if your curious it looks like this: " + accessToken
6463
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FlickrExample.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.github.scribejava.core.model.OAuthRequest;
99
import com.github.scribejava.core.model.Response;
1010
import com.github.scribejava.core.model.Verb;
11-
import com.github.scribejava.core.model.Verifier;
1211
import com.github.scribejava.core.oauth.OAuth10aService;
1312

1413
public abstract class FlickrExample {
@@ -39,12 +38,12 @@ public static void main(String... args) {
3938
System.out.println(authorizationUrl + "&perms=read");
4039
System.out.println("And paste the verifier here");
4140
System.out.print(">>");
42-
final Verifier verifier = new Verifier(in.nextLine());
41+
final String oauthVerifier = in.nextLine();
4342
System.out.println();
4443

4544
// Trade the Request Token and Verfier for the Access Token
4645
System.out.println("Trading the Request Token for an Access Token...");
47-
final OAuth1AccessToken accessToken = service.getAccessToken(requestToken, verifier);
46+
final OAuth1AccessToken accessToken = service.getAccessToken(requestToken, oauthVerifier);
4847
System.out.println("Got the Access Token!");
4948
System.out.println("(if your curious it looks like this: " + accessToken
5049
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");

0 commit comments

Comments
 (0)