Skip to content

Commit f9aa6a8

Browse files
kullfarkullfar
committed
Merge pull request #604 from scribejava/differentiate-oauth1-vs-oauth2
Make build() return concrete OAuthService version. 1.0[a] or 2.0
2 parents a9fe136 + 00d7f67 commit f9aa6a8

72 files changed

Lines changed: 201 additions & 222 deletions

File tree

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/DoktornaraboteApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.github.scribejava.core.model.OAuthConfig;
88
import com.github.scribejava.core.model.OAuthConstants;
99
import com.github.scribejava.core.model.Verb;
10-
import com.github.scribejava.core.oauth.OAuthService;
10+
import com.github.scribejava.core.oauth.OAuth20Service;
1111
import com.github.scribejava.core.utils.OAuthEncoder;
1212
import com.github.scribejava.core.utils.Preconditions;
1313

@@ -64,7 +64,7 @@ public AccessTokenExtractor getAccessTokenExtractor() {
6464
}
6565

6666
@Override
67-
public OAuthService createService(final OAuthConfig config) {
67+
public OAuth20Service createService(final OAuthConfig config) {
6868
return new DoktornaraboteOAuthServiceImpl(this, config);
6969
}
7070
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.github.scribejava.core.model.OAuthConfig;
88
import com.github.scribejava.core.model.OAuthConstants;
99
import com.github.scribejava.core.model.Verb;
10-
import com.github.scribejava.core.oauth.OAuthService;
10+
import com.github.scribejava.core.oauth.OAuth20Service;
1111
import com.github.scribejava.core.utils.OAuthEncoder;
1212

1313
public class GoogleApi20 extends DefaultApi20 {
@@ -54,8 +54,7 @@ public AccessTokenExtractor getAccessTokenExtractor() {
5454
}
5555

5656
@Override
57-
public OAuthService createService(final OAuthConfig config) {
57+
public OAuth20Service createService(final OAuthConfig config) {
5858
return new GoogleOAuthServiceImpl(this, config);
5959
}
60-
6160
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import com.github.scribejava.core.model.OAuthConfig;
77
import com.github.scribejava.core.model.OAuthConstants;
88
import com.github.scribejava.core.model.Verb;
9-
import com.github.scribejava.core.oauth.OAuthService;
109

1110
import com.github.scribejava.apis.service.HHOAuthServiceImpl;
11+
import com.github.scribejava.core.oauth.OAuth20Service;
1212

1313
public class HHApi extends DefaultApi20 {
1414

@@ -47,7 +47,7 @@ public AccessTokenExtractor getAccessTokenExtractor() {
4747
}
4848

4949
@Override
50-
public OAuthService createService(final OAuthConfig config) {
50+
public OAuth20Service createService(final OAuthConfig config) {
5151
return new HHOAuthServiceImpl(this, config);
5252
}
5353
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.github.scribejava.core.extractors.JsonTokenExtractor;
77
import com.github.scribejava.core.model.OAuthConfig;
88
import com.github.scribejava.core.model.Verb;
9-
import com.github.scribejava.core.oauth.OAuthService;
9+
import com.github.scribejava.core.oauth.OAuth20Service;
1010

1111
public class ImgurApi extends DefaultApi20 {
1212

@@ -45,7 +45,7 @@ public String getAuthorizationUrl(final OAuthConfig config) {
4545
}
4646

4747
@Override
48-
public OAuthService createService(final OAuthConfig config) {
48+
public OAuth20Service createService(final OAuthConfig config) {
4949
return new ImgurOAuthServiceImpl(this, config);
5050
}
5151

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

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

3-
import java.util.Arrays;
4-
import java.util.Collections;
5-
import java.util.HashSet;
6-
import java.util.Set;
73
import com.github.scribejava.core.builder.api.DefaultApi10a;
84
import com.github.scribejava.core.model.Token;
95

@@ -20,14 +16,22 @@ public static LinkedInApi instance() {
2016
return InstanceHolder.INSTANCE;
2117
}
2218

23-
private final Set<String> scopes;
19+
private final String scopesAsString;
2420

2521
public LinkedInApi() {
26-
scopes = Collections.emptySet();
27-
}
28-
29-
public LinkedInApi(final Set<String> scopes) {
30-
this.scopes = Collections.unmodifiableSet(scopes);
22+
scopesAsString = null;
23+
}
24+
25+
public LinkedInApi(final String... scopes) {
26+
if (scopes == null || scopes.length == 0) {
27+
scopesAsString = null;
28+
} else {
29+
final StringBuilder builder = new StringBuilder();
30+
for (final String scope : scopes) {
31+
builder.append('+').append(scope);
32+
}
33+
scopesAsString = "?scope=" + builder.substring(1);
34+
}
3135
}
3236

3337
@Override
@@ -37,25 +41,11 @@ public String getAccessTokenEndpoint() {
3741

3842
@Override
3943
public String getRequestTokenEndpoint() {
40-
return scopes.isEmpty() ? REQUEST_TOKEN_URL : REQUEST_TOKEN_URL + "?scope=" + scopesAsString();
41-
}
42-
43-
private String scopesAsString() {
44-
final StringBuilder builder = new StringBuilder();
45-
for (final String scope : scopes) {
46-
builder.append("+" + scope);
47-
}
48-
return builder.substring(1);
44+
return scopesAsString == null ? REQUEST_TOKEN_URL : REQUEST_TOKEN_URL + scopesAsString;
4945
}
5046

5147
@Override
5248
public String getAuthorizationUrl(final Token requestToken) {
5349
return String.format(AUTHORIZE_URL, requestToken.getToken());
5450
}
55-
56-
public static LinkedInApi withScopes(final String... scopes) {
57-
final Set<String> scopeSet = new HashSet<>(Arrays.asList(scopes));
58-
return new LinkedInApi(scopeSet);
59-
}
60-
6151
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.github.scribejava.core.model.OAuthConfig;
88
import com.github.scribejava.core.model.OAuthConstants;
99
import com.github.scribejava.core.model.Verb;
10-
import com.github.scribejava.core.oauth.OAuthService;
10+
import com.github.scribejava.core.oauth.OAuth20Service;
1111
import com.github.scribejava.core.utils.OAuthEncoder;
1212
import com.github.scribejava.core.utils.Preconditions;
1313

@@ -58,7 +58,7 @@ public AccessTokenExtractor getAccessTokenExtractor() {
5858
}
5959

6060
@Override
61-
public OAuthService createService(final OAuthConfig config) {
61+
public OAuth20Service createService(final OAuthConfig config) {
6262
return new LinkedIn20ServiceImpl(this, config);
6363
}
6464
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import com.github.scribejava.core.extractors.JsonTokenExtractor;
66
import com.github.scribejava.core.model.OAuthConfig;
77
import com.github.scribejava.core.model.Verb;
8-
import com.github.scribejava.core.oauth.OAuthService;
98
import com.github.scribejava.core.utils.OAuthEncoder;
109
import com.github.scribejava.core.utils.Preconditions;
1110
import com.github.scribejava.apis.service.MailruOAuthServiceImpl;
11+
import com.github.scribejava.core.oauth.OAuth20Service;
1212

1313
public class MailruApi extends DefaultApi20 {
1414

@@ -48,7 +48,7 @@ public String getAuthorizationUrl(final OAuthConfig config) {
4848
}
4949

5050
@Override
51-
public OAuthService createService(final OAuthConfig config) {
51+
public OAuth20Service createService(final OAuthConfig config) {
5252
return new MailruOAuthServiceImpl(this, config);
5353
}
5454

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.github.scribejava.core.extractors.JsonTokenExtractor;
77
import com.github.scribejava.core.model.OAuthConfig;
88
import com.github.scribejava.core.model.Verb;
9-
import com.github.scribejava.core.oauth.OAuthService;
9+
import com.github.scribejava.core.oauth.OAuth20Service;
1010
import com.github.scribejava.core.utils.OAuthEncoder;
1111
import com.github.scribejava.core.utils.Preconditions;
1212

@@ -48,7 +48,7 @@ public String getAuthorizationUrl(final OAuthConfig config) {
4848
}
4949

5050
@Override
51-
public OAuthService createService(final OAuthConfig config) {
51+
public OAuth20Service createService(final OAuthConfig config) {
5252
return new OdnoklassnikiServiceImpl(this, config);
5353
}
5454

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import com.github.scribejava.core.extractors.JsonTokenExtractor;
66
import com.github.scribejava.core.model.OAuthConfig;
77
import com.github.scribejava.core.model.Verb;
8-
import com.github.scribejava.core.oauth.OAuthService;
98
import com.github.scribejava.core.utils.OAuthEncoder;
109
import com.github.scribejava.core.utils.Preconditions;
1110
import com.github.scribejava.apis.service.TutByOAuthServiceImpl;
11+
import com.github.scribejava.core.oauth.OAuth20Service;
1212

1313
public class TutByApi extends DefaultApi20 {
1414

@@ -42,7 +42,7 @@ public String getAuthorizationUrl(final OAuthConfig config) {
4242
}
4343

4444
@Override
45-
public OAuthService createService(final OAuthConfig config) {
45+
public OAuth20Service createService(final OAuthConfig config) {
4646
return new TutByOAuthServiceImpl(this, config);
4747
}
4848

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.github.scribejava.core.model.AbstractRequest;
55
import com.github.scribejava.core.model.OAuthConfig;
66
import com.github.scribejava.core.model.Token;
7-
import com.github.scribejava.core.oauth.OAuth20ServiceImpl;
7+
import com.github.scribejava.core.oauth.OAuth20Service;
88

9-
public class DoktornaraboteOAuthServiceImpl extends OAuth20ServiceImpl {
9+
public class DoktornaraboteOAuthServiceImpl extends OAuth20Service {
1010

1111
public DoktornaraboteOAuthServiceImpl(final DefaultApi20 api, final OAuthConfig config) {
1212
super(api, config);

0 commit comments

Comments
 (0)