Get ConfigurableApi in;

Also allow configuring the access_token_verb;

refs fullstackreact#109, fullstackreact#102, fullstackreact#64

Author: Valery Buchinsky

android/src/main/java/io/fullstack/oauth/OAuthManagerProviders.java

@@ -61,25 +61,23 @@ static public OAuth20Service getApiFor20Provider(
     if (providerName.equalsIgnoreCase("facebook")) {
       return OAuthManagerProviders.facebookService(params, opts, callbackUrl);
     }
-    
+
     if (providerName.equalsIgnoreCase("google")) {
       return OAuthManagerProviders.googleService(params, opts, callbackUrl);
     }
-    
+
     if (providerName.equalsIgnoreCase("github")) {
       return OAuthManagerProviders.githubService(params, opts, callbackUrl);
     }
-    
+
     if (providerName.equalsIgnoreCase("slack")) {
       return OAuthManagerProviders.slackService(params, opts, callbackUrl);
-    } else {
-      return null;
     }
-    
+
     if (params.containsKey("access_token_url") && params.containsKey("authorize_url")) {
       return OAuthManagerProviders.configurableService(params, opts, callbackUrl);
     }
-    
+
     return null;
   }
 
@@ -91,9 +89,9 @@ static public OAuthRequest getRequestForProvider(
     final HashMap<String,Object> cfg,
     @Nullable final ReadableMap params
   ) {
-    final OAuth10aService service = 
+    final OAuth10aService service =
           OAuthManagerProviders.getApiFor10aProvider(providerName, cfg, null, null);
-    
+
     String token = oa1token.getToken();
     OAuthConfig config = service.getConfig();
     OAuthRequest request = new OAuthRequest(httpVerb, url.toString(), config);
@@ -113,14 +111,14 @@ static public OAuthRequest getRequestForProvider(
   ) {
     final OAuth20Service service =
         OAuthManagerProviders.getApiFor20Provider(providerName, cfg, null, null);
-    
+
     OAuthConfig config = service.getConfig();
     OAuthRequest request = new OAuthRequest(httpVerb, url.toString(), config);
     String token = oa2token.getAccessToken();
 
     request = OAuthManagerProviders.addParametersToRequest(request, token, params);
 
-    // 
+    //
     Log.d(TAG, "Making request for " + providerName + " to add token " + token);
     // Need a way to standardize this, but for now
     if (providerName.equalsIgnoreCase("slack")) {
@@ -159,12 +157,12 @@ static private OAuthRequest addParametersToRequest(
   }
 
   private static OAuth10aService twitterService(
-    final HashMap cfg, 
+    final HashMap cfg,
     @Nullable final ReadableMap opts,
     final String callbackUrl) {
     String consumerKey = (String) cfg.get("consumer_key");
     String consumerSecret = (String) cfg.get("consumer_secret");
-    
+
     ServiceBuilder builder = new ServiceBuilder()
           .apiKey(consumerKey)
           .apiSecret(consumerSecret)
@@ -180,20 +178,20 @@ private static OAuth10aService twitterService(
     if (callbackUrl != null) {
       builder.callback(callbackUrl);
     }
-    
+
     return builder.build(TwitterApi.instance());
   }
 
   private static OAuth20Service facebookService(
-    final HashMap cfg, 
+    final HashMap cfg,
     @Nullable final ReadableMap opts,
     final String callbackUrl) {
     ServiceBuilder builder = OAuthManagerProviders._oauth2ServiceBuilder(cfg, opts, callbackUrl);
     return builder.build(FacebookApi.instance());
   }
 
   private static OAuth20Service googleService(
-    final HashMap cfg, 
+    final HashMap cfg,
     @Nullable final ReadableMap opts,
     final String callbackUrl)
   {
@@ -202,7 +200,7 @@ private static OAuth20Service googleService(
   }
 
   private static OAuth20Service githubService(
-    final HashMap cfg, 
+    final HashMap cfg,
     @Nullable final ReadableMap opts,
     final String callbackUrl)
   {
@@ -212,20 +210,27 @@ private static OAuth20Service githubService(
   }
 
   private static OAuth20Service configurableService(
-    final HashMap cfg, 
+    final HashMap cfg,
     @Nullable final ReadableMap opts,
     final String callbackUrl
   ) {
     ServiceBuilder builder = OAuthManagerProviders._oauth2ServiceBuilder(cfg, opts, callbackUrl);
+    Log.d(TAG, "Creating ConfigurableApi");
+    //Log.d(TAG, "    authorize_url:     " + cfg.get("authorize_url"));
+    //Log.d(TAG, "    access_token_url:  " + cfg.get("access_token_url"));
     ConfigurableApi api = ConfigurableApi.instance()
       .setAccessTokenEndpoint((String) cfg.get("access_token_url"))
       .setAuthorizationBaseUrl((String) cfg.get("authorize_url"));
-    
+    if (cfg.containsKey("access_token_verb")) {
+      //Log.d(TAG, "    access_token_verb: " + cfg.get("access_token_verb"));
+      api.setAccessTokenVerb((String) cfg.get("access_token_verb"));
+    }
+
     return builder.build(api);
   }
-  
+
   private static OAuth20Service slackService(
-    final HashMap cfg, 
+    final HashMap cfg,
     @Nullable final ReadableMap opts,
     final String callbackUrl
     ) {
@@ -262,13 +267,13 @@ private static ServiceBuilder _oauth2ServiceBuilder(
       String scopeStr = OAuthManagerProviders.getScopeString(scopes, ",");
       builder.scope(scopeStr);
     }
-    
+
     if (opts != null && opts.hasKey("scopes")) {
       scopes = (String) opts.getString("scopes");
       String scopeStr = OAuthManagerProviders.getScopeString(scopes, ",");
       builder.scope(scopeStr);
     }
-    
+
     if (callbackUrl != null) {
       builder.callback(callbackUrl);
     }
@@ -287,4 +292,4 @@ private static String getScopeString(
     Log.d(TAG, "array: " + array + " (" + array.size() + ") from " + scopes);
     return TextUtils.join(joinBy, array);
   }
-}
+}

android/src/main/java/io/fullstack/oauth/services/ConfigurableApi.java

@@ -0,0 +1,66 @@
+package com.github.scribejava.apis;
+
+import android.util.Log;
+
+import com.github.scribejava.core.builder.api.DefaultApi20;
+import com.github.scribejava.core.extractors.OAuth2AccessTokenExtractor;
+import com.github.scribejava.core.extractors.TokenExtractor;
+import com.github.scribejava.core.model.OAuth2AccessToken;
+import com.github.scribejava.core.model.Verb;
+
+public class ConfigurableApi extends DefaultApi20 {
+
+    private String accessTokenEndpoint;
+
+    private String authorizationBaseUrl;
+
+    private Verb accessTokenVerb = Verb.GET;
+
+    protected ConfigurableApi() {
+    }
+
+    private static class InstanceHolder {
+        private static final ConfigurableApi INSTANCE = new ConfigurableApi();
+    }
+
+    public static ConfigurableApi instance() {
+        return InstanceHolder.INSTANCE;
+    }
+
+    public ConfigurableApi setAccessTokenEndpoint(String endpoint) {
+        accessTokenEndpoint = endpoint;
+        return this;
+    }
+
+    public ConfigurableApi setAuthorizationBaseUrl(String baseUrl) {
+        authorizationBaseUrl = baseUrl;
+        return this;
+    }
+
+    public ConfigurableApi setAccessTokenVerb(String verb) {
+        if (verb.equalsIgnoreCase("GET")) {
+            accessTokenVerb = Verb.GET;
+        } else if (verb.equalsIgnoreCase("POST")) {
+            accessTokenVerb = Verb.POST;
+        } else {
+            Log.e("ConfigurableApi", "Expected GET or POST string values for accessTokenVerb.");
+        }
+
+        return this;
+    }
+
+    @Override
+    public Verb getAccessTokenVerb() {
+        return accessTokenVerb;
+    }
+
+    @Override
+    public String getAccessTokenEndpoint() {
+        return accessTokenEndpoint;
+    }
+
+    @Override
+    protected String getAuthorizationBaseUrl() {
+        return authorizationBaseUrl;
+    }
+}