Skip to content

Commit 78cb95c

Browse files
kullfarkullfar
committed
introduce SignatureType for OAuth2.0 to implement Bearer signing for the requests
1 parent a013e33 commit 78cb95c

32 files changed

Lines changed: 140 additions & 95 deletions

‎changelog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[SNAPSHOT]
22
* Remove OAuthRequestAsync, just OAuthRequest. Request should know about sync vs async. Move default Http engine to JDKHttpClient.
3+
* introduce SignatureType for OAuth2.0 to implement Bearer signing for the requests
34

45
[3.4.1]
56
* Drop deprecated methods

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

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

33
import com.github.scribejava.core.builder.api.DefaultApi20;
4+
import com.github.scribejava.core.builder.api.SignatureType;
45

56
/**
67
* Box.com Api
@@ -29,4 +30,8 @@ protected String getAuthorizationBaseUrl() {
2930
return "https://account.box.com/api/oauth2/authorize";
3031
}
3132

33+
@Override
34+
public SignatureType getSignatureType() {
35+
return SignatureType.BEARER_URI_QUERY_PARAMETER;
36+
}
3237
}

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

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

3-
import com.github.scribejava.apis.service.DoktornaraboteOAuthServiceImpl;
43
import com.github.scribejava.core.builder.api.DefaultApi20;
5-
import com.github.scribejava.core.model.OAuthConfig;
6-
import com.github.scribejava.core.oauth.OAuth20Service;
74

85
public class DoktornaraboteApi extends DefaultApi20 {
96

@@ -27,9 +24,4 @@ public String getAccessTokenEndpoint() {
2724
protected String getAuthorizationBaseUrl() {
2825
return "https://auth.doktornarabote.ru/OAuth/Authorize";
2926
}
30-
31-
@Override
32-
public OAuth20Service createService(OAuthConfig config) {
33-
return new DoktornaraboteOAuthServiceImpl(this, config);
34-
}
3527
}

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

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

33
import com.github.scribejava.core.builder.api.DefaultApi20;
4+
import com.github.scribejava.core.builder.api.SignatureType;
45
import com.github.scribejava.core.model.Verb;
56

67
/**
@@ -39,4 +40,9 @@ public String getRefreshTokenEndpoint() {
3940
protected String getAuthorizationBaseUrl() {
4041
return "https://www.facebook.com/v2.8/dialog/oauth";
4142
}
43+
44+
@Override
45+
public SignatureType getSignatureType() {
46+
return SignatureType.BEARER_URI_QUERY_PARAMETER;
47+
}
4248
}

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

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

33
import com.github.scribejava.core.builder.api.DefaultApi20;
4+
import com.github.scribejava.core.builder.api.SignatureType;
45
import com.github.scribejava.core.model.Verb;
56

67
public class Foursquare2Api extends DefaultApi20 {
@@ -30,4 +31,9 @@ public String getAccessTokenEndpoint() {
3031
protected String getAuthorizationBaseUrl() {
3132
return "https://foursquare.com/oauth2/authenticate";
3233
}
34+
35+
@Override
36+
public SignatureType getSignatureType() {
37+
return SignatureType.BEARER_URI_QUERY_PARAMETER;
38+
}
3339
}

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

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

3-
import com.github.scribejava.apis.service.GeniusOAuthServiceImpl;
43
import com.github.scribejava.core.builder.api.DefaultApi20;
5-
import com.github.scribejava.core.model.OAuthConfig;
6-
import com.github.scribejava.core.oauth.OAuth20Service;
74

85
public class GeniusApi extends DefaultApi20 {
96

@@ -28,9 +25,4 @@ public String getAccessTokenEndpoint() {
2825
protected String getAuthorizationBaseUrl() {
2926
return "https://api.genius.com/oauth/authorize";
3027
}
31-
32-
@Override
33-
public OAuth20Service createService(OAuthConfig config) {
34-
return new GeniusOAuthServiceImpl(this, config);
35-
}
3628
}

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

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

33
import com.github.scribejava.core.builder.api.DefaultApi20;
4+
import com.github.scribejava.core.builder.api.SignatureType;
45
import com.github.scribejava.core.extractors.OAuth2AccessTokenExtractor;
56
import com.github.scribejava.core.extractors.TokenExtractor;
67
import com.github.scribejava.core.model.OAuth2AccessToken;
@@ -38,4 +39,9 @@ protected String getAuthorizationBaseUrl() {
3839
public TokenExtractor<OAuth2AccessToken> getAccessTokenExtractor() {
3940
return OAuth2AccessTokenExtractor.instance();
4041
}
42+
43+
@Override
44+
public SignatureType getSignatureType() {
45+
return SignatureType.BEARER_URI_QUERY_PARAMETER;
46+
}
4147
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.github.scribejava.apis.google.GoogleJsonTokenExtractor;
44
import com.github.scribejava.core.builder.api.DefaultApi20;
5+
import com.github.scribejava.core.builder.api.SignatureType;
56
import com.github.scribejava.core.extractors.TokenExtractor;
67
import com.github.scribejava.core.model.OAuth2AccessToken;
78

@@ -32,4 +33,9 @@ protected String getAuthorizationBaseUrl() {
3233
public TokenExtractor<OAuth2AccessToken> getAccessTokenExtractor() {
3334
return GoogleJsonTokenExtractor.instance();
3435
}
36+
37+
@Override
38+
public SignatureType getSignatureType() {
39+
return SignatureType.BEARER_URI_QUERY_PARAMETER;
40+
}
3541
}

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

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

33
import com.github.scribejava.core.builder.api.DefaultApi20;
4-
import com.github.scribejava.core.model.OAuthConfig;
5-
6-
import com.github.scribejava.apis.service.HHOAuthServiceImpl;
7-
import com.github.scribejava.core.oauth.OAuth20Service;
84

95
public class HHApi extends DefaultApi20 {
106

@@ -28,9 +24,4 @@ public String getAccessTokenEndpoint() {
2824
protected String getAuthorizationBaseUrl() {
2925
return "https://hh.ru/oauth/authorize";
3026
}
31-
32-
@Override
33-
public OAuth20Service createService(OAuthConfig config) {
34-
return new HHOAuthServiceImpl(this, config);
35-
}
3627
}

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

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

33
import com.github.scribejava.core.builder.api.DefaultApi20;
4+
import com.github.scribejava.core.builder.api.SignatureType;
45
import com.github.scribejava.core.model.Verb;
56

67
/**
@@ -33,4 +34,9 @@ public String getAccessTokenEndpoint() {
3334
protected String getAuthorizationBaseUrl() {
3435
return "http://api.kaixin001.com/oauth2/authorize";
3536
}
37+
38+
@Override
39+
public SignatureType getSignatureType() {
40+
return SignatureType.BEARER_URI_QUERY_PARAMETER;
41+
}
3642
}

0 commit comments

Comments
 (0)