getHeaders() {
- return headers;
- }
-
- public String getCharset() {
- return charset == null ? Charset.defaultCharset().name() : charset;
- }
-
- /**
- * Set the charset of the body of the request
- *
- * @param charsetName name of the charset of the request
- */
- public void setCharset(String charsetName) {
- charset = charsetName;
- }
-
- /**
- * Sets whether the underlying Http Connection is persistent or not.
- *
- * @param connectionKeepAlive boolean
- *
- * @see http://download.oracle.com/javase/1.5.0/docs/guide/net/http-keepalive.html
- */
- public void setConnectionKeepAlive(boolean connectionKeepAlive) {
- this.connectionKeepAlive = connectionKeepAlive;
- }
-
- /**
- * Sets whether the underlying Http Connection follows redirects or not.
- *
- * Defaults to true (follow redirects)
- *
- * @see http://docs.oracle.com/javase/6/docs/api/java/net/HttpURLConnection.html#setInstanceFollowRedirects(boolean)
- * @param followRedirects boolean
- */
- public void setFollowRedirects(boolean followRedirects) {
- this.followRedirects = followRedirects;
- }
-
- public boolean isConnectionKeepAlive() {
- return connectionKeepAlive;
- }
-
- public boolean isFollowRedirects() {
- return followRedirects;
- }
-
- public OAuthService getService() {
- return service;
- }
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/ForceTypeOfHttpRequest.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/ForceTypeOfHttpRequest.java
deleted file mode 100644
index b0387a535..000000000
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/ForceTypeOfHttpRequest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.scribejava.core.model;
-
-public enum ForceTypeOfHttpRequest {
-
- NONE,
- FORCE_ASYNC_ONLY_HTTP_REQUESTS,
- FORCE_SYNC_ONLY_HTTP_REQUESTS,
- PREFER_ASYNC_ONLY_HTTP_REQUESTS,
- PREFER_SYNC_ONLY_HTTP_REQUESTS
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1AccessToken.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1AccessToken.java
index 838fc2adb..e57a7db39 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1AccessToken.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1AccessToken.java
@@ -3,11 +3,11 @@
import java.util.Objects;
/**
- * Represents an OAuth 1 Access Token http://oauth.net/core/1.0a/#rfc.section.6.3.2
+ * Represents an OAuth 1 Access Token http://tools.ietf.org/html/rfc5849#section-2.3
*/
public class OAuth1AccessToken extends OAuth1Token {
- private static final long serialVersionUID = -8784937061938486135L;
+ private static final long serialVersionUID = -103999293167210966L;
public OAuth1AccessToken(String token, String tokenSecret) {
this(token, tokenSecret, null);
@@ -17,6 +17,26 @@ public OAuth1AccessToken(String token, String tokenSecret, String rawResponse) {
super(token, tokenSecret, rawResponse);
}
+ /**
+ * The token identifier.
+ *
+ * @return oauth_token
+ */
+ @Override
+ public String getToken() {
+ return super.getToken();
+ }
+
+ /**
+ * The token shared-secret.
+ *
+ * @return oauth_token_secret
+ */
+ @Override
+ public String getTokenSecret() {
+ return super.getTokenSecret();
+ }
+
@Override
public int hashCode() {
int hash = 3;
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1RequestToken.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1RequestToken.java
index b7db7047b..1c53d4932 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1RequestToken.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1RequestToken.java
@@ -3,17 +3,17 @@
import java.util.Objects;
/**
- * Represents an OAuth 1 Request Token http://oauth.net/core/1.0a/#rfc.section.6.1.2
+ * Represents an OAuth 1 Request Token http://tools.ietf.org/html/rfc5849#section-2.1
*/
public class OAuth1RequestToken extends OAuth1Token {
- private static final long serialVersionUID = 359527630020350893L;
+ private static final long serialVersionUID = 6185104114662587991L;
/**
* oauth_callback_confirmed:
*
- * MUST be present and set to true. The Consumer MAY use this to confirm that the Service Provider received the
- * callback value.
+ * MUST be present and set to "true". The parameter is used to differentiate from previous versions of the protocol.
+ *
*/
private final boolean oauthCallbackConfirmed;
@@ -30,6 +30,26 @@ public OAuth1RequestToken(String token, String tokenSecret, boolean oauthCallbac
this.oauthCallbackConfirmed = oauthCallbackConfirmed;
}
+ /**
+ * The temporary credentials identifier.
+ *
+ * @return oauth_token
+ */
+ @Override
+ public String getToken() {
+ return super.getToken();
+ }
+
+ /**
+ * The temporary credentials shared-secret.
+ *
+ * @return oauth_token_secret
+ */
+ @Override
+ public String getTokenSecret() {
+ return super.getTokenSecret();
+ }
+
public boolean isOauthCallbackConfirmed() {
return oauthCallbackConfirmed;
}
@@ -69,6 +89,6 @@ public String toString() {
return "OAuth1RequestToken{"
+ "oauth_token=" + getToken()
+ ", oauth_token_secret=" + getTokenSecret()
- + ", oauthCallbackConfirmed=" + oauthCallbackConfirmed + '}';
+ + ", oauth_callback_confirmed=" + oauthCallbackConfirmed + '}';
}
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1Token.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1Token.java
index c50fbd29e..3d02f49aa 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1Token.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth1Token.java
@@ -9,18 +9,8 @@ public abstract class OAuth1Token extends Token {
private static final long serialVersionUID = 6285873427974823019L;
- /**
- * oauth_token:
- *
- * The Request/Access Token.
- */
private final String token;
- /**
- * oauth_token_secret:
- *
- * The Token Secret.
- */
private final String tokenSecret;
public OAuth1Token(String token, String tokenSecret, String rawResponse) {
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessToken.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessToken.java
index 5205aa64f..b97e4e0a0 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessToken.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessToken.java
@@ -4,7 +4,11 @@
import java.util.Objects;
/**
- * Represents an OAuth 2 Access Token http://tools.ietf.org/html/rfc6749#section-5.1
+ * Represents an OAuth 2 Access token.
+ *
+ * http://tools.ietf.org/html/rfc6749#section-5.1
+ *
+ * @see OAuth 2 Access Token Specification
*/
public class OAuth2AccessToken extends Token {
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessTokenErrorResponse.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessTokenErrorResponse.java
new file mode 100644
index 000000000..eba31404e
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2AccessTokenErrorResponse.java
@@ -0,0 +1,50 @@
+package com.github.scribejava.core.model;
+
+import com.github.scribejava.core.exceptions.OAuthException;
+
+import java.net.URI;
+
+/**
+ * Representing "5.2. Error Response"
+ */
+public class OAuth2AccessTokenErrorResponse extends OAuthException {
+
+ private static final long serialVersionUID = 2309424849700276816L;
+
+ public enum ErrorCode {
+ invalid_request, invalid_client, invalid_grant, unauthorized_client, unsupported_grant_type, invalid_scope
+ }
+
+ private final ErrorCode errorCode;
+ private final String errorDescription;
+ private final URI errorUri;
+ private final String rawResponse;
+
+ public OAuth2AccessTokenErrorResponse(ErrorCode errorCode, String errorDescription, URI errorUri,
+ String rawResponse) {
+ super(rawResponse);
+ if (errorCode == null) {
+ throw new IllegalArgumentException("errorCode must not be null");
+ }
+ this.errorCode = errorCode;
+ this.errorDescription = errorDescription;
+ this.errorUri = errorUri;
+ this.rawResponse = rawResponse;
+ }
+
+ public ErrorCode getErrorCode() {
+ return errorCode;
+ }
+
+ public String getErrorDescription() {
+ return errorDescription;
+ }
+
+ public URI getErrorUri() {
+ return errorUri;
+ }
+
+ public String getRawResponse() {
+ return rawResponse;
+ }
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2Authorization.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2Authorization.java
new file mode 100644
index 000000000..8c99f395b
--- /dev/null
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuth2Authorization.java
@@ -0,0 +1,43 @@
+package com.github.scribejava.core.model;
+
+/**
+ * represents Authorization Response http://tools.ietf.org/html/rfc6749#section-4.1.2
+ *
+ * If the resource owner grants the access request, the authorization server issues an authorization code and delivers
+ * it to the client by adding the following parameters to the query component of the redirection URI using the
+ * "application/x-www-form-urlencoded" format.
+ *
+ */
+public class OAuth2Authorization {
+
+ /**
+ * REQUIRED. The authorization code generated by the authorization server. The authorization code MUST expire
+ * shortly after it is issued to mitigate the risk of leaks. A maximum authorization code lifetime of 10 minutes is
+ * RECOMMENDED. The client MUST NOT use the authorization code more than once. If an authorization code is used more
+ * than once, the authorization server MUST deny the request and SHOULD revoke (when possible) all tokens previously
+ * issued based on that authorization code. The authorization code is bound to the client identifier and redirection
+ * URI.
+ */
+ private String code;
+ /**
+ * REQUIRED if the "state" parameter was present in the client authorization request. The exact value received from
+ * the client.
+ */
+ private String state;
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConfig.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConfig.java
index 92b8bbbbc..244ca6731 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConfig.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConfig.java
@@ -1,5 +1,7 @@
package com.github.scribejava.core.model;
+import com.github.scribejava.core.httpclient.HttpClient;
+import com.github.scribejava.core.httpclient.HttpClientConfig;
import java.io.IOException;
import java.io.OutputStream;
@@ -11,29 +13,32 @@ public class OAuthConfig {
private final String apiKey;
private final String apiSecret;
private final String callback;
- private final SignatureType signatureType;
private final String scope;
- private final String grantType;
private final OutputStream debugStream;
- private final Integer connectTimeout;
- private final Integer readTimeout;
- private String state;
+ private final String state;
+ private final String responseType;
+ private final String userAgent;
+
+ private HttpClientConfig httpClientConfig;
+ private HttpClient httpClient;
public OAuthConfig(String key, String secret) {
- this(key, secret, null, null, null, null, null, null, null);
+ this(key, secret, null, null, null, null, null, null, null, null);
}
- public OAuthConfig(String key, String secret, String callback, SignatureType type, String scope,
- OutputStream stream, Integer connectTimeout, Integer readTimeout, String grantType) {
- this.apiKey = key;
- this.apiSecret = secret;
+ public OAuthConfig(String apiKey, String apiSecret, String callback, String scope, OutputStream debugStream,
+ String state, String responseType, String userAgent, HttpClientConfig httpClientConfig,
+ HttpClient httpClient) {
+ this.apiKey = apiKey;
+ this.apiSecret = apiSecret;
this.callback = callback;
- this.signatureType = type;
this.scope = scope;
- this.debugStream = stream;
- this.connectTimeout = connectTimeout;
- this.readTimeout = readTimeout;
- this.grantType = grantType;
+ this.debugStream = debugStream;
+ this.state = state;
+ this.responseType = responseType;
+ this.userAgent = userAgent;
+ this.httpClientConfig = httpClientConfig;
+ this.httpClient = httpClient;
}
public String getApiKey() {
@@ -48,32 +53,20 @@ public String getCallback() {
return callback;
}
- public SignatureType getSignatureType() {
- return signatureType;
- }
-
public String getScope() {
return scope;
}
- public boolean hasScope() {
- return scope != null;
- }
-
- public String getGrantType() {
- return grantType;
- }
-
- public boolean hasGrantType() {
- return grantType != null;
+ public String getState() {
+ return state;
}
- public Integer getConnectTimeout() {
- return connectTimeout;
+ public String getResponseType() {
+ return responseType;
}
- public Integer getReadTimeout() {
- return readTimeout;
+ public String getUserAgent() {
+ return userAgent;
}
public void log(String message) {
@@ -87,17 +80,11 @@ public void log(String message) {
}
}
- /**
- * Sets optional value used by some provider implementations that is exchanged with provider to avoid CSRF attacks.
- *
- * @param state some secret key that client side shall never receive
- */
- public void setState(String state) {
- this.state = state;
+ public HttpClientConfig getHttpClientConfig() {
+ return httpClientConfig;
}
- public String getState() {
- return state;
+ public HttpClient getHttpClient() {
+ return httpClient;
}
-
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConfigAsync.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConfigAsync.java
deleted file mode 100644
index 1387a9b01..000000000
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConfigAsync.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.scribejava.core.model;
-
-import com.ning.http.client.AsyncHttpClientConfig;
-import java.io.OutputStream;
-
-public class OAuthConfigAsync extends OAuthConfig {
-
- private AsyncHttpClientConfig asyncHttpClientConfig;
- private String asyncHttpProviderClassName;
-
- public OAuthConfigAsync(String key, String secret) {
- super(key, secret);
- }
-
- public OAuthConfigAsync(String key, String secret, String callback, SignatureType type, String scope,
- String grantType, OutputStream stream, AsyncHttpClientConfig asyncHttpClientConfig) {
- super(key, secret, callback, type, scope, stream, null, null, grantType);
- this.asyncHttpClientConfig = asyncHttpClientConfig;
- }
-
- public AsyncHttpClientConfig getAsyncHttpClientConfig() {
- return asyncHttpClientConfig;
- }
-
- public void setAsyncHttpProviderClassName(String asyncHttpProviderClassName) {
- this.asyncHttpProviderClassName = asyncHttpProviderClassName;
- }
-
- public String getAsyncHttpProviderClassName() {
- return asyncHttpProviderClassName;
- }
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConstants.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConstants.java
index 229392c38..2cf8d236a 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConstants.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthConstants.java
@@ -20,8 +20,8 @@ public interface OAuthConstants {
String OUT_OF_BAND = "oob";
String VERIFIER = "oauth_verifier";
String HEADER = "Authorization";
- OAuth1RequestToken EMPTY_TOKEN = new OAuth1RequestToken("", "");
String SCOPE = "scope";
+ String BASIC = "Basic";
// OAuth 2.0
String ACCESS_TOKEN = "access_token";
@@ -29,7 +29,16 @@ public interface OAuthConstants {
String CLIENT_SECRET = "client_secret";
String REDIRECT_URI = "redirect_uri";
String CODE = "code";
+ String REFRESH_TOKEN = "refresh_token";
String GRANT_TYPE = "grant_type";
String AUTHORIZATION_CODE = "authorization_code";
String STATE = "state";
+ String USERNAME = "username";
+ String PASSWORD = "password";
+ String RESPONSE_TYPE = "response_type";
+ String RESPONSE_TYPE_CODE = "code";
+
+ //not OAuth specific
+ String USER_AGENT_HEADER_NAME = "User-Agent";
+
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java
index 66a36415a..3f50440eb 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequest.java
@@ -1,88 +1,275 @@
package com.github.scribejava.core.model;
+import com.github.scribejava.core.exceptions.OAuthException;
+import java.io.File;
import java.io.IOException;
-import java.net.HttpURLConnection;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.HashMap;
import java.util.Map;
-import com.github.scribejava.core.exceptions.OAuthConnectionException;
-import com.github.scribejava.core.exceptions.OAuthException;
-import com.github.scribejava.core.oauth.OAuthService;
-public class OAuthRequest extends AbstractRequest {
+/**
+ * The representation of an OAuth HttpRequest.
+ */
+public class OAuthRequest {
- private HttpURLConnection connection;
+ private static final String OAUTH_PREFIX = "oauth_";
- public OAuthRequest(Verb verb, String url, OAuthService service) {
- super(verb, url, service);
- }
+ private final String url;
+ private final Verb verb;
+ private final ParameterList querystringParams = new ParameterList();
+ private final ParameterList bodyParams = new ParameterList();
+ private final Map headers = new HashMap<>();
+
+ private String charset;
+
+ private String stringPayload;
+ private byte[] byteArrayPayload;
+ private File filePayload;
+
+ private final Map oauthParameters = new HashMap<>();
+
+ private String realm;
/**
- * Execute the request and return a {@link Response}
+ * Default constructor.
*
- * @return Http Response
+ * @param verb Http verb/method
+ * @param url resource URL
+ */
+ public OAuthRequest(Verb verb, String url) {
+ this.verb = verb;
+ this.url = url;
+ }
+
+ /**
+ * Adds an OAuth parameter.
*
- * @throws RuntimeException if the connection cannot be created.
+ * @param key name of the parameter
+ * @param value value of the parameter
+ * @throws IllegalArgumentException if the parameter is not an OAuth parameter
*/
- public Response send() {
- final ForceTypeOfHttpRequest forceTypeOfHttpRequest = ScribeJavaConfig.getForceTypeOfHttpRequests();
+ public void addOAuthParameter(String key, String value) {
+ oauthParameters.put(checkKey(key), value);
+ }
- if (ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
- throw new OAuthException("Cannot use sync operations, only async");
+ private String checkKey(String key) {
+ if (key.startsWith(OAUTH_PREFIX) || key.equals(OAuthConstants.SCOPE) || key.equals(OAuthConstants.REALM)) {
+ return key;
+ } else {
+ throw new IllegalArgumentException(
+ String.format("OAuth parameters must either be '%s', '%s' or start with '%s'", OAuthConstants.SCOPE,
+ OAuthConstants.REALM, OAUTH_PREFIX));
}
- if (ForceTypeOfHttpRequest.PREFER_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
- getService().getConfig().log("Cannot use sync operations, only async");
+ }
+
+ public Map getOauthParameters() {
+ return oauthParameters;
+ }
+
+ public void setRealm(String realm) {
+ this.realm = realm;
+ }
+
+ public String getRealm() {
+ return realm;
+ }
+
+ /**
+ * Returns the complete url (host + resource + encoded querystring parameters).
+ *
+ * @return the complete url.
+ */
+ public String getCompleteUrl() {
+ return querystringParams.appendTo(url);
+ }
+
+ /**
+ * Add an HTTP Header to the Request
+ *
+ * @param key the header name
+ * @param value the header value
+ */
+ public void addHeader(String key, String value) {
+ this.headers.put(key, value);
+ }
+
+ /**
+ * Add a body Parameter (for POST/ PUT Requests)
+ *
+ * @param key the parameter name
+ * @param value the parameter value
+ */
+ public void addBodyParameter(String key, String value) {
+ this.bodyParams.add(key, value);
+ }
+
+ /**
+ * Add a QueryString parameter
+ *
+ * @param key the parameter name
+ * @param value the parameter value
+ */
+ public void addQuerystringParameter(String key, String value) {
+ this.querystringParams.add(key, value);
+ }
+
+ public void addParameter(String key, String value) {
+ if (verb.isPermitBody()) {
+ bodyParams.add(key, value);
+ } else {
+ querystringParams.add(key, value);
}
+ }
+
+ /**
+ * Set body payload. This method is used when the HTTP body is not a form-url-encoded string, but another thing.
+ * Like for example XML. Note: The contents are not part of the OAuth signature
+ *
+ * @param payload the body of the request
+ */
+ public void setPayload(String payload) {
+ resetPayload();
+ stringPayload = payload;
+ }
+
+ /**
+ * Overloaded version for byte arrays
+ *
+ * @param payload byte[]
+ */
+ public void setPayload(byte[] payload) {
+ resetPayload();
+ byteArrayPayload = payload.clone();
+ }
+
+ /**
+ * Overloaded version for File
+ *
+ * @param payload File
+ */
+ public void setPayload(File payload) {
+ resetPayload();
+ filePayload = payload;
+ }
+
+ private void resetPayload() {
+ stringPayload = null;
+ byteArrayPayload = null;
+ filePayload = null;
+ }
+
+ /**
+ * Get a {@link ParameterList} with the query string parameters.
+ *
+ * @return a {@link ParameterList} containing the query string parameters.
+ * @throws OAuthException if the request URL is not valid.
+ */
+ public ParameterList getQueryStringParams() {
try {
- createConnection();
- return doSend();
- } catch (IOException | RuntimeException e) {
- throw new OAuthConnectionException(getCompleteUrl(), e);
+ final ParameterList result = new ParameterList();
+ final String queryString = new URL(url).getQuery();
+ result.addQuerystring(queryString);
+ result.addAll(querystringParams);
+ return result;
+ } catch (MalformedURLException mue) {
+ throw new OAuthException("Malformed URL", mue);
}
}
- Response doSend() throws IOException {
- final Verb verb = getVerb();
- connection.setRequestMethod(verb.name());
- final OAuthConfig config = getService().getConfig();
- if (config.getConnectTimeout() != null) {
- connection.setConnectTimeout(config.getConnectTimeout());
+ /**
+ * Obtains a {@link ParameterList} of the body parameters.
+ *
+ * @return a {@link ParameterList}containing the body parameters.
+ */
+ public ParameterList getBodyParams() {
+ return bodyParams;
+ }
+
+ /**
+ * Obtains the URL of the HTTP Request.
+ *
+ * @return the original URL of the HTTP Request
+ */
+ public String getUrl() {
+ return url;
+ }
+
+ /**
+ * Returns the URL without the port and the query string part.
+ *
+ * @return the OAuth-sanitized URL
+ */
+ public String getSanitizedUrl() {
+ if (url.startsWith("http://") && (url.endsWith(":80") || url.contains(":80/"))) {
+ return url.replaceAll("\\?.*", "").replaceAll(":80", "");
+ } else if (url.startsWith("https://") && (url.endsWith(":443") || url.contains(":443/"))) {
+ return url.replaceAll("\\?.*", "").replaceAll(":443", "");
+ } else {
+ return url.replaceAll("\\?.*", "");
}
- if (config.getReadTimeout() != null) {
- connection.setReadTimeout(config.getReadTimeout());
+ }
+
+ /**
+ * Returns the body of the request (set in {@link #setPayload(java.lang.String)})
+ *
+ * @return form encoded string
+ */
+ public String getStringPayload() {
+ return stringPayload;
+ }
+
+ /**
+ * @return the body of the request (set in {@link #setPayload(byte[])} or in
+ * {@link #addBodyParameter(java.lang.String, java.lang.String)} )
+ */
+ public byte[] getByteArrayPayload() {
+ if (byteArrayPayload != null) {
+ return byteArrayPayload;
}
- addHeaders();
- if (hasBodyContent()) {
- addBody(getByteBodyContents());
+ final String body = bodyParams.asFormUrlEncodedString();
+ try {
+ return body.getBytes(getCharset());
+ } catch (UnsupportedEncodingException uee) {
+ throw new OAuthException("Unsupported Charset: " + getCharset(), uee);
}
- return new Response(connection);
}
- private void createConnection() throws IOException {
- final String completeUrl = getCompleteUrl();
- if (connection == null) {
- System.setProperty("http.keepAlive", isConnectionKeepAlive() ? "true" : "false");
- connection = (HttpURLConnection) new URL(completeUrl).openConnection();
- connection.setInstanceFollowRedirects(isFollowRedirects());
- }
+ public File getFilePayload() {
+ return filePayload;
}
- void addHeaders() {
- for (Map.Entry entry : getHeaders().entrySet()) {
- connection.setRequestProperty(entry.getKey(), entry.getValue());
- }
+ @Override
+ public String toString() {
+ return String.format("@Request(%s %s)", getVerb(), getUrl());
}
- void addBody(byte[] content) throws IOException {
- connection.setRequestProperty(CONTENT_LENGTH, String.valueOf(content.length));
+ public Verb getVerb() {
+ return verb;
+ }
- if (connection.getRequestProperty(CONTENT_TYPE) == null) {
- connection.setRequestProperty(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
- }
- connection.setDoOutput(true);
- connection.getOutputStream().write(content);
+ public Map getHeaders() {
+ return headers;
+ }
+
+ public String getCharset() {
+ return charset == null ? Charset.defaultCharset().name() : charset;
+ }
+
+ /**
+ * Set the charset of the body of the request
+ *
+ * @param charsetName name of the charset of the request
+ */
+ public void setCharset(String charsetName) {
+ charset = charsetName;
}
- void setConnection(HttpURLConnection connection) {
- this.connection = connection;
+ public interface ResponseConverter {
+
+ T convert(Response response) throws IOException;
}
+
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequestAsync.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequestAsync.java
deleted file mode 100644
index a7dd1dce5..000000000
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/OAuthRequestAsync.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.github.scribejava.core.model;
-
-import com.ning.http.client.AsyncCompletionHandler;
-import com.ning.http.client.AsyncHttpClient;
-import com.ning.http.client.FluentCaseInsensitiveStringsMap;
-import com.ning.http.client.ProxyServer;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Future;
-import com.github.scribejava.core.exceptions.OAuthException;
-import com.github.scribejava.core.oauth.OAuthService;
-
-public class OAuthRequestAsync extends AbstractRequest {
-
- public static final ResponseConverter RESPONSE_CONVERTER = new ResponseConverter() {
- @Override
- public Response convert(com.ning.http.client.Response response) throws IOException {
- final FluentCaseInsensitiveStringsMap map = response.getHeaders();
- final Map headersMap = new HashMap<>();
- for (FluentCaseInsensitiveStringsMap.Entry> header : map) {
- final StringBuilder value = new StringBuilder();
- for (String str : header.getValue()) {
- value.append(str);
- }
- headersMap.put(header.getKey(), value.toString());
- }
- return new Response(response.getStatusCode(), response.getStatusText(), headersMap,
- response.getResponseBody(), response.getResponseBodyAsStream());
- }
- };
-
- public OAuthRequestAsync(Verb verb, String url, OAuthService service) {
- super(verb, url, service);
- }
-
- public Future sendAsync(OAuthAsyncRequestCallback callback, ResponseConverter converter) {
- return sendAsync(callback, converter, null);
- }
-
- public Future sendAsync(OAuthAsyncRequestCallback callback, ResponseConverter converter,
- ProxyServer proxyServer) {
- final ForceTypeOfHttpRequest forceTypeOfHttpRequest = ScribeJavaConfig.getForceTypeOfHttpRequests();
- if (ForceTypeOfHttpRequest.FORCE_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
- throw new OAuthException("Cannot use async operations, only sync");
- }
- final OAuthService service = getService();
- if (ForceTypeOfHttpRequest.PREFER_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
- service.getConfig().log("Cannot use async operations, only sync");
- }
- final String completeUrl = getCompleteUrl();
- final AsyncHttpClient.BoundRequestBuilder boundRequestBuilder;
- switch (getVerb()) {
- case GET:
- boundRequestBuilder = service.getAsyncHttpClient().prepareGet(completeUrl);
- break;
- case POST:
- boundRequestBuilder = service.getAsyncHttpClient().preparePost(completeUrl).setBody(getBodyContents());
- break;
- default:
- throw new IllegalArgumentException("message build error: unknown verb type");
- }
- if (proxyServer != null) {
- boundRequestBuilder.setProxyServer(proxyServer);
- }
- return boundRequestBuilder.execute(new OAuthAsyncCompletionHandler<>(callback, converter));
- }
-
- private static class OAuthAsyncCompletionHandler extends AsyncCompletionHandler {
-
- private final OAuthAsyncRequestCallback callback;
- private final ResponseConverter converter;
-
- OAuthAsyncCompletionHandler(OAuthAsyncRequestCallback callback, ResponseConverter converter) {
- this.callback = callback;
- this.converter = converter;
- }
-
- @Override
- public T onCompleted(com.ning.http.client.Response response) throws IOException {
- final T t = converter.convert(response);
- if (callback != null) {
- callback.onCompleted(t);
- }
- return t;
- }
-
- @Override
- public void onThrowable(Throwable t) {
- if (callback != null) {
- callback.onThrowable(t);
- }
- }
- };
-
- public Future sendAsync(OAuthAsyncRequestCallback callback) {
- return sendAsync(callback, RESPONSE_CONVERTER, null);
- }
-
- public Future sendAsync(OAuthAsyncRequestCallback callback, ProxyServer proxyServer) {
- return sendAsync(callback, RESPONSE_CONVERTER, proxyServer);
- }
-
- public interface ResponseConverter {
-
- T convert(com.ning.http.client.Response response) throws IOException;
- }
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/ParameterList.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/ParameterList.java
index c04bca9cd..39d806652 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/ParameterList.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/ParameterList.java
@@ -26,8 +26,10 @@ public ParameterList() {
public ParameterList(Map map) {
this();
- for (Map.Entry entry : map.entrySet()) {
- params.add(new Parameter(entry.getKey(), entry.getValue()));
+ if (map != null && !map.isEmpty()) {
+ for (Map.Entry entry : map.entrySet()) {
+ params.add(new Parameter(entry.getKey(), entry.getValue()));
+ }
}
}
@@ -41,9 +43,9 @@ public String appendTo(String url) {
if (queryString.equals(EMPTY_STRING)) {
return url;
} else {
- url += url.indexOf(QUERY_STRING_SEPARATOR) == -1 ? QUERY_STRING_SEPARATOR : PARAM_SEPARATOR;
- url += queryString;
- return url;
+ return url
+ + (url.indexOf(QUERY_STRING_SEPARATOR) == -1 ? QUERY_STRING_SEPARATOR : PARAM_SEPARATOR)
+ + queryString;
}
}
@@ -58,9 +60,9 @@ public String asFormUrlEncodedString() {
final StringBuilder builder = new StringBuilder();
for (Parameter p : params) {
- builder.append('&').append(p.asUrlEncodedPair());
+ builder.append(PARAM_SEPARATOR).append(p.asUrlEncodedPair());
}
- return builder.toString().substring(1);
+ return builder.substring(1);
}
public void addAll(ParameterList other) {
@@ -68,7 +70,7 @@ public void addAll(ParameterList other) {
}
public void addQuerystring(String queryString) {
- if (queryString != null && queryString.length() > 0) {
+ if (queryString != null && !queryString.isEmpty()) {
for (String param : queryString.split(PARAM_SEPARATOR)) {
final String[] pair = param.split(PAIR_SEPARATOR);
final String key = OAuthEncoder.decode(pair[0]);
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java
index bce6e584a..8a4807677 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java
@@ -2,68 +2,50 @@
import java.io.IOException;
import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.UnknownHostException;
-import java.util.HashMap;
import java.util.Map;
-import com.github.scribejava.core.exceptions.OAuthException;
import com.github.scribejava.core.utils.StreamUtils;
public class Response {
- private int code;
- private String message;
+ private final int code;
+ private final String message;
+ private final Map headers;
private String body;
private InputStream stream;
- private Map headers;
- public Response(int code, String message, Map headers, String body, InputStream stream) {
+ private Response(int code, String message, Map headers) {
this.code = code;
- this.headers = headers;
- this.body = body;
this.message = message;
+ this.headers = headers;
+ }
+
+ public Response(int code, String message, Map headers, InputStream stream) {
+ this(code, message, headers);
this.stream = stream;
}
- Response(HttpURLConnection connection) throws IOException {
- try {
- connection.connect();
- code = connection.getResponseCode();
- message = connection.getResponseMessage();
- headers = parseHeaders(connection);
- stream = isSuccessful() ? connection.getInputStream() : connection.getErrorStream();
- } catch (UnknownHostException e) {
- throw new OAuthException("The IP address of a host could not be determined.", e);
- }
+ public Response(int code, String message, Map headers, String body) {
+ this(code, message, headers);
+ this.body = body;
}
- private String parseBodyContents() {
+ private String parseBodyContents() throws IOException {
+ if (stream == null) {
+ return null;
+ }
if ("gzip".equals(getHeader("Content-Encoding"))) {
- body = StreamUtils.getGzipStreamContents(getStream());
+ body = StreamUtils.getGzipStreamContents(stream);
} else {
- body = StreamUtils.getStreamContents(getStream());
+ body = StreamUtils.getStreamContents(stream);
}
return body;
}
- private Map parseHeaders(HttpURLConnection conn) {
- final Map headers = new HashMap<>();
- for (String key : conn.getHeaderFields().keySet()) {
- headers.put(key, conn.getHeaderFields().get(key).get(0));
- }
- return headers;
- }
-
public final boolean isSuccessful() {
- return getCode() >= 200 && getCode() < 400;
+ return code >= 200 && code < 400;
}
- /**
- * Obtains the HTTP Response body
- *
- * @return response body
- */
- public String getBody() {
+ public String getBody() throws IOException {
return body == null ? parseBodyContents() : body;
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/ScribeJavaConfig.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/ScribeJavaConfig.java
deleted file mode 100644
index 171bbac1a..000000000
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/ScribeJavaConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.scribejava.core.model;
-
-public abstract class ScribeJavaConfig {
-
- private static ForceTypeOfHttpRequest forceTypeOfHttpRequests = ForceTypeOfHttpRequest.NONE;
-
- public static ForceTypeOfHttpRequest getForceTypeOfHttpRequests() {
- return forceTypeOfHttpRequests;
- }
-
- public static void setForceTypeOfHttpRequests(ForceTypeOfHttpRequest forceTypeOfHttpRequests) {
- ScribeJavaConfig.forceTypeOfHttpRequests = forceTypeOfHttpRequests;
- }
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/SignatureType.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/SignatureType.java
deleted file mode 100644
index 26ffe054e..000000000
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/SignatureType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.github.scribejava.core.model;
-
-public enum SignatureType {
-
- Header,
- QueryString
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/Verb.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/Verb.java
index 6ca83a517..ddcebc6b2 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/Verb.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/model/Verb.java
@@ -5,5 +5,15 @@
*/
public enum Verb {
- GET, POST, PUT, DELETE, HEAD, OPTIONS, TRACE, PATCH
+ GET(false), POST(true), PUT(true), DELETE(true), HEAD(false), OPTIONS(false), TRACE(false), PATCH(true);
+
+ private final boolean permitBody;
+
+ Verb(boolean permitBody) {
+ this.permitBody = permitBody;
+ }
+
+ public boolean isPermitBody() {
+ return permitBody;
+ }
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/Verifier.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/Verifier.java
deleted file mode 100644
index fc8a92195..000000000
--- a/scribejava-core/src/main/java/com/github/scribejava/core/model/Verifier.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.github.scribejava.core.model;
-
-import com.github.scribejava.core.utils.Preconditions;
-
-/**
- * Represents an OAuth verifier code.
- */
-public class Verifier {
-
- private final String value;
-
- /**
- * Default constructor.
- *
- * @param value verifier value
- */
- public Verifier(String value) {
- Preconditions.checkNotNull(value, "Must provide a valid string as verifier");
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
-}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth10aService.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth10aService.java
index 76b076935..ad9e6eda0 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth10aService.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth10aService.java
@@ -1,28 +1,25 @@
package com.github.scribejava.core.oauth;
-import com.ning.http.client.ProxyServer;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.Future;
import com.github.scribejava.core.builder.api.DefaultApi10a;
-import com.github.scribejava.core.model.AbstractRequest;
+import com.github.scribejava.core.builder.api.OAuth1SignatureType;
import com.github.scribejava.core.model.OAuth1AccessToken;
import com.github.scribejava.core.model.OAuth1RequestToken;
-import com.github.scribejava.core.model.OAuth1Token;
import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
import com.github.scribejava.core.model.OAuthConfig;
import com.github.scribejava.core.model.OAuthConstants;
import com.github.scribejava.core.model.OAuthRequest;
-import com.github.scribejava.core.model.OAuthRequestAsync;
import com.github.scribejava.core.model.Response;
-import com.github.scribejava.core.model.Verifier;
import com.github.scribejava.core.services.Base64Encoder;
import com.github.scribejava.core.utils.MapUtils;
+import java.util.concurrent.ExecutionException;
/**
* OAuth 1.0a implementation of {@link OAuthService}
*/
-public class OAuth10aService extends OAuthService {
+public class OAuth10aService extends OAuthService {
private static final String VERSION = "1.0";
private final DefaultApi10a api;
@@ -38,117 +35,129 @@ public OAuth10aService(DefaultApi10a api, OAuthConfig config) {
this.api = api;
}
- /**
- * Retrieve the request token.
- *
- * @return request token
- */
- public OAuth1RequestToken getRequestToken() {
+ public final OAuth1RequestToken getRequestToken() throws IOException, InterruptedException, ExecutionException {
final OAuthConfig config = getConfig();
config.log("obtaining request token from " + api.getRequestTokenEndpoint());
- final OAuthRequest request = new OAuthRequest(api.getRequestTokenVerb(), api.getRequestTokenEndpoint(), this);
-
- config.log("setting oauth_callback to " + config.getCallback());
- request.addOAuthParameter(OAuthConstants.CALLBACK, config.getCallback());
- addOAuthParams(request, OAuthConstants.EMPTY_TOKEN);
- appendSignature(request);
+ final OAuthRequest request = prepareRequestTokenRequest();
config.log("sending request...");
- final Response response = request.send();
+ final Response response = execute(request);
final String body = response.getBody();
config.log("response status code: " + response.getCode());
config.log("response body: " + body);
- return api.getRequestTokenExtractor().extract(body);
+ return api.getRequestTokenExtractor().extract(response);
+ }
+
+ public final Future getRequestTokenAsync() {
+ return getRequestTokenAsync(null);
+ }
+
+ public final Future getRequestTokenAsync(
+ OAuthAsyncRequestCallback callback) {
+ final OAuthConfig config = getConfig();
+ config.log("async obtaining request token from " + api.getRequestTokenEndpoint());
+ final OAuthRequest request = prepareRequestTokenRequest();
+ return execute(request, callback, new OAuthRequest.ResponseConverter() {
+ @Override
+ public OAuth1RequestToken convert(Response response) throws IOException {
+ return getApi().getRequestTokenExtractor().extract(response);
+ }
+ });
}
- private void addOAuthParams(AbstractRequest request, OAuth1Token token) {
+ protected OAuthRequest prepareRequestTokenRequest() {
+ final OAuthRequest request = new OAuthRequest(api.getRequestTokenVerb(), api.getRequestTokenEndpoint());
+ final OAuthConfig config = getConfig();
+ config.log("setting oauth_callback to " + config.getCallback());
+ request.addOAuthParameter(OAuthConstants.CALLBACK, config.getCallback());
+ addOAuthParams(request, "");
+ appendSignature(request);
+ return request;
+ }
+
+ protected void addOAuthParams(OAuthRequest request, String tokenSecret) {
final OAuthConfig config = getConfig();
request.addOAuthParameter(OAuthConstants.TIMESTAMP, api.getTimestampService().getTimestampInSeconds());
request.addOAuthParameter(OAuthConstants.NONCE, api.getTimestampService().getNonce());
request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, config.getApiKey());
request.addOAuthParameter(OAuthConstants.SIGN_METHOD, api.getSignatureService().getSignatureMethod());
request.addOAuthParameter(OAuthConstants.VERSION, getVersion());
- if (config.hasScope()) {
- request.addOAuthParameter(OAuthConstants.SCOPE, config.getScope());
+ final String scope = config.getScope();
+ if (scope != null) {
+ request.addOAuthParameter(OAuthConstants.SCOPE, scope);
}
- request.addOAuthParameter(OAuthConstants.SIGNATURE, getSignature(request, token));
+ request.addOAuthParameter(OAuthConstants.SIGNATURE, getSignature(request, tokenSecret));
config.log("appended additional OAuth parameters: " + MapUtils.toString(request.getOauthParameters()));
}
- public final OAuth1AccessToken getAccessToken(OAuth1RequestToken requestToken, Verifier verifier) {
- final OAuthConfig config = getConfig();
- config.log("obtaining access token from " + api.getAccessTokenEndpoint());
- final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint(), this);
- prepareAccessTokenRequest(request, requestToken, verifier);
- final Response response = request.send();
- return api.getAccessTokenExtractor().extract(response.getBody());
+ public final OAuth1AccessToken getAccessToken(OAuth1RequestToken requestToken, String oauthVerifier)
+ throws IOException, InterruptedException, ExecutionException {
+ getConfig().log("obtaining access token from " + api.getAccessTokenEndpoint());
+ final OAuthRequest request = prepareAccessTokenRequest(requestToken, oauthVerifier);
+ final Response response = execute(request);
+ return api.getAccessTokenExtractor().extract(response);
+ }
+
+ public final Future getAccessTokenAsync(OAuth1RequestToken requestToken, String oauthVerifier) {
+ return getAccessTokenAsync(requestToken, oauthVerifier, null);
}
/**
- * Start the request to retrieve the access token. The optionally provided callback will be called with the Token
- * when it is available.
+ * Start the request to retrieve the access token. The optionally provided
+ * callback will be called with the Token when it is available.
*
* @param requestToken request token (obtained previously or null)
- * @param verifier verifier code
+ * @param oauthVerifier oauth_verifier
* @param callback optional callback
* @return Future
*/
- public final Future getAccessTokenAsync(OAuth1RequestToken requestToken, Verifier verifier,
+ public final Future getAccessTokenAsync(OAuth1RequestToken requestToken, String oauthVerifier,
OAuthAsyncRequestCallback callback) {
- return getAccessTokenAsync(requestToken, verifier, callback, null);
- }
-
- public final Future getAccessTokenAsync(OAuth1RequestToken requestToken, Verifier verifier,
- OAuthAsyncRequestCallback callback, ProxyServer proxyServer) {
final OAuthConfig config = getConfig();
config.log("async obtaining access token from " + api.getAccessTokenEndpoint());
- final OAuthRequestAsync request
- = new OAuthRequestAsync(api.getAccessTokenVerb(), api.getAccessTokenEndpoint(), this);
- prepareAccessTokenRequest(request, requestToken, verifier);
- return request.sendAsync(callback, new OAuthRequestAsync.ResponseConverter() {
+ final OAuthRequest request = prepareAccessTokenRequest(requestToken, oauthVerifier);
+ return execute(request, callback, new OAuthRequest.ResponseConverter() {
@Override
- public OAuth1AccessToken convert(com.ning.http.client.Response response) throws IOException {
- return getApi().getAccessTokenExtractor()
- .extract(OAuthRequestAsync.RESPONSE_CONVERTER.convert(response).getBody());
+ public OAuth1AccessToken convert(Response response) throws IOException {
+ return getApi().getAccessTokenExtractor().extract(response);
}
- }, proxyServer);
+ });
}
- protected void prepareAccessTokenRequest(AbstractRequest request, OAuth1RequestToken requestToken,
- Verifier verifier) {
+ protected OAuthRequest prepareAccessTokenRequest(OAuth1RequestToken requestToken, String oauthVerifier) {
+ final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
final OAuthConfig config = getConfig();
request.addOAuthParameter(OAuthConstants.TOKEN, requestToken.getToken());
- request.addOAuthParameter(OAuthConstants.VERIFIER, verifier.getValue());
- config.log("setting token to: " + requestToken + " and verifier to: " + verifier);
- addOAuthParams(request, requestToken);
+ request.addOAuthParameter(OAuthConstants.VERIFIER, oauthVerifier);
+ config.log("setting token to: " + requestToken + " and verifier to: " + oauthVerifier);
+ addOAuthParams(request, requestToken.getTokenSecret());
appendSignature(request);
+ return request;
}
- public void signRequest(OAuth1AccessToken token, AbstractRequest request) {
+ @Override
+ public void signRequest(OAuth1AccessToken token, OAuthRequest request) {
final OAuthConfig config = getConfig();
config.log("signing request: " + request.getCompleteUrl());
- // Do not append the token if empty. This is for two legged OAuth calls.
- if (!token.isEmpty()) {
+ if (!token.isEmpty() || api.isEmptyOAuthTokenParamIsRequired()) {
request.addOAuthParameter(OAuthConstants.TOKEN, token.getToken());
}
config.log("setting token to: " + token);
- addOAuthParams(request, token);
+ addOAuthParams(request, token.getTokenSecret());
appendSignature(request);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getVersion() {
return VERSION;
}
/**
- * Returns the URL where you should redirect your users to authenticate your application.
+ * Returns the URL where you should redirect your users to authenticate your
+ * application.
*
* @param requestToken the request token you need to authorize
* @return the URL where you should redirect your users
@@ -157,22 +166,22 @@ public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
return api.getAuthorizationUrl(requestToken);
}
- private String getSignature(AbstractRequest request, OAuth1Token token) {
+ private String getSignature(OAuthRequest request, String tokenSecret) {
final OAuthConfig config = getConfig();
config.log("generating signature...");
config.log("using base64 encoder: " + Base64Encoder.type());
final String baseString = api.getBaseStringExtractor().extract(request);
- final String signature = api.getSignatureService()
- .getSignature(baseString, config.getApiSecret(), token.getTokenSecret());
+ final String signature = api.getSignatureService().getSignature(baseString, config.getApiSecret(), tokenSecret);
config.log("base string is: " + baseString);
config.log("signature is: " + signature);
return signature;
}
- private void appendSignature(AbstractRequest request) {
+ protected void appendSignature(OAuthRequest request) {
final OAuthConfig config = getConfig();
- switch (config.getSignatureType()) {
+ final OAuth1SignatureType signatureType = api.getSignatureType();
+ switch (signatureType) {
case Header:
config.log("using Http Header signature");
@@ -187,7 +196,7 @@ private void appendSignature(AbstractRequest request) {
}
break;
default:
- throw new IllegalStateException("Unknown new Signature Type '" + config.getSignatureType() + "'.");
+ throw new IllegalStateException("Unknown new Signature Type '" + signatureType + "'.");
}
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java
index 84ae8a8ef..4565a4165 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java
@@ -1,20 +1,21 @@
package com.github.scribejava.core.oauth;
-import com.ning.http.client.ProxyServer;
+import com.github.scribejava.core.services.Base64Encoder;
import java.io.IOException;
+import java.nio.charset.Charset;
import java.util.concurrent.Future;
import com.github.scribejava.core.builder.api.DefaultApi20;
-import com.github.scribejava.core.model.AbstractRequest;
import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.OAuth2Authorization;
import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
import com.github.scribejava.core.model.OAuthConfig;
import com.github.scribejava.core.model.OAuthConstants;
import com.github.scribejava.core.model.OAuthRequest;
-import com.github.scribejava.core.model.OAuthRequestAsync;
import com.github.scribejava.core.model.Response;
-import com.github.scribejava.core.model.Verifier;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
-public class OAuth20Service extends OAuthService {
+public class OAuth20Service extends OAuthService {
private static final String VERSION = "2.0";
private final DefaultApi20 api;
@@ -30,50 +31,155 @@ public OAuth20Service(DefaultApi20 api, OAuthConfig config) {
this.api = api;
}
- public final OAuth2AccessToken getAccessToken(Verifier verifier) {
- final Response response = createAccessTokenRequest(verifier,
- new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint(), this)).send();
- return api.getAccessTokenExtractor().extract(response.getBody());
+ //protected to facilitate mocking
+ protected OAuth2AccessToken sendAccessTokenRequestSync(OAuthRequest request)
+ throws IOException, InterruptedException, ExecutionException {
+ return api.getAccessTokenExtractor().extract(execute(request));
+ }
+
+ //protected to facilitate mocking
+ protected Future sendAccessTokenRequestAsync(OAuthRequest request) {
+ return sendAccessTokenRequestAsync(request, null);
+ }
+
+ //protected to facilitate mocking
+ protected Future sendAccessTokenRequestAsync(OAuthRequest request,
+ OAuthAsyncRequestCallback callback) {
+
+ return execute(request, callback, new OAuthRequest.ResponseConverter() {
+ @Override
+ public OAuth2AccessToken convert(Response response) throws IOException {
+ return getApi().getAccessTokenExtractor().extract(response);
+ }
+ });
+ }
+
+ public final Future getAccessTokenAsync(String code) {
+ return getAccessToken(code, null);
+ }
+
+ public final OAuth2AccessToken getAccessToken(String code)
+ throws IOException, InterruptedException, ExecutionException {
+ final OAuthRequest request = createAccessTokenRequest(code);
+
+ return sendAccessTokenRequestSync(request);
}
/**
* Start the request to retrieve the access token. The optionally provided callback will be called with the Token
* when it is available.
*
- * @param verifier verifier code
+ * @param code code
* @param callback optional callback
* @return Future
*/
- public final Future getAccessTokenAsync(Verifier verifier,
+ public final Future getAccessToken(String code,
OAuthAsyncRequestCallback callback) {
- return getAccessTokenAsync(verifier, callback, null);
- }
+ final OAuthRequest request = createAccessTokenRequest(code);
- public final Future getAccessTokenAsync(Verifier verifier,
- OAuthAsyncRequestCallback callback, ProxyServer proxyServer) {
- final OAuthRequestAsync request = createAccessTokenRequest(verifier,
- new OAuthRequestAsync(api.getAccessTokenVerb(), api.getAccessTokenEndpoint(), this));
- return request.sendAsync(callback, new OAuthRequestAsync.ResponseConverter() {
- @Override
- public OAuth2AccessToken convert(com.ning.http.client.Response response) throws IOException {
- return getApi().getAccessTokenExtractor()
- .extract(OAuthRequestAsync.RESPONSE_CONVERTER.convert(response).getBody());
- }
- }, proxyServer);
+ return sendAccessTokenRequestAsync(request, callback);
}
- protected T createAccessTokenRequest(Verifier verifier, T request) {
+ protected OAuthRequest createAccessTokenRequest(String code) {
+ final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
final OAuthConfig config = getConfig();
request.addParameter(OAuthConstants.CLIENT_ID, config.getApiKey());
- request.addParameter(OAuthConstants.CLIENT_SECRET, config.getApiSecret());
- request.addParameter(OAuthConstants.CODE, verifier.getValue());
+ final String apiSecret = config.getApiSecret();
+ if (apiSecret != null) {
+ request.addParameter(OAuthConstants.CLIENT_SECRET, apiSecret);
+ }
+ request.addParameter(OAuthConstants.CODE, code);
request.addParameter(OAuthConstants.REDIRECT_URI, config.getCallback());
- if (config.hasScope()) {
- request.addParameter(OAuthConstants.SCOPE, config.getScope());
+ final String scope = config.getScope();
+ if (scope != null) {
+ request.addParameter(OAuthConstants.SCOPE, scope);
+ }
+ request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.AUTHORIZATION_CODE);
+ return request;
+ }
+
+ public final Future refreshAccessTokenAsync(String refreshToken) {
+ return refreshAccessToken(refreshToken, null);
+ }
+
+ public final OAuth2AccessToken refreshAccessToken(String refreshToken)
+ throws IOException, InterruptedException, ExecutionException {
+ final OAuthRequest request = createRefreshTokenRequest(refreshToken);
+
+ return sendAccessTokenRequestSync(request);
+ }
+
+ public final Future refreshAccessToken(String refreshToken,
+ OAuthAsyncRequestCallback callback) {
+ final OAuthRequest request = createRefreshTokenRequest(refreshToken);
+
+ return sendAccessTokenRequestAsync(request, callback);
+ }
+
+ protected OAuthRequest createRefreshTokenRequest(String refreshToken) {
+ if (refreshToken == null || refreshToken.isEmpty()) {
+ throw new IllegalArgumentException("The refreshToken cannot be null or empty");
+ }
+ final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getRefreshTokenEndpoint());
+ final OAuthConfig config = getConfig();
+ request.addParameter(OAuthConstants.CLIENT_ID, config.getApiKey());
+ final String apiSecret = config.getApiSecret();
+ if (apiSecret != null) {
+ request.addParameter(OAuthConstants.CLIENT_SECRET, apiSecret);
+ }
+ request.addParameter(OAuthConstants.REFRESH_TOKEN, refreshToken);
+ request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.REFRESH_TOKEN);
+ return request;
+ }
+
+ public final OAuth2AccessToken getAccessTokenPasswordGrant(String uname, String password)
+ throws IOException, InterruptedException, ExecutionException {
+ final OAuthRequest request = createAccessTokenPasswordGrantRequest(uname, password);
+
+ return sendAccessTokenRequestSync(request);
+ }
+
+ public final Future getAccessTokenPasswordGrantAsync(String uname, String password) {
+ return getAccessTokenPasswordGrantAsync(uname, password, null);
+ }
+
+ /**
+ * Request Access Token Password Grant async version
+ *
+ * @param uname User name
+ * @param password User password
+ * @param callback Optional callback
+ * @return Future
+ */
+ public final Future getAccessTokenPasswordGrantAsync(String uname, String password,
+ OAuthAsyncRequestCallback callback) {
+ final OAuthRequest request = createAccessTokenPasswordGrantRequest(uname, password);
+
+ return sendAccessTokenRequestAsync(request, callback);
+ }
+
+ protected OAuthRequest createAccessTokenPasswordGrantRequest(String username, String password) {
+ final OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
+ final OAuthConfig config = getConfig();
+ request.addParameter(OAuthConstants.USERNAME, username);
+ request.addParameter(OAuthConstants.PASSWORD, password);
+
+ final String scope = config.getScope();
+ if (scope != null) {
+ request.addParameter(OAuthConstants.SCOPE, scope);
}
- if (config.hasGrantType()) {
- request.addParameter(OAuthConstants.GRANT_TYPE, config.getGrantType());
+
+ request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.PASSWORD);
+
+ final String apiKey = config.getApiKey();
+ final String apiSecret = config.getApiSecret();
+ if (apiKey != null && apiSecret != null) {
+ request.addHeader(OAuthConstants.HEADER,
+ OAuthConstants.BASIC + ' '
+ + Base64Encoder.getInstance()
+ .encode(String.format("%s:%s", apiKey, apiSecret).getBytes(Charset.forName("UTF-8"))));
}
+
return request;
}
@@ -85,8 +191,9 @@ public String getVersion() {
return VERSION;
}
- public void signRequest(OAuth2AccessToken accessToken, AbstractRequest request) {
- request.addQuerystringParameter(OAuthConstants.ACCESS_TOKEN, accessToken.getAccessToken());
+ @Override
+ public void signRequest(OAuth2AccessToken accessToken, OAuthRequest request) {
+ api.getSignatureType().signRequest(accessToken, request);
}
/**
@@ -94,11 +201,44 @@ public void signRequest(OAuth2AccessToken accessToken, AbstractRequest request)
*
* @return the URL where you should redirect your users
*/
- public String getAuthorizationUrl() {
- return api.getAuthorizationUrl(getConfig());
+ public final String getAuthorizationUrl() {
+ return getAuthorizationUrl(null);
+ }
+
+ /**
+ * Returns the URL where you should redirect your users to authenticate your application.
+ *
+ * @param additionalParams any additional GET params to add to the URL
+ * @return the URL where you should redirect your users
+ */
+ public String getAuthorizationUrl(Map additionalParams) {
+ return api.getAuthorizationUrl(getConfig(), additionalParams);
}
public DefaultApi20 getApi() {
return api;
}
+
+ public OAuth2Authorization extractAuthorization(String redirectLocation) {
+ final OAuth2Authorization authorization = new OAuth2Authorization();
+ int end = redirectLocation.indexOf('#');
+ if (end == -1) {
+ end = redirectLocation.length();
+ }
+ for (String param : redirectLocation.substring(redirectLocation.indexOf('?') + 1, end).split("&")) {
+ final String[] keyValue = param.split("=");
+ if (keyValue.length == 2) {
+ switch (keyValue[0]) {
+ case "code":
+ authorization.setCode(keyValue[1]);
+ break;
+ case "state":
+ authorization.setState(keyValue[1]);
+ break;
+ default: //just ignore any other param;
+ }
+ }
+ }
+ return authorization;
+ }
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java
index ad7c1d4b4..df58ce3ea 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuthService.java
@@ -1,54 +1,58 @@
package com.github.scribejava.core.oauth;
-import com.ning.http.client.AsyncHttpClient;
-import com.github.scribejava.core.exceptions.OAuthException;
-import com.github.scribejava.core.model.ForceTypeOfHttpRequest;
+import com.github.scribejava.core.httpclient.HttpClientProvider;
+import com.github.scribejava.core.httpclient.HttpClient;
+import com.github.scribejava.core.httpclient.HttpClientConfig;
+import com.github.scribejava.core.httpclient.jdk.JDKHttpClient;
+import com.github.scribejava.core.httpclient.jdk.JDKHttpClientConfig;
+import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
import com.github.scribejava.core.model.OAuthConfig;
-import com.github.scribejava.core.model.OAuthConfigAsync;
-import com.github.scribejava.core.model.ScribeJavaConfig;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Response;
+import com.github.scribejava.core.model.Token;
+import java.io.File;
+
+import java.io.IOException;
+import java.util.ServiceLoader;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
/**
* The main ScribeJava object.
*
* A facade responsible for the retrieval of request and access tokens and for the signing of HTTP requests.
+ * @param type of token used to sign the request
*/
-public abstract class OAuthService {
+public abstract class OAuthService implements AutoCloseable {
private final OAuthConfig config;
- private AsyncHttpClient asyncHttpClient;
+ private final HttpClient httpClient;
public OAuthService(OAuthConfig config) {
this.config = config;
- final ForceTypeOfHttpRequest forceTypeOfHttpRequest = ScribeJavaConfig.getForceTypeOfHttpRequests();
- if (config instanceof OAuthConfigAsync) {
- if (ForceTypeOfHttpRequest.FORCE_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
- throw new OAuthException("Cannot use async operations, only sync");
- }
- if (ForceTypeOfHttpRequest.PREFER_SYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
- config.log("Cannot use async operations, only sync");
- }
- final OAuthConfigAsync asyncConfig = (OAuthConfigAsync) config;
- final String asyncHttpProviderClassName = asyncConfig.getAsyncHttpProviderClassName();
+ final HttpClientConfig httpClientConfig = config.getHttpClientConfig();
+ final HttpClient externalHttpClient = config.getHttpClient();
- asyncHttpClient = asyncHttpProviderClassName == null
- ? new AsyncHttpClient(asyncConfig.getAsyncHttpClientConfig())
- : new AsyncHttpClient(asyncHttpProviderClassName, asyncConfig.getAsyncHttpClientConfig());
+ if (httpClientConfig == null && externalHttpClient == null) {
+ httpClient = new JDKHttpClient(JDKHttpClientConfig.defaultConfig());
} else {
- if (ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
- throw new OAuthException("Cannot use sync operations, only async");
- }
- if (ForceTypeOfHttpRequest.PREFER_ASYNC_ONLY_HTTP_REQUESTS == forceTypeOfHttpRequest) {
- config.log("Cannot use sync operations, only async");
- }
+ httpClient = externalHttpClient == null ? getClient(httpClientConfig) : externalHttpClient;
}
}
- public AsyncHttpClient getAsyncHttpClient() {
- return asyncHttpClient;
+ private static HttpClient getClient(HttpClientConfig config) {
+ for (HttpClientProvider provider : ServiceLoader.load(HttpClientProvider.class)) {
+ final HttpClient client = provider.createClient(config);
+ if (client != null) {
+ return client;
+ }
+ }
+ return null;
}
- public void closeAsyncClient() {
- asyncHttpClient.close();
+ @Override
+ public void close() throws IOException {
+ httpClient.close();
}
public OAuthConfig getConfig() {
@@ -61,4 +65,44 @@ public OAuthConfig getConfig() {
* @return OAuth version as string
*/
public abstract String getVersion();
+
+ public abstract void signRequest(T token, OAuthRequest request);
+
+ public Future executeAsync(OAuthRequest request) {
+ return execute(request, null);
+ }
+
+ public Future execute(OAuthRequest request, OAuthAsyncRequestCallback callback) {
+ return execute(request, callback, null);
+ }
+
+ public Future execute(OAuthRequest request, OAuthAsyncRequestCallback callback,
+ OAuthRequest.ResponseConverter converter) {
+
+ final File filePayload = request.getFilePayload();
+ if (filePayload != null) {
+ return httpClient.executeAsync(config.getUserAgent(), request.getHeaders(), request.getVerb(),
+ request.getCompleteUrl(), filePayload, callback, converter);
+ } else if (request.getStringPayload() != null) {
+ return httpClient.executeAsync(config.getUserAgent(), request.getHeaders(), request.getVerb(),
+ request.getCompleteUrl(), request.getStringPayload(), callback, converter);
+ } else {
+ return httpClient.executeAsync(config.getUserAgent(), request.getHeaders(), request.getVerb(),
+ request.getCompleteUrl(), request.getByteArrayPayload(), callback, converter);
+ }
+ }
+
+ public Response execute(OAuthRequest request) throws InterruptedException, ExecutionException, IOException {
+ final File filePayload = request.getFilePayload();
+ if (filePayload != null) {
+ return httpClient.execute(config.getUserAgent(), request.getHeaders(), request.getVerb(),
+ request.getCompleteUrl(), filePayload);
+ } else if (request.getStringPayload() != null) {
+ return httpClient.execute(config.getUserAgent(), request.getHeaders(), request.getVerb(),
+ request.getCompleteUrl(), request.getStringPayload());
+ } else {
+ return httpClient.execute(config.getUserAgent(), request.getHeaders(), request.getVerb(),
+ request.getCompleteUrl(), request.getByteArrayPayload());
+ }
+ }
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/utils/MapUtils.java b/scribejava-core/src/main/java/com/github/scribejava/core/utils/MapUtils.java
index bf48341fb..9cb217cb9 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/utils/MapUtils.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/utils/MapUtils.java
@@ -14,8 +14,12 @@ public static String toString(Map map) {
final StringBuilder result = new StringBuilder();
for (Map.Entry entry : map.entrySet()) {
- result.append(String.format(", %s -> %s ", entry.getKey().toString(), entry.getValue().toString()));
+ result.append(", ")
+ .append(entry.getKey().toString())
+ .append(" -> ")
+ .append(entry.getValue().toString())
+ .append(' ');
}
- return "{" + result.substring(1) + "}";
+ return "{" + result.append('}').substring(1);
}
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/utils/Preconditions.java b/scribejava-core/src/main/java/com/github/scribejava/core/utils/Preconditions.java
index 0858fc89d..19e1df083 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/utils/Preconditions.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/utils/Preconditions.java
@@ -1,9 +1,5 @@
package com.github.scribejava.core.utils;
-import java.util.Locale;
-import java.util.regex.Pattern;
-import com.github.scribejava.core.model.OAuthConstants;
-
/**
* Utils for checking preconditions and invariants
*/
@@ -11,9 +7,6 @@ public abstract class Preconditions {
private static final String DEFAULT_MESSAGE = "Received an invalid parameter";
- // scheme = alpha *( alpha | digit | "+" | "-" | "." )
- private static final String URL_REGEXP = "^[a-zA-Z][a-zA-Z0-9+.-]*://\\S+";
-
/**
* Checks that an object is not null.
*
@@ -35,40 +28,25 @@ public static void checkNotNull(Object object, String errorMsg) {
* @throws IllegalArgumentException if the string is null or empty
*/
public static void checkEmptyString(String string, String errorMsg) {
- check(string != null && !string.trim().isEmpty(), errorMsg);
- }
-
- /**
- * Checks that a URL is valid
- *
- * @param url any string
- * @param errorMsg error message
- */
- public static void checkValidUrl(String url, String errorMsg) {
- checkEmptyString(url, errorMsg);
- check(isUrl(url), errorMsg);
+ check(hasText(string), errorMsg);
}
- /**
- * Checks that a URL is a valid OAuth callback
- *
- * @param url any string
- * @param errorMsg error message
- */
- public static void checkValidOAuthCallback(String url, String errorMsg) {
- checkEmptyString(url, errorMsg);
- if (url.toLowerCase(Locale.getDefault()).compareToIgnoreCase(OAuthConstants.OUT_OF_BAND) != 0) {
- check(isUrl(url), errorMsg);
+ public static boolean hasText(String str) {
+ if (str == null || str.isEmpty()) {
+ return false;
}
- }
-
- private static boolean isUrl(String url) {
- return Pattern.compile(URL_REGEXP).matcher(url).matches();
+ final int strLen = str.length();
+ for (int i = 0; i < strLen; i++) {
+ if (!Character.isWhitespace(str.charAt(i))) {
+ return true;
+ }
+ }
+ return false;
}
private static void check(boolean requirements, String error) {
if (!requirements) {
- throw new IllegalArgumentException(error == null || error.trim().length() <= 0 ? DEFAULT_MESSAGE : error);
+ throw new IllegalArgumentException(hasText(error) ? error : DEFAULT_MESSAGE);
}
}
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/utils/StreamUtils.java b/scribejava-core/src/main/java/com/github/scribejava/core/utils/StreamUtils.java
index 93d089489..7a86318d2 100644
--- a/scribejava-core/src/main/java/com/github/scribejava/core/utils/StreamUtils.java
+++ b/scribejava-core/src/main/java/com/github/scribejava/core/utils/StreamUtils.java
@@ -16,25 +16,22 @@ public abstract class StreamUtils {
*
* @param is input stream
* @return string contents
+ * @throws java.io.IOException in any. SocketTimeout in example
*/
- public static String getStreamContents(InputStream is) {
+ public static String getStreamContents(InputStream is) throws IOException {
Preconditions.checkNotNull(is, "Cannot get String from a null object");
- try {
- final char[] buffer = new char[0x10000];
- final StringBuilder out = new StringBuilder();
- try (Reader in = new InputStreamReader(is, "UTF-8")) {
- int read;
- do {
- read = in.read(buffer, 0, buffer.length);
- if (read > 0) {
- out.append(buffer, 0, read);
- }
- } while (read >= 0);
- }
- return out.toString();
- } catch (IOException ioe) {
- throw new IllegalStateException("Error while reading response body", ioe);
+ final char[] buffer = new char[0x10000];
+ final StringBuilder out = new StringBuilder();
+ try (Reader in = new InputStreamReader(is, "UTF-8")) {
+ int read;
+ do {
+ read = in.read(buffer, 0, buffer.length);
+ if (read > 0) {
+ out.append(buffer, 0, read);
+ }
+ } while (read >= 0);
}
+ return out.toString();
}
/**
@@ -42,14 +39,11 @@ public static String getStreamContents(InputStream is) {
*
* @param is input stream
* @return string contents
+ * @throws java.io.IOException in any. SocketTimeout in example
*/
- public static String getGzipStreamContents(InputStream is) {
+ public static String getGzipStreamContents(InputStream is) throws IOException {
Preconditions.checkNotNull(is, "Cannot get String from a null object");
- try {
- final GZIPInputStream gis = new GZIPInputStream(is);
- return getStreamContents(gis);
- } catch (IOException ioe) {
- throw new IllegalStateException("Error while reading response body", ioe);
- }
+ final GZIPInputStream gis = new GZIPInputStream(is);
+ return getStreamContents(gis);
}
}
diff --git a/scribejava-core/src/main/resources/META-INF/services/com.github.scribejava.core.httpclient.HttpClientProvider b/scribejava-core/src/main/resources/META-INF/services/com.github.scribejava.core.httpclient.HttpClientProvider
new file mode 100644
index 000000000..7df053c24
--- /dev/null
+++ b/scribejava-core/src/main/resources/META-INF/services/com.github.scribejava.core.httpclient.HttpClientProvider
@@ -0,0 +1,2 @@
+com.github.scribejava.core.httpclient.jdk.JDKHttpProvider
+
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/ObjectMother.java b/scribejava-core/src/test/java/com/github/scribejava/core/ObjectMother.java
index 30482b2c6..07e4081ec 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/ObjectMother.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/ObjectMother.java
@@ -1,16 +1,13 @@
package com.github.scribejava.core;
-import com.github.scribejava.core.model.OAuthConfig;
import com.github.scribejava.core.model.OAuthConstants;
import com.github.scribejava.core.model.OAuthRequest;
import com.github.scribejava.core.model.Verb;
-import com.github.scribejava.core.oauth.OAuth20Service;
public abstract class ObjectMother {
public static OAuthRequest createSampleOAuthRequest() {
- final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com",
- new OAuth20Service(null, new OAuthConfig("test", "test")));
+ final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");
request.addOAuthParameter(OAuthConstants.TIMESTAMP, "123456");
request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, "AS#$^*@&");
request.addOAuthParameter(OAuthConstants.CALLBACK, "http://example/callback");
@@ -19,8 +16,7 @@ public static OAuthRequest createSampleOAuthRequest() {
}
public static OAuthRequest createSampleOAuthRequestPort80() {
- final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com:80",
- new OAuth20Service(null, new OAuthConfig("test", "test")));
+ final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com:80");
request.addOAuthParameter(OAuthConstants.TIMESTAMP, "123456");
request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, "AS#$^*@&");
request.addOAuthParameter(OAuthConstants.CALLBACK, "http://example/callback");
@@ -29,8 +25,7 @@ public static OAuthRequest createSampleOAuthRequestPort80() {
}
public static OAuthRequest createSampleOAuthRequestPort80v2() {
- final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com:80/test",
- new OAuth20Service(null, new OAuthConfig("test", "test")));
+ final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com:80/test");
request.addOAuthParameter(OAuthConstants.TIMESTAMP, "123456");
request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, "AS#$^*@&");
request.addOAuthParameter(OAuthConstants.CALLBACK, "http://example/callback");
@@ -39,8 +34,7 @@ public static OAuthRequest createSampleOAuthRequestPort80v2() {
}
public static OAuthRequest createSampleOAuthRequestPort8080() {
- final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com:8080",
- new OAuth20Service(null, new OAuthConfig("test", "test")));
+ final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com:8080");
request.addOAuthParameter(OAuthConstants.TIMESTAMP, "123456");
request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, "AS#$^*@&");
request.addOAuthParameter(OAuthConstants.CALLBACK, "http://example/callback");
@@ -49,8 +43,7 @@ public static OAuthRequest createSampleOAuthRequestPort8080() {
}
public static OAuthRequest createSampleOAuthRequestPort443() {
- final OAuthRequest request = new OAuthRequest(Verb.GET, "https://example.com:443",
- new OAuth20Service(null, new OAuthConfig("test", "test")));
+ final OAuthRequest request = new OAuthRequest(Verb.GET, "https://example.com:443");
request.addOAuthParameter(OAuthConstants.TIMESTAMP, "123456");
request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, "AS#$^*@&");
request.addOAuthParameter(OAuthConstants.CALLBACK, "http://example/callback");
@@ -59,8 +52,7 @@ public static OAuthRequest createSampleOAuthRequestPort443() {
}
public static OAuthRequest createSampleOAuthRequestPort443v2() {
- final OAuthRequest request = new OAuthRequest(Verb.GET, "https://example.com:443/test",
- new OAuth20Service(null, new OAuthConfig("test", "test")));
+ final OAuthRequest request = new OAuthRequest(Verb.GET, "https://example.com:443/test");
request.addOAuthParameter(OAuthConstants.TIMESTAMP, "123456");
request.addOAuthParameter(OAuthConstants.CONSUMER_KEY, "AS#$^*@&");
request.addOAuthParameter(OAuthConstants.CALLBACK, "http://example/callback");
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/builder/ServiceBuilderTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/builder/ServiceBuilderTest.java
index 9bf8f386f..c7d4a4dac 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/builder/ServiceBuilderTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/builder/ServiceBuilderTest.java
@@ -6,7 +6,6 @@
import com.github.scribejava.core.builder.api.DefaultApi20;
import com.github.scribejava.core.model.OAuthConfig;
import com.github.scribejava.core.model.OAuthConstants;
-import com.github.scribejava.core.model.SignatureType;
import com.github.scribejava.core.oauth.OAuth20Service;
public class ServiceBuilderTest {
@@ -16,7 +15,7 @@ public class ServiceBuilderTest {
@Before
public void setUp() {
- builder = new ServiceBuilder();
+ builder = new ServiceBuilder("will override api_key by another later in test");
api = ApiMock.instance();
}
@@ -28,7 +27,6 @@ public void shouldReturnConfigDefaultValues() {
assertEquals(config.getApiKey(), "key");
assertEquals(config.getApiSecret(), "secret");
assertEquals(config.getCallback(), OAuthConstants.OUT_OF_BAND);
- assertEquals(config.getSignatureType(), SignatureType.Header);
}
@Test
@@ -41,16 +39,6 @@ public void shouldAcceptValidCallbackUrl() {
assertEquals(config.getCallback(), "http://example.com");
}
- @Test
- public void shouldAcceptASignatureType() {
- builder.apiKey("key").apiSecret("secret").signatureType(SignatureType.QueryString).build(api);
-
- final OAuthConfig config = api.getConfig();
- assertEquals(config.getApiKey(), "key");
- assertEquals(config.getApiSecret(), "secret");
- assertEquals(config.getSignatureType(), SignatureType.QueryString);
- }
-
@Test(expected = IllegalArgumentException.class)
public void shouldNotAcceptNullAsCallback() {
builder.apiKey("key").apiSecret("secret").callback(null).build(api);
@@ -90,7 +78,7 @@ public String getAccessTokenEndpoint() {
}
@Override
- public String getAuthorizationUrl(OAuthConfig config) {
+ protected String getAuthorizationBaseUrl() {
throw new UnsupportedOperationException("Not supported yet.");
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/BaseStringExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/BaseStringExtractorTest.java
index 3eb4b7404..bc833db08 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/BaseStringExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/BaseStringExtractorTest.java
@@ -5,10 +5,8 @@
import org.junit.Test;
import com.github.scribejava.core.ObjectMother;
import com.github.scribejava.core.exceptions.OAuthParametersMissingException;
-import com.github.scribejava.core.model.OAuthConfig;
import com.github.scribejava.core.model.OAuthRequest;
import com.github.scribejava.core.model.Verb;
-import com.github.scribejava.core.oauth.OAuth20Service;
public class BaseStringExtractorTest {
@@ -92,8 +90,7 @@ public void shouldThrowExceptionIfRquestIsNull() {
@Test(expected = OAuthParametersMissingException.class)
public void shouldThrowExceptionIfRquestHasNoOAuthParameters() {
- final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com",
- new OAuth20Service(null, new OAuthConfig("test", "test")));
+ final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com");
extractor.extract(request);
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/HeaderExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/HeaderExtractorTest.java
index 8de9d5c50..c1658fc7e 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/HeaderExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/HeaderExtractorTest.java
@@ -1,13 +1,12 @@
package com.github.scribejava.core.extractors;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import com.github.scribejava.core.exceptions.OAuthParametersMissingException;
-import com.github.scribejava.core.model.OAuthConfig;
import com.github.scribejava.core.model.OAuthRequest;
import com.github.scribejava.core.model.Verb;
-import com.github.scribejava.core.oauth.OAuth20Service;
import com.github.scribejava.core.ObjectMother;
public class HeaderExtractorTest {
@@ -24,16 +23,24 @@ public void setUp() {
@Test
public void shouldExtractStandardHeader() {
final String header = extractor.extract(request);
- try {
- assertEquals("OAuth oauth_callback=\"http%3A%2F%2Fexample%2Fcallback\", "
- + "oauth_signature=\"OAuth-Signature\", oauth_consumer_key=\"AS%23%24%5E%2A%40%26\", "
- + "oauth_timestamp=\"123456\"", header);
- } catch (AssertionError ae) {
- //maybe this is OpenJDK 8? Different order of elements in HashMap while iterating'em.
- assertEquals("OAuth oauth_signature=\"OAuth-Signature\", "
- + "oauth_callback=\"http%3A%2F%2Fexample%2Fcallback\", "
- + "oauth_consumer_key=\"AS%23%24%5E%2A%40%26\", oauth_timestamp=\"123456\"", header);
- }
+ final String oauth = "OAuth ";
+ final String callback = "oauth_callback=\"http%3A%2F%2Fexample%2Fcallback\"";
+ final String signature = "oauth_signature=\"OAuth-Signature\"";
+ final String key = "oauth_consumer_key=\"AS%23%24%5E%2A%40%26\"";
+ final String timestamp = "oauth_timestamp=\"123456\"";
+
+ assertTrue(header.startsWith(oauth));
+ assertTrue(header.contains(callback));
+ assertTrue(header.contains(signature));
+ assertTrue(header.contains(key));
+ assertTrue(header.contains(timestamp));
+ // Assert that header only contains the checked elements above and nothing else
+ assertEquals(", , , ",
+ header.replaceFirst(oauth, "")
+ .replaceFirst(callback, "")
+ .replaceFirst(signature, "")
+ .replaceFirst(key, "")
+ .replaceFirst(timestamp, ""));
}
@Test(expected = IllegalArgumentException.class)
@@ -43,8 +50,7 @@ public void shouldExceptionIfRequestIsNull() {
@Test(expected = OAuthParametersMissingException.class)
public void shouldExceptionIfRequestHasNoOAuthParams() {
- final OAuthRequest emptyRequest = new OAuthRequest(Verb.GET, "http://example.com",
- new OAuth20Service(null, new OAuthConfig("test", "test")));
+ final OAuthRequest emptyRequest = new OAuthRequest(Verb.GET, "http://example.com");
extractor.extract(emptyRequest);
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth1AccessTokenExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth1AccessTokenExtractorTest.java
index 7cf3feb95..36ac4cd2e 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth1AccessTokenExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth1AccessTokenExtractorTest.java
@@ -1,9 +1,14 @@
package com.github.scribejava.core.extractors;
+import com.github.scribejava.core.model.Response;
import org.junit.Before;
import org.junit.Test;
import com.github.scribejava.core.exceptions.OAuthException;
import com.github.scribejava.core.model.OAuth1Token;
+
+import java.io.IOException;
+import java.util.Collections;
+
import static org.junit.Assert.assertEquals;
public class OAuth1AccessTokenExtractorTest {
@@ -16,58 +21,62 @@ public void setUp() {
}
@Test
- public void shouldExtractTokenFromOAuthStandardResponse() {
+ public void shouldExtractTokenFromOAuthStandardResponse() throws IOException {
final String response = "oauth_token=hh5s93j4hdidpola&oauth_token_secret=hdhd0244k9j7ao03";
- final OAuth1Token extracted = extractor.extract(response);
+ final OAuth1Token extracted = extractor.extract(ok(response));
assertEquals("hh5s93j4hdidpola", extracted.getToken());
assertEquals("hdhd0244k9j7ao03", extracted.getTokenSecret());
}
@Test
- public void shouldExtractTokenFromInvertedOAuthStandardResponse() {
+ public void shouldExtractTokenFromInvertedOAuthStandardResponse() throws IOException {
final String response = "oauth_token_secret=hh5s93j4hdidpola&oauth_token=hdhd0244k9j7ao03";
- final OAuth1Token extracted = extractor.extract(response);
+ final OAuth1Token extracted = extractor.extract(ok(response));
assertEquals("hh5s93j4hdidpola", extracted.getTokenSecret());
assertEquals("hdhd0244k9j7ao03", extracted.getToken());
}
@Test
- public void shouldExtractTokenFromResponseWithCallbackConfirmed() {
+ public void shouldExtractTokenFromResponseWithCallbackConfirmed() throws IOException {
final String response = "oauth_token=hh5s93j4hdidpola&oauth_token_secret=hdhd0244k9j7ao03"
+ "&callback_confirmed=true";
- final OAuth1Token extracted = extractor.extract(response);
+ final OAuth1Token extracted = extractor.extract(ok(response));
assertEquals("hh5s93j4hdidpola", extracted.getToken());
assertEquals("hdhd0244k9j7ao03", extracted.getTokenSecret());
}
@Test
- public void shouldExtractTokenWithEmptySecret() {
+ public void shouldExtractTokenWithEmptySecret() throws IOException {
final String response = "oauth_token=hh5s93j4hdidpola&oauth_token_secret=";
- final OAuth1Token extracted = extractor.extract(response);
+ final OAuth1Token extracted = extractor.extract(ok(response));
assertEquals("hh5s93j4hdidpola", extracted.getToken());
assertEquals("", extracted.getTokenSecret());
}
@Test(expected = OAuthException.class)
- public void shouldThrowExceptionIfTokenIsAbsent() {
+ public void shouldThrowExceptionIfTokenIsAbsent() throws IOException {
final String response = "oauth_secret=hh5s93j4hdidpola&callback_confirmed=true";
- extractor.extract(response);
+ extractor.extract(ok(response));
}
@Test(expected = OAuthException.class)
- public void shouldThrowExceptionIfSecretIsAbsent() {
+ public void shouldThrowExceptionIfSecretIsAbsent() throws IOException {
final String response = "oauth_token=hh5s93j4hdidpola&callback_confirmed=true";
- extractor.extract(response);
+ extractor.extract(ok(response));
}
@Test(expected = IllegalArgumentException.class)
- public void shouldThrowExceptionIfResponseIsNull() {
- extractor.extract(null);
+ public void shouldThrowExceptionIfResponseIsNull() throws IOException {
+ extractor.extract(ok(null));
}
@Test(expected = IllegalArgumentException.class)
- public void shouldThrowExceptionIfResponseIsEmptyString() {
+ public void shouldThrowExceptionIfResponseIsEmptyString() throws IOException {
final String response = "";
- extractor.extract(response);
+ extractor.extract(ok(response));
+ }
+
+ private static Response ok(String body) {
+ return new Response(200, /* message */ null, /* headers */ Collections.emptyMap(), body);
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenExtractorTest.java
index 8ed1707b3..7f2cd4ddd 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenExtractorTest.java
@@ -1,9 +1,14 @@
package com.github.scribejava.core.extractors;
+import com.github.scribejava.core.model.Response;
import org.junit.Before;
import org.junit.Test;
import com.github.scribejava.core.exceptions.OAuthException;
import com.github.scribejava.core.model.OAuth2AccessToken;
+
+import java.io.IOException;
+import java.util.Collections;
+
import static org.junit.Assert.assertEquals;
public class OAuth2AccessTokenExtractorTest {
@@ -16,44 +21,61 @@ public void setUp() {
}
@Test
- public void shouldExtractTokenFromOAuthStandardResponse() {
+ public void shouldExtractTokenFromOAuthStandardResponse() throws IOException {
final String response = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159"
+ "|RsXNdKrpxg8L6QNLWcs2TVTmcaE";
- final OAuth2AccessToken extracted = extractor.extract(response);
+ final OAuth2AccessToken extracted = extractor.extract(ok(response));
+ assertEquals("166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE",
+ extracted.getAccessToken());
+ }
+
+ @Test
+ public void shouldExtractTokenFromResponseWithExpiresParam() throws IOException {
+ final String response = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159"
+ + "|RsXNdKrpxg8L6QNLWcs2TVTmcaE&expires_in=5108";
+ final OAuth2AccessToken extracted = extractor.extract(ok(response));
assertEquals("166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE",
extracted.getAccessToken());
+ assertEquals(Integer.valueOf(5108), extracted.getExpiresIn());
}
@Test
- public void shouldExtractTokenFromResponseWithExpiresParam() {
+ public void shouldExtractTokenFromResponseWithExpiresAndRefreshParam() throws IOException {
final String response = "access_token=166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159"
- + "|RsXNdKrpxg8L6QNLWcs2TVTmcaE&expires=5108";
- final OAuth2AccessToken extracted = extractor.extract(response);
+ + "|RsXNdKrpxg8L6QNLWcs2TVTmcaE&expires_in=5108&token_type=bearer&refresh_token=166942940015970";
+ final OAuth2AccessToken extracted = extractor.extract(ok(response));
assertEquals("166942940015970|2.2ltzWXYNDjCtg5ZDVVJJeg__.3600.1295816400-548517159|RsXNdKrpxg8L6QNLWcs2TVTmcaE",
extracted.getAccessToken());
+ assertEquals(Integer.valueOf(5108), extracted.getExpiresIn());
+ assertEquals("bearer", extracted.getTokenType());
+ assertEquals("166942940015970", extracted.getRefreshToken());
}
@Test
- public void shouldExtractTokenFromResponseWithManyParameters() {
+ public void shouldExtractTokenFromResponseWithManyParameters() throws IOException {
final String response = "access_token=foo1234&other_stuff=yeah_we_have_this_too&number=42";
- final OAuth2AccessToken extracted = extractor.extract(response);
+ final OAuth2AccessToken extracted = extractor.extract(ok(response));
assertEquals("foo1234", extracted.getAccessToken());
}
@Test(expected = OAuthException.class)
- public void shouldThrowExceptionIfTokenIsAbsent() {
+ public void shouldThrowExceptionIfTokenIsAbsent() throws IOException {
final String response = "&expires=5108";
- extractor.extract(response);
+ extractor.extract(ok(response));
}
@Test(expected = IllegalArgumentException.class)
- public void shouldThrowExceptionIfResponseIsNull() {
- extractor.extract(null);
+ public void shouldThrowExceptionIfResponseIsNull() throws IOException {
+ extractor.extract(ok(null));
}
@Test(expected = IllegalArgumentException.class)
- public void shouldThrowExceptionIfResponseIsEmptyString() {
+ public void shouldThrowExceptionIfResponseIsEmptyString() throws IOException {
final String response = "";
- extractor.extract(response);
+ extractor.extract(ok(response));
+ }
+
+ private static Response ok(String body) {
+ return new Response(200, /* message */ null, /* headers */ Collections.emptyMap(), body);
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java
index 9b2098e6c..42f07e25f 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/extractors/OAuth2AccessTokenJsonExtractorTest.java
@@ -1,8 +1,15 @@
package com.github.scribejava.core.extractors;
import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.OAuth2AccessTokenErrorResponse;
+import com.github.scribejava.core.model.Response;
import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Collections;
+
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class OAuth2AccessTokenJsonExtractorTest {
@@ -10,18 +17,41 @@ public class OAuth2AccessTokenJsonExtractorTest {
private final OAuth2AccessTokenJsonExtractor extractor = OAuth2AccessTokenJsonExtractor.instance();
@Test
- public void shouldParseResponse() {
- final OAuth2AccessToken token = extractor.extract(RESPONSE);
+ public void shouldParseResponse() throws IOException {
+ final OAuth2AccessToken token = extractor.extract(ok(RESPONSE));
assertEquals(token.getAccessToken(), "I0122HHJKLEM21F3WLPYHDKGKZULAUO4SGMV3ABKFTDT3T3X");
}
@Test(expected = IllegalArgumentException.class)
- public void shouldThrowExceptionIfForNullParameters() {
- extractor.extract(null);
+ public void shouldThrowExceptionIfForNullParameters() throws IOException {
+ extractor.extract(ok(null));
}
@Test(expected = IllegalArgumentException.class)
- public void shouldThrowExceptionIfForEmptyStrings() {
- extractor.extract("");
+ public void shouldThrowExceptionIfForEmptyStrings() throws IOException {
+ extractor.extract(ok(""));
+ }
+
+ @Test
+ public void shouldThrowExceptionIfResponseIsError() throws IOException {
+ final String body = "{" +
+ "\"error_description\":\"unknown, invalid, or expired refresh token\"," +
+ "\"error\":\"invalid_grant\"" +
+ "}";
+ try {
+ extractor.extract(error(body));
+ fail();
+ } catch (OAuth2AccessTokenErrorResponse oaer) {
+ assertEquals(OAuth2AccessTokenErrorResponse.ErrorCode.invalid_grant, oaer.getErrorCode());
+ assertEquals("unknown, invalid, or expired refresh token", oaer.getErrorDescription());
+ }
+ }
+
+ private static Response ok(String body) {
+ return new Response(200, /* message */ null, /* headers */ Collections.emptyMap(), body);
+ }
+
+ private static Response error(String body) {
+ return new Response(400, /* message */ null, /* headers */ Collections.emptyMap(), body);
}
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/ConnectionStub.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/ConnectionStub.java
deleted file mode 100644
index b7465527d..000000000
--- a/scribejava-core/src/test/java/com/github/scribejava/core/model/ConnectionStub.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.github.scribejava.core.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ConnectionStub extends HttpURLConnection {
-
- private final Map headers = new HashMap<>();
- private final Map> responseHeaders = new HashMap<>();
- private int inputStreamCalled;
-
- public ConnectionStub() throws MalformedURLException {
- super(new URL("http://example.com"));
- }
-
- @Override
- public void setRequestProperty(String key, String value) {
- headers.put(key, value);
- }
-
- @Override
- public String getRequestProperty(String s) {
- return headers.get(s);
- }
-
- public Map getHeaders() {
- return headers;
- }
-
- @Override
- public int getResponseCode() throws IOException {
- return 200;
- }
-
- @Override
- public InputStream getInputStream() throws IOException {
- inputStreamCalled++;
- return new ByteArrayInputStream("contents".getBytes());
- }
-
- public int getTimesCalledInpuStream() {
- return inputStreamCalled;
- }
-
- @Override
- public OutputStream getOutputStream() throws IOException {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- baos.write("contents".getBytes());
- return baos;
- }
-
- @Override
- public Map> getHeaderFields() {
- return responseHeaders;
- }
-
- public void addResponseHeader(String key, String value) {
- responseHeaders.put(key, Arrays.asList(value));
- }
-
- @Override
- public void connect() {
- }
-
- @Override
- public void disconnect() {
- }
-
- @Override
- public boolean usingProxy() {
- return false;
- }
-
-}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/ForceTypeOfHttpRequestTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/ForceTypeOfHttpRequestTest.java
deleted file mode 100644
index 9e60f3fb2..000000000
--- a/scribejava-core/src/test/java/com/github/scribejava/core/model/ForceTypeOfHttpRequestTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.scribejava.core.model;
-
-import java.util.concurrent.ExecutionException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import com.github.scribejava.core.exceptions.OAuthException;
-import com.github.scribejava.core.oauth.OAuth20Service;
-import com.github.scribejava.core.oauth.OAuthService;
-
-public class ForceTypeOfHttpRequestTest {
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
- private OAuthRequest request;
- private OAuthRequestAsync requestAsync;
-
- @Before
- public void setUp() {
- ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.NONE);
- final OAuthService oAuthService = new OAuth20Service(null, new OAuthConfig("test", "test"));
- request = new OAuthRequest(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces",
- oAuthService);
- requestAsync = new OAuthRequestAsync(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces",
- oAuthService);
- }
-
- @Test
- public void shouldNotSendSyncWithForceParameter() {
- expectedException.expect(OAuthException.class);
- expectedException.expectMessage("Cannot use sync operations, only async");
- ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_ASYNC_ONLY_HTTP_REQUESTS);
- request.send();
- }
-
- @Test
- public void shouldNotSendAsyncWithForceParameter() throws ExecutionException, InterruptedException {
- expectedException.expect(OAuthException.class);
- expectedException.expectMessage("Cannot use async operations, only sync");
- ScribeJavaConfig.setForceTypeOfHttpRequests(ForceTypeOfHttpRequest.FORCE_SYNC_ONLY_HTTP_REQUESTS);
- requestAsync.sendAsync(null).get();
- }
-}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/OAuthRequestTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/OAuthRequestTest.java
index d1bae5bfa..0ea88985d 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/model/OAuthRequestTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/model/OAuthRequestTest.java
@@ -3,7 +3,6 @@
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
-import com.github.scribejava.core.oauth.OAuth20Service;
public class OAuthRequestTest {
@@ -11,8 +10,7 @@ public class OAuthRequestTest {
@Before
public void setUp() {
- request = new OAuthRequest(Verb.GET, "http://example.com",
- new OAuth20Service(null, new OAuthConfig("test", "test")));
+ request = new OAuthRequest(Verb.GET, "http://example.com");
}
@Test
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/RequestTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/RequestTest.java
index 16b060000..274ccca23 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/model/RequestTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/model/RequestTest.java
@@ -1,38 +1,23 @@
package com.github.scribejava.core.model;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
-import com.github.scribejava.core.oauth.OAuth20Service;
-import com.github.scribejava.core.oauth.OAuthService;
import java.net.MalformedURLException;
public class RequestTest {
private OAuthRequest getRequest;
private OAuthRequest postRequest;
- private ConnectionStub connection;
- private OAuthService oAuthService;
@Before
public void setUp() throws MalformedURLException {
- connection = new ConnectionStub();
- oAuthService = new OAuth20Service(null, new OAuthConfig("test", "test"));
- postRequest = new OAuthRequest(Verb.POST, "http://example.com", oAuthService);
+ postRequest = new OAuthRequest(Verb.POST, "http://example.com");
postRequest.addBodyParameter("param", "value");
postRequest.addBodyParameter("param with spaces", "value with spaces");
- postRequest.setConnection(connection);
- getRequest = new OAuthRequest(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces",
- oAuthService);
- getRequest.setConnection(connection);
- }
- @Test
- public void shouldSetRequestVerb() {
- getRequest.send();
- assertEquals("GET", connection.getRequestMethod());
+ getRequest = new OAuthRequest(Verb.GET, "http://example.com?qsparam=value&other+param=value+with+spaces");
}
@Test
@@ -42,33 +27,21 @@ public void shouldGetQueryStringParameters() {
assertTrue(getRequest.getQueryStringParams().contains(new Parameter("qsparam", "value")));
}
- @Test
- public void shouldAddRequestHeaders() {
- getRequest.addHeader("Header", "1");
- getRequest.addHeader("Header2", "2");
- getRequest.send();
- assertEquals(2, getRequest.getHeaders().size());
- assertEquals(2, connection.getHeaders().size());
- }
-
@Test
public void shouldSetBodyParamsAndAddContentLength() {
- assertEquals("param=value¶m%20with%20spaces=value%20with%20spaces", postRequest.getBodyContents());
- postRequest.send();
- assertTrue(connection.getHeaders().containsKey("Content-Length"));
+ assertEquals("param=value¶m%20with%20spaces=value%20with%20spaces",
+ new String(postRequest.getByteArrayPayload()));
}
@Test
public void shouldSetPayloadAndHeaders() {
- postRequest.addPayload("PAYLOAD");
- postRequest.send();
- assertEquals("PAYLOAD", postRequest.getBodyContents());
- assertTrue(connection.getHeaders().containsKey("Content-Length"));
+ postRequest.setPayload("PAYLOAD");
+ assertEquals("PAYLOAD", postRequest.getStringPayload());
}
@Test
public void shouldAllowAddingQuerystringParametersAfterCreation() {
- final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com?one=val", oAuthService);
+ final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com?one=val");
request.addQuerystringParameter("two", "other val");
request.addQuerystringParameter("more", "params");
assertEquals(3, request.getQueryStringParams().size());
@@ -76,7 +49,7 @@ public void shouldAllowAddingQuerystringParametersAfterCreation() {
@Test
public void shouldReturnTheCompleteUrl() {
- final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com?one=val", oAuthService);
+ final OAuthRequest request = new OAuthRequest(Verb.GET, "http://example.com?one=val");
request.addQuerystringParameter("two", "other val");
request.addQuerystringParameter("more", "params");
assertEquals("http://example.com?one=val&two=other%20val&more=params", request.getCompleteUrl());
@@ -86,37 +59,4 @@ public void shouldReturnTheCompleteUrl() {
public void shouldHandleQueryStringSpaceEncodingProperly() {
assertTrue(getRequest.getQueryStringParams().contains(new Parameter("other param", "value with spaces")));
}
-
- @Test
- public void shouldAutomaticallyAddContentTypeForPostRequestsWithBytePayload() {
- postRequest.addPayload("PAYLOAD".getBytes());
- postRequest.send();
- assertEquals(OAuthRequest.DEFAULT_CONTENT_TYPE, connection.getHeaders().get("Content-Type"));
- }
-
- @Test
- public void shouldAutomaticallyAddContentTypeForPostRequestsWithStringPayload() {
- postRequest.addPayload("PAYLOAD");
- postRequest.send();
- assertEquals(OAuthRequest.DEFAULT_CONTENT_TYPE, connection.getHeaders().get("Content-Type"));
- }
-
- @Test
- public void shouldAutomaticallyAddContentTypeForPostRequestsWithBodyParameters() {
- postRequest.send();
- assertEquals(OAuthRequest.DEFAULT_CONTENT_TYPE, connection.getHeaders().get("Content-Type"));
- }
-
- @Test
- public void shouldBeAbleToOverrideItsContentType() {
- postRequest.addHeader("Content-Type", "my-content-type");
- postRequest.send();
- assertEquals("my-content-type", connection.getHeaders().get("Content-Type"));
- }
-
- @Test
- public void shouldNotAddContentTypeForGetRequests() {
- getRequest.send();
- assertFalse(connection.getHeaders().containsKey("Content-Type"));
- }
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/model/ResponseTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/model/ResponseTest.java
deleted file mode 100644
index c4fe5712f..000000000
--- a/scribejava-core/src/test/java/com/github/scribejava/core/model/ResponseTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.github.scribejava.core.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ResponseTest {
-
- private Response response;
- private ConnectionStub connection;
-
- @Before
- public void setUp() throws IOException {
- connection = new ConnectionStub();
- connection.addResponseHeader("one", "one");
- connection.addResponseHeader("two", "two");
- response = new Response(connection);
- }
-
- @Test
- public void shouldPopulateResponseHeaders() {
- assertEquals(2, response.getHeaders().size());
- assertEquals("one", response.getHeader("one"));
- }
-
- @Test
- public void shouldParseBodyContents() {
- assertEquals("contents", response.getBody());
- assertEquals(1, connection.getTimesCalledInpuStream());
- }
-
- @Test
- public void shouldParseBodyContentsOnlyOnce() {
- assertEquals("contents", response.getBody());
- assertEquals("contents", response.getBody());
- assertEquals("contents", response.getBody());
- assertEquals(1, connection.getTimesCalledInpuStream());
- }
-
- @Test
- public void shouldHandleAConnectionWithErrors() throws IOException {
- final Response errResponse = new Response(new FaultyConnection());
- assertEquals(400, errResponse.getCode());
- assertEquals("errors", errResponse.getBody());
- }
-
- private static class FaultyConnection extends ConnectionStub {
-
- private FaultyConnection() throws MalformedURLException {
- super();
- }
-
- @Override
- public InputStream getErrorStream() {
- return new ByteArrayInputStream("errors".getBytes());
- }
-
- @Override
- public int getResponseCode() throws IOException {
- return 400;
- }
- }
-}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/CompletedFuture.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/CompletedFuture.java
new file mode 100644
index 000000000..33919d4bf
--- /dev/null
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/CompletedFuture.java
@@ -0,0 +1,37 @@
+package com.github.scribejava.core.oauth;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+class CompletedFuture implements Future {
+ private final V result;
+
+ CompletedFuture(V result) {
+ this.result = result;
+ }
+
+ @Override
+ public boolean cancel(boolean mayInterruptIfRunning) {
+ return false;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return false;
+ }
+
+ @Override
+ public boolean isDone() {
+ return true;
+ }
+
+ @Override
+ public V get() {
+ return result;
+ }
+
+ @Override
+ public V get(long timeout, TimeUnit unit) {
+ return result;
+ }
+}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ApiUnit.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ApiUnit.java
new file mode 100644
index 000000000..c6c05e05c
--- /dev/null
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ApiUnit.java
@@ -0,0 +1,28 @@
+package com.github.scribejava.core.oauth;
+
+import com.github.scribejava.core.builder.api.DefaultApi20;
+import com.github.scribejava.core.builder.api.OAuth2SignatureType;
+import com.github.scribejava.core.model.OAuthConfig;
+
+class OAuth20ApiUnit extends DefaultApi20 {
+
+ @Override
+ public String getAccessTokenEndpoint() {
+ return "http://localhost:8080/token";
+ }
+
+ @Override
+ protected String getAuthorizationBaseUrl() {
+ return "http://localhost:8080/authorize";
+ }
+
+ @Override
+ public OAuth20Service createService(OAuthConfig config) {
+ return new OAuth20ServiceUnit(this, config);
+ }
+
+ @Override
+ public OAuth2SignatureType getSignatureType() {
+ return OAuth2SignatureType.BEARER_URI_QUERY_PARAMETER;
+ }
+}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java
new file mode 100644
index 000000000..581fc5a63
--- /dev/null
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java
@@ -0,0 +1,131 @@
+package com.github.scribejava.core.oauth;
+
+import com.github.scribejava.core.builder.ServiceBuilder;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.OAuth2Authorization;
+import com.github.scribejava.core.model.OAuthConstants;
+import com.github.scribejava.core.services.Base64Encoder;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import java.io.IOException;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+import java.nio.charset.Charset;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+public class OAuth20ServiceTest {
+
+ @Test
+ public void shouldProduceCorrectRequestSync() throws IOException, InterruptedException, ExecutionException {
+ final OAuth20Service service = new ServiceBuilder("your_api_key")
+ .apiSecret("your_api_secret")
+ .build(new OAuth20ApiUnit());
+
+ final OAuth2AccessToken token = service.getAccessTokenPasswordGrant("user1", "password1");
+ final Gson json = new Gson();
+
+ assertNotNull(token);
+
+ final Map map = json.fromJson(token.getRawResponse(), new TypeTokenImpl().getType());
+
+ assertEquals(OAuth20ServiceUnit.TOKEN, map.get(OAuthConstants.ACCESS_TOKEN));
+ assertEquals(OAuth20ServiceUnit.STATE, map.get(OAuthConstants.STATE));
+ assertEquals(OAuth20ServiceUnit.EXPIRES, map.get("expires_in"));
+
+ final String authorize = Base64Encoder.getInstance()
+ .encode(String.format("%s:%s", service.getConfig().getApiKey(), service.getConfig().getApiSecret())
+ .getBytes(Charset.forName("UTF-8")));
+
+ assertEquals(OAuthConstants.BASIC + " " + authorize, map.get(OAuthConstants.HEADER));
+
+ assertEquals("user1", map.get("query-username"));
+ assertEquals("password1", map.get("query-password"));
+ assertEquals("password", map.get("query-grant_type"));
+ }
+
+ @Test
+ public void shouldProduceCorrectRequestAsync() throws ExecutionException, InterruptedException {
+ final OAuth20Service service = new ServiceBuilder("your_api_key")
+ .apiSecret("your_api_secret")
+ .build(new OAuth20ApiUnit());
+
+ final OAuth2AccessToken token = service.getAccessTokenPasswordGrantAsync("user1", "password1", null).get();
+ final Gson json = new Gson();
+
+ assertNotNull(token);
+
+ final Map map = json.fromJson(token.getRawResponse(), new TypeTokenImpl().getType());
+
+ assertEquals(OAuth20ServiceUnit.TOKEN, map.get(OAuthConstants.ACCESS_TOKEN));
+ assertEquals(OAuth20ServiceUnit.STATE, map.get(OAuthConstants.STATE));
+ assertEquals(OAuth20ServiceUnit.EXPIRES, map.get("expires_in"));
+
+ final String authorize = Base64Encoder.getInstance()
+ .encode(String.format("%s:%s", service.getConfig().getApiKey(), service.getConfig().getApiSecret())
+ .getBytes(Charset.forName("UTF-8")));
+
+ assertEquals(OAuthConstants.BASIC + " " + authorize, map.get(OAuthConstants.HEADER));
+
+ assertEquals("user1", map.get("query-username"));
+ assertEquals("password1", map.get("query-password"));
+ assertEquals("password", map.get("query-grant_type"));
+ }
+
+ @Test
+ public void testOAuthExtractAuthorization() {
+ final OAuth20Service service = new ServiceBuilder("your_api_key")
+ .apiSecret("your_api_secret")
+ .build(new OAuth20ApiUnit());
+
+ OAuth2Authorization authorization = service.extractAuthorization("https://cl.ex.com/cb?code=SplxlOB&state=xyz");
+ assertEquals("SplxlOB", authorization.getCode());
+ assertEquals("xyz", authorization.getState());
+
+ authorization = service.extractAuthorization("https://cl.ex.com/cb?state=xyz&code=SplxlOB");
+ assertEquals("SplxlOB", authorization.getCode());
+ assertEquals("xyz", authorization.getState());
+
+ authorization = service.extractAuthorization("https://cl.ex.com/cb?key=value&state=xyz&code=SplxlOB");
+ assertEquals("SplxlOB", authorization.getCode());
+ assertEquals("xyz", authorization.getState());
+
+ authorization = service.extractAuthorization("https://cl.ex.com/cb?state=xyz&code=SplxlOB&key=value&");
+ assertEquals("SplxlOB", authorization.getCode());
+ assertEquals("xyz", authorization.getState());
+
+ authorization = service.extractAuthorization("https://cl.ex.com/cb?code=SplxlOB&state=");
+ assertEquals("SplxlOB", authorization.getCode());
+ assertEquals(null, authorization.getState());
+
+ authorization = service.extractAuthorization("https://cl.ex.com/cb?code=SplxlOB");
+ assertEquals("SplxlOB", authorization.getCode());
+ assertEquals(null, authorization.getState());
+
+ authorization = service.extractAuthorization("https://cl.ex.com/cb?code=");
+ assertEquals(null, authorization.getCode());
+ assertEquals(null, authorization.getState());
+
+ authorization = service.extractAuthorization("https://cl.ex.com/cb?code");
+ assertEquals(null, authorization.getCode());
+ assertEquals(null, authorization.getState());
+
+ authorization = service.extractAuthorization("https://cl.ex.com/cb?");
+ assertEquals(null, authorization.getCode());
+ assertEquals(null, authorization.getState());
+
+ authorization = service.extractAuthorization("https://cl.ex.com/cb");
+ assertEquals(null, authorization.getCode());
+ assertEquals(null, authorization.getState());
+
+ }
+
+ private static class TypeTokenImpl extends TypeToken> {
+
+ private TypeTokenImpl() {
+ }
+ }
+
+}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java
new file mode 100644
index 000000000..8a49c0ee1
--- /dev/null
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceUnit.java
@@ -0,0 +1,62 @@
+package com.github.scribejava.core.oauth;
+
+import com.github.scribejava.core.builder.api.DefaultApi20;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
+import com.github.scribejava.core.model.OAuthConfig;
+import com.github.scribejava.core.model.OAuthConstants;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Parameter;
+import com.google.gson.Gson;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Future;
+
+class OAuth20ServiceUnit extends OAuth20Service {
+
+ static final String TOKEN = "ae82980abab675c646a070686d5558ad";
+ static final String STATE = "123";
+ static final String EXPIRES = "3600";
+
+ OAuth20ServiceUnit(DefaultApi20 api, OAuthConfig config) {
+ super(api, config);
+ }
+
+ @Override
+ protected OAuth2AccessToken sendAccessTokenRequestSync(OAuthRequest request) {
+ return new OAuth2AccessToken(TOKEN, prepareRawResponse(request));
+ }
+
+ private String prepareRawResponse(OAuthRequest request) {
+ final Gson json = new Gson();
+ final Map response = new HashMap<>();
+ response.put(OAuthConstants.ACCESS_TOKEN, TOKEN);
+ response.put(OAuthConstants.STATE, STATE);
+ response.put("expires_in", EXPIRES);
+
+ response.putAll(request.getHeaders());
+ response.putAll(request.getOauthParameters());
+
+ for (Parameter p : request.getBodyParams().getParams()) {
+ response.put("query-" + p.getKey(), p.getValue());
+ }
+
+ return json.toJson(response);
+ }
+
+ @Override
+ protected Future sendAccessTokenRequestAsync(OAuthRequest request,
+ OAuthAsyncRequestCallback callback) {
+
+ final OAuth2AccessToken accessToken = new OAuth2AccessToken(TOKEN, prepareRawResponse(request));
+
+ try {
+ return new CompletedFuture<>(accessToken);
+ } finally {
+ if (callback != null) {
+ callback.onCompleted(accessToken);
+ }
+ }
+ }
+}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/utils/MapUtilsTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/utils/MapUtilsTest.java
index dc6bd38d5..9ce36c76f 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/utils/MapUtilsTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/utils/MapUtilsTest.java
@@ -1,5 +1,6 @@
package com.github.scribejava.core.utils;
+import java.util.LinkedHashMap;
import java.util.HashMap;
import java.util.Map;
import org.junit.Assert;
@@ -9,7 +10,7 @@ public class MapUtilsTest {
@Test
public void shouldPrettyPrintMap() {
- final Map map = new HashMap<>();
+ final Map map = new LinkedHashMap<>();
map.put(1, "one");
map.put(2, "two");
map.put(3, "three");
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/utils/PreconditionsTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/utils/PreconditionsTest.java
index 76d64c5ba..ec6722c5a 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/utils/PreconditionsTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/utils/PreconditionsTest.java
@@ -25,49 +25,4 @@ public void shouldThrowExceptionForEmptyStrings() {
public void shouldThrowExceptionForSpacesOnlyStrings() {
Preconditions.checkEmptyString(" ", ERROR_MSG);
}
-
- @Test(expected = IllegalArgumentException.class)
- public void shouldThrowExceptionForInvalidUrls() {
- Preconditions.checkValidUrl("this/is/not/a/valid/url", ERROR_MSG);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void shouldThrowExceptionForNullUrls() {
- Preconditions.checkValidUrl(null, ERROR_MSG);
- }
-
- @Test
- public void shouldAllowValidUrls() {
- Preconditions.checkValidUrl("http://www.example.com", ERROR_MSG);
- }
-
- @Test
- public void shouldAllowSSLUrls() {
- Preconditions.checkValidUrl("https://www.example.com", ERROR_MSG);
- }
-
- @Test
- public void shouldAllowSpecialCharsInScheme() {
- Preconditions.checkValidUrl("custom+9.3-1://www.example.com", ERROR_MSG);
- }
-
- @Test
- public void shouldAllowNonStandarProtocolsForAndroid() {
- Preconditions.checkValidUrl("x-url-custom://www.example.com", ERROR_MSG);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void shouldNotAllowStrangeProtocolNames() {
- Preconditions.checkValidUrl("$weird*://www.example.com", ERROR_MSG);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void shouldNotAllowUnderscoreInScheme() {
- Preconditions.checkValidUrl("http_custom://www.example.com", ERROR_MSG);
- }
-
- @Test
- public void shouldAllowOutOfBandAsValidCallbackValue() {
- Preconditions.checkValidOAuthCallback("oob", ERROR_MSG);
- }
}
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/utils/StreamUtilsTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/utils/StreamUtilsTest.java
index 322283d23..cb5c6c7c9 100644
--- a/scribejava-core/src/test/java/com/github/scribejava/core/utils/StreamUtilsTest.java
+++ b/scribejava-core/src/test/java/com/github/scribejava/core/utils/StreamUtilsTest.java
@@ -20,7 +20,7 @@ public int read() throws IOException {
}
@Test
- public void shouldCorrectlyDecodeAStream() {
+ public void shouldCorrectlyDecodeAStream() throws IOException {
final String value = "expected";
final InputStream is = new ByteArrayInputStream(value.getBytes());
final String decoded = StreamUtils.getStreamContents(is);
@@ -28,13 +28,13 @@ public void shouldCorrectlyDecodeAStream() {
}
@Test(expected = IllegalArgumentException.class)
- public void shouldFailForNullParameter() {
+ public void shouldFailForNullParameter() throws IOException {
StreamUtils.getStreamContents(null);
fail("Must throw exception before getting here");
}
- @Test(expected = IllegalStateException.class)
- public void shouldFailWithBrokenStream() {
+ @Test(expected = IOException.class)
+ public void shouldFailWithBrokenStream() throws IOException {
// This object simulates problems with input stream.
StreamUtils.getStreamContents(ALLWAYS_ERROR_INPUT_STREAM);
fail("Must throw exception before getting here");
diff --git a/scribejava-httpclient-ahc/pom.xml b/scribejava-httpclient-ahc/pom.xml
new file mode 100644
index 000000000..1a42399a4
--- /dev/null
+++ b/scribejava-httpclient-ahc/pom.xml
@@ -0,0 +1,42 @@
+
+
+ 4.0.0
+
+
+ com.github.scribejava
+ scribejava
+ 4.1.2-SNAPSHOT
+ ../pom.xml
+
+
+ com.github.scribejava
+ scribejava-httpclient-ahc
+ ScribeJava Async Http Http Client support
+ jar
+
+
+
+ com.github.scribejava
+ scribejava-core
+ ${project.version}
+
+
+ org.asynchttpclient
+ async-http-client
+ 2.0.32
+
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+
diff --git a/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java
new file mode 100644
index 000000000..cdc894bb8
--- /dev/null
+++ b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java
@@ -0,0 +1,118 @@
+package com.github.scribejava.httpclient.ahc;
+
+import com.github.scribejava.core.httpclient.AbstractAsyncOnlyHttpClient;
+import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
+import com.github.scribejava.core.model.OAuthConstants;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Verb;
+import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.DefaultAsyncHttpClient;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.Future;
+
+import java.io.File;
+import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.BoundRequestBuilder;
+
+public class AhcHttpClient extends AbstractAsyncOnlyHttpClient {
+
+ private final AsyncHttpClient client;
+
+ public AhcHttpClient(AhcHttpClientConfig ahcConfig) {
+ final AsyncHttpClientConfig clientConfig = ahcConfig.getClientConfig();
+ client = clientConfig == null ? new DefaultAsyncHttpClient() : new DefaultAsyncHttpClient(clientConfig);
+ }
+
+ public AhcHttpClient(AsyncHttpClient ahcClient) {
+ client = ahcClient;
+ }
+
+ @Override
+ public void close() throws IOException {
+ client.close();
+ }
+
+ @Override
+ public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl,
+ byte[] bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) {
+ return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, BodySetter.BYTE_ARRAY, bodyContents, callback,
+ converter);
+ }
+
+ @Override
+ public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl,
+ String bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) {
+ return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, BodySetter.STRING, bodyContents, callback,
+ converter);
+ }
+
+ @Override
+ public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl,
+ File bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) {
+ return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, BodySetter.FILE, bodyContents, callback,
+ converter);
+ }
+
+ private Future doExecuteAsync(String userAgent, Map headers, Verb httpVerb,
+ String completeUrl, BodySetter bodySetter, Object bodyContents, OAuthAsyncRequestCallback callback,
+ OAuthRequest.ResponseConverter converter) {
+ BoundRequestBuilder boundRequestBuilder;
+ switch (httpVerb) {
+ case GET:
+ boundRequestBuilder = client.prepareGet(completeUrl);
+ break;
+ case POST:
+ boundRequestBuilder = client.preparePost(completeUrl);
+ break;
+ case PUT:
+ boundRequestBuilder = client.preparePut(completeUrl);
+ break;
+ case DELETE:
+ boundRequestBuilder = client.prepareDelete(completeUrl);
+ break;
+ default:
+ throw new IllegalArgumentException("message build error: unknown verb type");
+ }
+
+ if (httpVerb.isPermitBody()) {
+ if (!headers.containsKey(CONTENT_TYPE)) {
+ boundRequestBuilder = boundRequestBuilder.addHeader(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
+ }
+ boundRequestBuilder = bodySetter.setBody(boundRequestBuilder, bodyContents);
+ }
+
+ for (Map.Entry header : headers.entrySet()) {
+ boundRequestBuilder.addHeader(header.getKey(), header.getValue());
+ }
+ if (userAgent != null) {
+ boundRequestBuilder.setHeader(OAuthConstants.USER_AGENT_HEADER_NAME, userAgent);
+ }
+
+ return boundRequestBuilder.execute(new OAuthAsyncCompletionHandler<>(callback, converter));
+ }
+
+ private enum BodySetter {
+ BYTE_ARRAY {
+ @Override
+ BoundRequestBuilder setBody(BoundRequestBuilder requestBuilder, Object bodyContents) {
+ return requestBuilder.setBody((byte[]) bodyContents);
+ }
+ },
+ STRING {
+ @Override
+ BoundRequestBuilder setBody(BoundRequestBuilder requestBuilder, Object bodyContents) {
+ return requestBuilder.setBody((String) bodyContents);
+ }
+ },
+ FILE {
+ @Override
+ BoundRequestBuilder setBody(BoundRequestBuilder requestBuilder, Object bodyContents) {
+ return requestBuilder.setBody((File) bodyContents);
+ }
+ };
+
+ abstract BoundRequestBuilder setBody(BoundRequestBuilder requestBuilder, Object bodyContents);
+ }
+}
diff --git a/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClientConfig.java b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClientConfig.java
new file mode 100644
index 000000000..490eaf2e6
--- /dev/null
+++ b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClientConfig.java
@@ -0,0 +1,26 @@
+package com.github.scribejava.httpclient.ahc;
+
+import com.github.scribejava.core.httpclient.HttpClientConfig;
+import org.asynchttpclient.AsyncHttpClientConfig;
+
+public class AhcHttpClientConfig implements HttpClientConfig {
+
+ private final AsyncHttpClientConfig clientConfig;
+
+ public AhcHttpClientConfig(AsyncHttpClientConfig clientConfig) {
+ this.clientConfig = clientConfig;
+ }
+
+ public AsyncHttpClientConfig getClientConfig() {
+ return clientConfig;
+ }
+
+ @Override
+ public AhcHttpClientConfig createDefaultConfig() {
+ return defaultConfig();
+ }
+
+ public static AhcHttpClientConfig defaultConfig() {
+ return new AhcHttpClientConfig(null);
+ }
+}
diff --git a/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcProvider.java b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcProvider.java
new file mode 100644
index 000000000..97c21dc86
--- /dev/null
+++ b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcProvider.java
@@ -0,0 +1,16 @@
+package com.github.scribejava.httpclient.ahc;
+
+import com.github.scribejava.core.httpclient.HttpClientProvider;
+import com.github.scribejava.core.httpclient.HttpClient;
+import com.github.scribejava.core.httpclient.HttpClientConfig;
+
+public class AhcProvider implements HttpClientProvider {
+
+ @Override
+ public HttpClient createClient(HttpClientConfig config) {
+ if (config instanceof AhcHttpClientConfig) {
+ return new AhcHttpClient((AhcHttpClientConfig) config);
+ }
+ return null;
+ }
+}
diff --git a/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/OAuthAsyncCompletionHandler.java b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/OAuthAsyncCompletionHandler.java
new file mode 100644
index 000000000..856cbcf68
--- /dev/null
+++ b/scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/OAuthAsyncCompletionHandler.java
@@ -0,0 +1,47 @@
+package com.github.scribejava.httpclient.ahc;
+
+import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Response;
+import io.netty.handler.codec.http.HttpHeaders;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.asynchttpclient.AsyncCompletionHandler;
+
+public class OAuthAsyncCompletionHandler extends AsyncCompletionHandler {
+
+ private final OAuthAsyncRequestCallback callback;
+ private final OAuthRequest.ResponseConverter converter;
+
+ public OAuthAsyncCompletionHandler(OAuthAsyncRequestCallback callback,
+ OAuthRequest.ResponseConverter converter) {
+ this.callback = callback;
+ this.converter = converter;
+ }
+
+ @Override
+ public T onCompleted(org.asynchttpclient.Response ahcResponse) throws IOException {
+ final HttpHeaders map = ahcResponse.getHeaders();
+ final Map headersMap = new HashMap<>();
+ for (Map.Entry header : map) {
+ headersMap.put(header.getKey(), header.getValue());
+ }
+ final Response response = new Response(ahcResponse.getStatusCode(), ahcResponse.getStatusText(), headersMap,
+ ahcResponse.getResponseBodyAsStream());
+
+ @SuppressWarnings("unchecked")
+ final T t = converter == null ? (T) response : converter.convert(response);
+ if (callback != null) {
+ callback.onCompleted(t);
+ }
+ return t;
+ }
+
+ @Override
+ public void onThrowable(Throwable t) {
+ if (callback != null) {
+ callback.onThrowable(t);
+ }
+ }
+};
diff --git a/scribejava-httpclient-ahc/src/main/resources/META-INF/services/com.github.scribejava.core.httpclient.HttpClientProvider b/scribejava-httpclient-ahc/src/main/resources/META-INF/services/com.github.scribejava.core.httpclient.HttpClientProvider
new file mode 100644
index 000000000..bbe752ff6
--- /dev/null
+++ b/scribejava-httpclient-ahc/src/main/resources/META-INF/services/com.github.scribejava.core.httpclient.HttpClientProvider
@@ -0,0 +1 @@
+com.github.scribejava.httpclient.ahc.AhcProvider
diff --git a/scribejava-httpclient-ning/pom.xml b/scribejava-httpclient-ning/pom.xml
new file mode 100644
index 000000000..462ca93db
--- /dev/null
+++ b/scribejava-httpclient-ning/pom.xml
@@ -0,0 +1,42 @@
+
+
+ 4.0.0
+
+
+ com.github.scribejava
+ scribejava
+ 4.1.2-SNAPSHOT
+ ../pom.xml
+
+
+ com.github.scribejava
+ scribejava-httpclient-ning
+ ScribeJava Ning Async Http Client support
+ jar
+
+
+
+ com.github.scribejava
+ scribejava-core
+ ${project.version}
+
+
+ com.ning
+ async-http-client
+ 1.9.40
+
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+
diff --git a/scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning/NingHttpClient.java b/scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning/NingHttpClient.java
new file mode 100644
index 000000000..bcc843e00
--- /dev/null
+++ b/scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning/NingHttpClient.java
@@ -0,0 +1,130 @@
+package com.github.scribejava.httpclient.ning;
+
+import com.github.scribejava.core.httpclient.AbstractAsyncOnlyHttpClient;
+import com.github.scribejava.core.model.OAuthAsyncRequestCallback;
+import com.github.scribejava.core.model.OAuthConstants;
+import com.github.scribejava.core.model.OAuthRequest;
+import com.github.scribejava.core.model.Verb;
+import com.ning.http.client.AsyncHttpClient;
+
+import java.util.Map;
+import java.util.concurrent.Future;
+
+import com.ning.http.client.AsyncHttpClientConfig;
+import java.io.File;
+
+public class NingHttpClient extends AbstractAsyncOnlyHttpClient {
+
+ private final AsyncHttpClient client;
+
+ public NingHttpClient(NingHttpClientConfig ningConfig) {
+ final String ningAsyncHttpProviderClassName = ningConfig.getNingAsyncHttpProviderClassName();
+ AsyncHttpClientConfig config = ningConfig.getConfig();
+ if (ningAsyncHttpProviderClassName == null) {
+ client = config == null ? new AsyncHttpClient() : new AsyncHttpClient(config);
+ } else {
+ if (config == null) {
+ config = new AsyncHttpClientConfig.Builder().build();
+ }
+ client = new AsyncHttpClient(ningAsyncHttpProviderClassName, config);
+ }
+ }
+
+ public NingHttpClient(AsyncHttpClient client) {
+ this.client = client;
+ }
+
+ @Override
+ public void close() {
+ client.close();
+ }
+
+ @Override
+ public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl,
+ byte[] bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) {
+
+ return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, BodySetter.BYTE_ARRAY, bodyContents, callback,
+ converter);
+ }
+
+ @Override
+ public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl,
+ String bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter converter) {
+
+ return doExecuteAsync(userAgent, headers, httpVerb, completeUrl, BodySetter.STRING, bodyContents, callback,
+ converter);
+ }
+
+ @Override
+ public Future executeAsync(String userAgent, Map headers, Verb httpVerb, String completeUrl,
+ File bodyContents, OAuthAsyncRequestCallback callback, OAuthRequest.ResponseConverter