Skip to content

Commit 7b4475f

Browse files
s-gromovs-gromov
committed
remove the term 'requestToken' from OAuth2Service, differentiate OAuth1 and OAuth2 services in the process of retrieving of the access token (and generating request token for the OAuth1)
1 parent d687f3e commit 7b4475f

43 files changed

Lines changed: 148 additions & 195 deletions

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public ImgurOAuthServiceImpl(DefaultApi20 api, OAuthConfig config) {
1717
}
1818

1919
@Override
20-
public Token getAccessToken(Token requestToken, Verifier verifier) {
20+
public Token getAccessToken(Verifier verifier) {
2121
final OAuthRequest request = new OAuthRequest(getApi().getAccessTokenVerb(),
2222
getApi().getAccessTokenEndpoint(), this);
2323
request.addBodyParameter(OAuthConstants.CLIENT_ID, getConfig().getApiKey());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.github.scribejava.core.model.Token;
99
import com.github.scribejava.core.model.Verb;
1010
import com.github.scribejava.core.model.Verifier;
11-
import com.github.scribejava.core.oauth.OAuthService;
11+
import com.github.scribejava.core.oauth.OAuth10aService;
1212

1313
public abstract class AWeberExample {
1414

@@ -19,7 +19,7 @@ public abstract class AWeberExample {
1919
private static final String CONSUMER_SECRET = "";
2020

2121
public static void main(String... args) {
22-
final OAuthService service = new ServiceBuilder()
22+
final OAuth10aService service = new ServiceBuilder()
2323
.apiKey(CONSUMER_KEY)
2424
.apiSecret(CONSUMER_SECRET)
2525
.build(AWeberApi.instance());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.github.scribejava.core.model.Token;
99
import com.github.scribejava.core.model.Verb;
1010
import com.github.scribejava.core.model.Verifier;
11-
import com.github.scribejava.core.oauth.OAuthService;
11+
import com.github.scribejava.core.oauth.OAuth10aService;
1212

1313
public abstract class DiggExample {
1414

@@ -19,7 +19,7 @@ public static void main(String... args) {
1919
// Replace these with your own api key and secret
2020
final String apiKey = "myKey";
2121
final String apiSecret = "mySecret";
22-
final OAuthService service = new ServiceBuilder()
22+
final OAuth10aService service = new ServiceBuilder()
2323
.apiKey(apiKey)
2424
.apiSecret(apiSecret)
2525
.build(DiggApi.instance());

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313
import com.github.scribejava.core.model.Token;
1414
import com.github.scribejava.core.model.Verb;
1515
import com.github.scribejava.core.model.Verifier;
16-
import com.github.scribejava.core.oauth.OAuthService;
16+
import com.github.scribejava.core.oauth.OAuth20Service;
1717

1818
public abstract class FacebookAsyncExample {
1919

2020
private static final String NETWORK_NAME = "Facebook";
2121
private static final String PROTECTED_RESOURCE_URL = "https://graph.facebook.com/v2.2/me";
22-
private static final Token EMPTY_TOKEN = null;
2322

2423
public static void main(String... args) throws InterruptedException, ExecutionException {
2524
// Replace these with your client id and secret
@@ -35,7 +34,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
3534
.setReadTimeout(1_000)
3635
.build();
3736

38-
final OAuthService service = new ServiceBuilderAsync()
37+
final OAuth20Service service = new ServiceBuilderAsync()
3938
.apiKey(clientId)
4039
.apiSecret(clientSecret)
4140
.state(secretState)
@@ -50,7 +49,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
5049

5150
// Obtain the Authorization URL
5251
System.out.println("Fetching the Authorization URL...");
53-
final String authorizationUrl = service.getAuthorizationUrl(EMPTY_TOKEN);
52+
final String authorizationUrl = service.getAuthorizationUrl();
5453
System.out.println("Got the Authorization URL!");
5554
System.out.println("Now go and authorize ScribeJava here:");
5655
System.out.println(authorizationUrl);
@@ -73,7 +72,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
7372

7473
// Trade the Request Token and Verfier for the Access Token
7574
System.out.println("Trading the Request Token for an Access Token...");
76-
final Token accessToken = service.getAccessTokenAsync(EMPTY_TOKEN, verifier, null).get();
75+
final Token accessToken = service.getAccessTokenAsync(verifier, null).get();
7776
System.out.println("Got the Access Token!");
7877
System.out.println("(if your curious it looks like this: " + accessToken + " )");
7978
System.out.println();

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@
99
import com.github.scribejava.core.model.Token;
1010
import com.github.scribejava.core.model.Verb;
1111
import com.github.scribejava.core.model.Verifier;
12-
import com.github.scribejava.core.oauth.OAuthService;
12+
import com.github.scribejava.core.oauth.OAuth20Service;
1313

1414
public abstract class FacebookExample {
1515

1616
private static final String NETWORK_NAME = "Facebook";
1717
private static final String PROTECTED_RESOURCE_URL = "https://graph.facebook.com/v2.2/me";
18-
private static final Token EMPTY_TOKEN = null;
1918

2019
public static void main(String... args) {
2120
// Replace these with your client id and secret
2221
final String clientId = "your client id";
2322
final String clientSecret = "your client secret";
2423
final String secretState = "secret" + new Random().nextInt(999_999);
25-
final OAuthService service = new ServiceBuilder()
24+
final OAuth20Service service = new ServiceBuilder()
2625
.apiKey(clientId)
2726
.apiSecret(clientSecret)
2827
.state(secretState)
@@ -35,7 +34,7 @@ public static void main(String... args) {
3534

3635
// Obtain the Authorization URL
3736
System.out.println("Fetching the Authorization URL...");
38-
final String authorizationUrl = service.getAuthorizationUrl(EMPTY_TOKEN);
37+
final String authorizationUrl = service.getAuthorizationUrl();
3938
System.out.println("Got the Authorization URL!");
4039
System.out.println("Now go and authorize ScribeJava here:");
4140
System.out.println(authorizationUrl);
@@ -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 Token accessToken = service.getAccessToken(EMPTY_TOKEN, verifier);
60+
final Token accessToken = service.getAccessToken(verifier);
6261
System.out.println("Got the Access Token!");
6362
System.out.println("(if your curious it looks like this: " + accessToken + " )");
6463
System.out.println();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.github.scribejava.core.model.Token;
99
import com.github.scribejava.core.model.Verb;
1010
import com.github.scribejava.core.model.Verifier;
11-
import com.github.scribejava.core.oauth.OAuthService;
11+
import com.github.scribejava.core.oauth.OAuth10aService;
1212

1313
public abstract class FlickrExample {
1414

@@ -18,7 +18,7 @@ public static void main(String... args) {
1818
// Replace these with your own api key and secret
1919
final String apiKey = "your_app_id";
2020
final String apiSecret = "your_api_secret";
21-
final OAuthService service = new ServiceBuilder()
21+
final OAuth10aService service = new ServiceBuilder()
2222
.apiKey(apiKey)
2323
.apiSecret(apiSecret)
2424
.build(FlickrApi.instance());

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@
88
import com.github.scribejava.core.model.Token;
99
import com.github.scribejava.core.model.Verb;
1010
import com.github.scribejava.core.model.Verifier;
11-
import com.github.scribejava.core.oauth.OAuthService;
11+
import com.github.scribejava.core.oauth.OAuth20Service;
1212

1313
public abstract class Foursquare2Example {
1414

1515
private static final String PROTECTED_RESOURCE_URL
1616
= "https://api.foursquare.com/v2/users/self/friends?oauth_token=";
17-
private static final Token EMPTY_TOKEN = null;
1817

1918
public static void main(String... args) {
2019
// Replace these with your own api key and secret
2120
final String apiKey = "your client id";
2221
final String apiSecret = "your client secret";
23-
final OAuthService service = new ServiceBuilder()
22+
final OAuth20Service service = new ServiceBuilder()
2423
.apiKey(apiKey)
2524
.apiSecret(apiSecret)
2625
.callback("http://localhost:9000/")
@@ -32,7 +31,7 @@ public static void main(String... args) {
3231

3332
// Obtain the Authorization URL
3433
System.out.println("Fetching the Authorization URL...");
35-
final String authorizationUrl = service.getAuthorizationUrl(EMPTY_TOKEN);
34+
final String authorizationUrl = service.getAuthorizationUrl();
3635
System.out.println("Got the Authorization URL!");
3736
System.out.println("Now go and authorize ScribeJava here:");
3837
System.out.println(authorizationUrl);
@@ -43,7 +42,7 @@ public static void main(String... args) {
4342

4443
// Trade the Request Token and Verfier for the Access Token
4544
System.out.println("Trading the Request Token for an Access Token...");
46-
final Token accessToken = service.getAccessToken(EMPTY_TOKEN, verifier);
45+
final Token accessToken = service.getAccessToken(verifier);
4746
System.out.println("Got the Access Token!");
4847
System.out.println("(if your curious it looks like this: " + accessToken + " )");
4948
System.out.println();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
import com.github.scribejava.core.model.Token;
99
import com.github.scribejava.core.model.Verb;
1010
import com.github.scribejava.core.model.Verifier;
11-
import com.github.scribejava.core.oauth.OAuthService;
11+
import com.github.scribejava.core.oauth.OAuth10aService;
1212

1313
public abstract class FoursquareExample {
1414

1515
private static final String PROTECTED_RESOURCE_URL = "http://api.foursquare.com/v1/user";
1616

1717
public static void main(String... args) {
18-
final OAuthService service = new ServiceBuilder()
18+
final OAuth10aService service = new ServiceBuilder()
1919
.apiKey("your client id")
2020
.apiSecret("your client secret")
2121
.build(FoursquareApi.instance());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.github.scribejava.core.model.Token;
1010
import com.github.scribejava.core.model.Verb;
1111
import com.github.scribejava.core.model.Verifier;
12-
import com.github.scribejava.core.oauth.OAuthService;
12+
import com.github.scribejava.core.oauth.OAuth10aService;
1313

1414
public abstract class FreelancerExample {
1515

@@ -20,7 +20,7 @@ public abstract class FreelancerExample {
2020
private static final String SCOPE = "http://api.sandbox.freelancer.com";
2121

2222
public static void main(String... args) {
23-
final OAuthService service = new ServiceBuilder()
23+
final OAuth10aService service = new ServiceBuilder()
2424
.signatureType(SignatureType.QueryString)
2525
.apiKey("your client id")
2626
.apiSecret("your client secret")

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@
99
import com.github.scribejava.core.model.Token;
1010
import com.github.scribejava.core.model.Verb;
1111
import com.github.scribejava.core.model.Verifier;
12-
import com.github.scribejava.core.oauth.OAuthService;
12+
import com.github.scribejava.core.oauth.OAuth20Service;
1313

1414
public abstract class GitHubExample {
1515

1616
private static final String NETWORK_NAME = "GitHub";
1717
private static final String PROTECTED_RESOURCE_URL = "https://api.github.com/user";
18-
private static final Token EMPTY_TOKEN = null;
1918

2019
public static void main(String... args) {
2120
// Replace these with your client id and secret
2221
final String clientId = "your client id";
2322
final String clientSecret = "your client secret";
2423
final String secretState = "secret" + new Random().nextInt(999_999);
25-
final OAuthService service = new ServiceBuilder()
24+
final OAuth20Service service = new ServiceBuilder()
2625
.apiKey(clientId)
2726
.apiSecret(clientSecret)
2827
.state(secretState)
@@ -35,7 +34,7 @@ public static void main(String... args) {
3534

3635
// Obtain the Authorization URL
3736
System.out.println("Fetching the Authorization URL...");
38-
final String authorizationUrl = service.getAuthorizationUrl(EMPTY_TOKEN);
37+
final String authorizationUrl = service.getAuthorizationUrl();
3938
System.out.println("Got the Authorization URL!");
4039
System.out.println("Now go and authorize ScribeJava here:");
4140
System.out.println(authorizationUrl);
@@ -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 Token accessToken = service.getAccessToken(EMPTY_TOKEN, verifier);
60+
final Token accessToken = service.getAccessToken(verifier);
6261
System.out.println("Got the Access Token!");
6362
System.out.println("(if your curious it looks like this: " + accessToken + " )");
6463
System.out.println();

0 commit comments

Comments
 (0)