Skip to content

modify the enum as an abstract type, allowing custom implementations。 #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kullfar merged 1 commit into from
Aug 3, 2018
Merged

modify the enum as an abstract type, allowing custom implementations。 #860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 29 additions & 21 deletions ...a-core/src/main/java/com/github/scribejava/core/builder/api/ClientAuthenticationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,36 @@
* in it's part 2.3.1. Client Password<br>
* https://tools.ietf.org/html/rfc6749#section-2.3.1
*/
public enum ClientAuthenticationType {
HTTP_BASIC_AUTHENTICATION_SCHEME {
private final Base64.Encoder base64Encoder = Base64.getEncoder();
public abstract class ClientAuthenticationType {

@Override
public void addClientAuthentication(OAuthRequest request, String apiKey, String apiSecret) {
if (apiKey != null && apiSecret != null) {
request.addHeader(OAuthConstants.HEADER, OAuthConstants.BASIC + ' '
+ base64Encoder.encodeToString(
public static final ClientAuthenticationType HTTP_BASIC_AUTHENTICATION_SCHEME =
new ClientAuthenticationType() {
private final Base64.Encoder base64Encoder = Base64.getEncoder();

@Override
public void addClientAuthentication(OAuthRequest request, String apiKey,
String apiSecret) {
if (apiKey != null && apiSecret != null) {
request.addHeader(OAuthConstants.HEADER, OAuthConstants.BASIC + ' '
+ base64Encoder.encodeToString(
String.format("%s:%s", apiKey, apiSecret).getBytes(Charset.forName("UTF-8"))));
}
}
},
REQUEST_BODY {
@Override
public void addClientAuthentication(OAuthRequest request, String apiKey, String apiSecret) {
request.addParameter(OAuthConstants.CLIENT_ID, apiKey);
if (apiSecret != null) {
request.addParameter(OAuthConstants.CLIENT_SECRET, apiSecret);
}
}
};
}
}
};

public static final ClientAuthenticationType REQUEST_BODY =
new ClientAuthenticationType() {

@Override
public void addClientAuthentication(OAuthRequest request, String apiKey,
String apiSecret) {
request.addParameter(OAuthConstants.CLIENT_ID, apiKey);
if (apiSecret != null) {
request.addParameter(OAuthConstants.CLIENT_SECRET, apiSecret);
}
}
};

public abstract void addClientAuthentication(OAuthRequest request, String apiKey, String apiSecret);
public abstract void addClientAuthentication(OAuthRequest request, String apiKey,
String apiSecret);
}