update ok.ru API urls

s-gromov · s-gromov · commit fbe4ffe953ab · 2016-03-28T15:29:21.000+03:00
diff --git a/changelog b/changelog
@@ -3,6 +3,7 @@
  * add OSGI manifest metadata
  * apiSecret is not mandatory parameter in config (to use on client sides and other flows without need of the API secret)
  * implement OAuth2 Authorization Response parsing in the OAuth20Service (to extract code and state from url, useful for Android)
+ * update ok.ru API urls, add 'state' support, add refresh token to the example
 
 [2.4.0]
  * APIs 2.0 can define different endpoints for access token and for refresh token (the same urls by default)
diff --git a/scribejava-apis/src/main/java/com/github/scribejava/apis/OdnoklassnikiApi.java b/scribejava-apis/src/main/java/com/github/scribejava/apis/OdnoklassnikiApi.java
@@ -10,8 +10,7 @@
 public class OdnoklassnikiApi extends DefaultApi20 {
 
     private static final String AUTHORIZE_URL
-            = "http://www.odnoklassniki.ru/oauth/authorize?client_id=%s&response_type=code&redirect_uri=%s";
-    private static final String SCOPED_AUTHORIZE_URL = String.format("%s&scope=%%s", AUTHORIZE_URL);
+            = "https://connect.ok.ru/oauth/authorize?client_id=%s&response_type=code&redirect_uri=%s";
 
     protected OdnoklassnikiApi() {
     }
@@ -26,19 +25,26 @@ public static OdnoklassnikiApi instance() {
 
     @Override
     public String getAccessTokenEndpoint() {
-        return "http://api.odnoklassniki.ru/oauth/token.do";
+        return "https://api.ok.ru/oauth/token.do";
     }
 
     @Override
     public String getAuthorizationUrl(OAuthConfig config) {
         Preconditions.checkValidUrl(config.getCallback(),
                 "Valid url is required for a callback. Odnoklassniki does not support OOB");
+
+        final StringBuilder urlBuilder = new StringBuilder(String.format(AUTHORIZE_URL,
+                config.getApiKey(), OAuthEncoder.encode(config.getCallback())));
+
         if (config.hasScope()) {
-            return String.format(SCOPED_AUTHORIZE_URL, config.getApiKey(), OAuthEncoder.encode(config.getCallback()),
-                    OAuthEncoder.encode(config.getScope()));
-        } else {
-            return String.format(AUTHORIZE_URL, config.getApiKey(), OAuthEncoder.encode(config.getCallback()));
+            urlBuilder.append("&scope=").append(OAuthEncoder.encode(config.getScope()));
+        }
+
+        final String state = config.getState();
+        if (state != null) {
+            urlBuilder.append("&state=").append(OAuthEncoder.encode(config.getState()));
         }
+        return urlBuilder.toString();
     }
 
     @Override
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/OdnoklassnikiExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/OdnoklassnikiExample.java
@@ -14,7 +14,7 @@ public abstract class OdnoklassnikiExample {
 
     private static final String NETWORK_NAME = "Odnoklassniki.ru";
     private static final String PROTECTED_RESOURCE_URL
-            = "http://api.odnoklassniki.ru/api/users/getCurrentUser?application_key=%1$s&format=JSON";
+            = "https://api.ok.ru/api/users/getCurrentUser?application_key=%1$s&format=JSON";
 
     public static void main(String... args) {
         // Replace these with your client id and secret
@@ -49,12 +49,19 @@ public static void main(String... args) {
         // Trade the Request Token and Verfier for the Access Token
         System.out.println("Trading the Request Token for an Access Token...");
 
-        final OAuth2AccessToken accessToken = service.getAccessToken(code);
+        OAuth2AccessToken accessToken = service.getAccessToken(code);
         System.out.println("Got the Access Token!");
         System.out.println("(if your curious it looks like this: " + accessToken
                 + ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
         System.out.println();
 
+        System.out.println("Refreshing the Access Token...");
+        accessToken = service.refreshAccessToken(accessToken.getRefreshToken());
+        System.out.println("Refreshed the Access Token!");
+        System.out.println("(if your curious it looks like this: " + accessToken
+                + ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
+        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...");
         final OAuthRequest request = new OAuthRequest(Verb.GET, String.format(PROTECTED_RESOURCE_URL, publicKey),
