diff --git a/src/main/java/org/scribe/builder/api/LiveApi.java b/src/main/java/org/scribe/builder/api/LiveApi.java new file mode 100644 index 0000000..789631f --- /dev/null +++ b/src/main/java/org/scribe/builder/api/LiveApi.java @@ -0,0 +1,43 @@ +package org.scribe.builder.api; + +import org.scribe.extractors.*; + +import org.scribe.model.*; + +import org.scribe.utils.*; + +import static org.scribe.utils.URLUtils.*; + +public class LiveApi extends DefaultApi20 +{ + + private static final String AUTHORIZE_URL = "https://oauth.live.com/authorize?client_id=%s&redirect_uri=%s&response_type=code"; + private static final String SCOPED_AUTHORIZE_URL = AUTHORIZE_URL + "&scope=%s"; + + @Override + public String getAccessTokenEndpoint() + { + return "https://oauth.live.com/token?grant_type=authorization_code"; + } + + @Override + public String getAuthorizationUrl(OAuthConfig config) + { + Preconditions.checkValidUrl(config.getCallback(), "Must provide a valid url as callback. Live does not support OOB"); + + // Append scope if present + if (config.hasScope()) + { + return String.format(SCOPED_AUTHORIZE_URL, config.getApiKey(), formURLEncode(config.getCallback()), formURLEncode(config.getScope())); + } else + { + return String.format(AUTHORIZE_URL, config.getApiKey(), formURLEncode(config.getCallback())); + } + } + + @Override + public AccessTokenExtractor getAccessTokenExtractor() + { + return new JsonTokenExtractor(); + } +} \ No newline at end of file diff --git a/src/main/java/org/scribe/builder/api/PlurkApi.java b/src/main/java/org/scribe/builder/api/PlurkApi.java new file mode 100644 index 0000000..132c8f0 --- /dev/null +++ b/src/main/java/org/scribe/builder/api/PlurkApi.java @@ -0,0 +1,28 @@ +package org.scribe.builder.api; + +import org.scribe.model.Token; + +public class PlurkApi extends DefaultApi10a +{ + private static final String REQUEST_TOKEN_URL = "http://www.plurk.com/OAuth/request_token"; + private static final String AUTHORIZE_URL = "http://www.plurk.com/OAuth/authorize?oauth_token=%s"; + private static final String ACCESS_TOKEN_URL = "http://www.plurk.com/OAuth/access_token"; + + @Override + public String getRequestTokenEndpoint() + { + return REQUEST_TOKEN_URL; + } + + @Override + public String getAuthorizationUrl(Token requestToken) + { + return String.format(AUTHORIZE_URL, requestToken.getToken()); + } + + @Override + public String getAccessTokenEndpoint() + { + return ACCESS_TOKEN_URL; + } +} diff --git a/src/main/java/org/scribe/model/Request.java b/src/main/java/org/scribe/model/Request.java index b3a7c66..a9c332a 100644 --- a/src/main/java/org/scribe/model/Request.java +++ b/src/main/java/org/scribe/model/Request.java @@ -28,6 +28,8 @@ class Request private String charset; private byte[] bytePayload = null; private boolean connectionKeepAlive = false; + private Long connectTimeout = null; + private Long readTimeout = null; /** * Creates a new Http Request @@ -76,6 +78,14 @@ class Request Response doSend() throws IOException { connection.setRequestMethod(this.verb.name()); + if (connectTimeout != null) + { + connection.setConnectTimeout(connectTimeout.intValue()); + } + if (readTimeout != null) + { + connection.setReadTimeout(readTimeout.intValue()); + } addHeaders(connection); if (verb.equals(Verb.PUT) || verb.equals(Verb.POST)) { @@ -278,7 +288,7 @@ class Request */ public void setConnectTimeout(int duration, TimeUnit unit) { - this.connection.setConnectTimeout((int) unit.toMillis(duration)); + this.connectTimeout = unit.toMillis(duration); } /** @@ -290,7 +300,7 @@ class Request */ public void setReadTimeout(int duration, TimeUnit unit) { - this.connection.setReadTimeout((int) unit.toMillis(duration)); + this.readTimeout = unit.toMillis(duration); } /** diff --git a/src/test/java/org/scribe/examples/LiveExample.java b/src/test/java/org/scribe/examples/LiveExample.java new file mode 100644 index 0000000..ade5a6b --- /dev/null +++ b/src/test/java/org/scribe/examples/LiveExample.java @@ -0,0 +1,64 @@ +package org.scribe.examples; + +import java.util.*; + +import org.scribe.builder.*; +import org.scribe.builder.api.*; +import org.scribe.model.*; +import org.scribe.oauth.*; + +public class LiveExample +{ + private static final String PROTECTED_RESOURCE_URL = "https://api.foursquare.com/v2/users/self/friends?oauth_token="; + private static final Token EMPTY_TOKEN = null; + + public static void main(String[] args) + { + // Replace these with your own api key and secret + String apiKey = ""; + String apiSecret = ""; + OAuthService service = new ServiceBuilder() + .provider(LiveApi.class) + .apiKey(apiKey) + .apiSecret(apiSecret) + .scope("wl.basic") + .callback("http://localhost:9000/") + .build(); + Scanner in = new Scanner(System.in); + + System.out.println("=== Windows Live's OAuth Workflow ==="); + System.out.println(); + + // Obtain the Authorization URL + System.out.println("Fetching the Authorization URL..."); + String authorizationUrl = service.getAuthorizationUrl(EMPTY_TOKEN); + System.out.println("Got the Authorization URL!"); + System.out.println("Now go and authorize Scribe here:"); + System.out.println(authorizationUrl); + System.out.println("And paste the authorization code here"); + System.out.print(">>"); + Verifier verifier = new Verifier(in.nextLine()); + System.out.println(); + + // Trade the Request Token and Verfier for the Access Token + System.out.println("Trading the Request Token for an Access Token..."); + Token accessToken = service.getAccessToken(EMPTY_TOKEN, verifier); + System.out.println("Got the Access Token!"); + System.out.println("(if your curious it looks like this: " + accessToken + " )"); + System.out.println(); + + // Now let's go and ask for a protected resource! + System.out.println("Now we're going to access a protected resource..."); + OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL + accessToken.getToken()); + service.signRequest(accessToken, request); + Response response = request.send(); + System.out.println("Got it! Lets see what we found..."); + System.out.println(); + System.out.println(response.getCode()); + System.out.println(response.getBody()); + + System.out.println(); + System.out.println("Thats it man! Go and build something awesome with Scribe! :)"); + + } +}