add OAuthAsyncHttpClient

fix bugs

bump versions

Author: rogerhu

app/build.gradle

@@ -7,8 +7,8 @@ apply plugin: 'com.jfrog.bintray'
 ext {
 
     GROUP = 'com.codepath.libraries'
-    BASE_VERSION = "1.4"
-    VERSION_NAME = "1.4.0"
+    BASE_VERSION = "2.0"
+    VERSION_NAME = "2.0.0"
     POM_PACKAGING = "aar"
     POM_DESCRIPTION = "CodePath OAuth Handler"
 
@@ -115,10 +115,15 @@ ext {
 
 dependencies {
     api "androidx.appcompat:appcompat:1.0.2"
-    api 'com.codepath.libraries:asynchttpclient:0.0.1'
+    api 'com.codepath.libraries:asynchttpclient:0.0.5'
     implementation files('libs/codepath-utils.jar')
     api 'com.github.scribejava:scribejava-apis:4.1.1'
     api 'com.github.scribejava:scribejava-httpclient-okhttp:4.1.1'
+    implementation 'se.akerfeldt:okhttp-signpost:1.1.0'
+    implementation 'oauth.signpost:signpost-core:1.2.1.2'
+    implementation 'com.facebook.stetho:stetho:1.5.1'
+    implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
+
 }
 
 /*task jar(type: Jar) {

app/src/main/java/com/codepath/oauth/OAuthAsyncHttpClient.java

@@ -0,0 +1,26 @@
+package com.codepath.oauth;
+
+import com.codepath.asynchttpclient.AsyncHttpClient;
+import com.facebook.stetho.okhttp3.StethoInterceptor;
+import com.github.scribejava.core.model.OAuth1AccessToken;
+
+import okhttp3.OkHttpClient;
+import se.akerfeldt.okhttp.signpost.OkHttpOAuthConsumer;
+import se.akerfeldt.okhttp.signpost.SigningInterceptor;
+
+public class OAuthAsyncHttpClient extends AsyncHttpClient {
+
+    protected OAuthAsyncHttpClient(OkHttpClient httpClient) {
+        super(httpClient);
+    }
+
+    public static OAuthAsyncHttpClient create(String consumerKey, String consumerSecret, OAuth1AccessToken token) {
+        OkHttpOAuthConsumer consumer = new OkHttpOAuthConsumer(consumerKey, consumerSecret);
+        consumer.setTokenWithSecret(token.getToken(), token.getTokenSecret());
+        OkHttpClient httpClient = new OkHttpClient.Builder().addNetworkInterceptor(new StethoInterceptor()).addInterceptor(new SigningInterceptor(consumer)).build();
+
+        OAuthAsyncHttpClient asyncHttpClient = new OAuthAsyncHttpClient(httpClient);
+        return asyncHttpClient;
+    }
+
+}

app/src/main/java/com/codepath/oauth/OAuthBaseClient.java

@@ -18,6 +18,7 @@ public abstract class OAuthBaseClient {
     protected String baseUrl;
     protected Context context;
     protected OAuthTokenClient tokenClient;
+    protected OAuthAsyncHttpClient client;
     protected SharedPreferences prefs;
     protected SharedPreferences.Editor editor;
     protected OAuthAccessHandler accessHandler;
@@ -45,7 +46,7 @@ public static OAuthBaseClient getInstance(Class<? extends OAuthBaseClient> klass
         return instance;
     }
 
-    public OAuthBaseClient(Context c, BaseApi apiInstance, String consumerUrl, String consumerKey, String consumerSecret, String callbackUrl) {
+    public OAuthBaseClient(Context c, final BaseApi apiInstance, String consumerUrl, final String consumerKey, final String consumerSecret, String callbackUrl) {
         this.baseUrl = consumerUrl;
         this.callbackUrl = callbackUrl;
         tokenClient = new OAuthTokenClient(apiInstance, consumerKey,
@@ -78,12 +79,15 @@ public void onReceivedAccessToken(Token accessToken, String oAuthVersion) {
                     OAuth1AccessToken oAuth1AccessToken = (OAuth1AccessToken) accessToken;
 
                     tokenClient.setAccessToken(accessToken);
+                    instantiateClient(consumerKey, consumerSecret, oAuth1AccessToken);
                     editor.putString(OAuthConstants.TOKEN, oAuth1AccessToken.getToken());
                     editor.putString(OAuthConstants.TOKEN_SECRET, oAuth1AccessToken.getTokenSecret());
                     editor.putInt(OAuthConstants.VERSION, 1);
                     editor.commit();
                 } else if (oAuthVersion == OAUTH2_VERSION) {
                     OAuth2AccessToken oAuth2AccessToken = (OAuth2AccessToken) accessToken;
+
+                    //TODO(rhu) - create client for OAuth2 cases
                     tokenClient.setAccessToken(accessToken);
                     editor.putString(OAuthConstants.TOKEN, oAuth2AccessToken.getAccessToken());
                     editor.putString(OAuthConstants.SCOPE, oAuth2AccessToken.getScope());
@@ -107,11 +111,22 @@ public void onFailure(Exception e) {
         this.prefs = this.context.getSharedPreferences("OAuth_" + apiInstance.getClass().getSimpleName() + "_" + consumerKey, 0);
         this.editor = this.prefs.edit();
         // Set access token in the tokenClient if already stored in preferences
-        if (this.checkAccessToken() != null) {
-            tokenClient.setAccessToken(this.checkAccessToken());
+        Token accessToken = this.checkAccessToken();
+        if (accessToken != null) {
+            tokenClient.setAccessToken(accessToken);
+            instantiateClient(consumerKey, consumerSecret, accessToken);
         }
     }
 
+    public void instantiateClient(String consumerKey, String consumerSecret, Token token) {
+
+        if (token instanceof OAuth1AccessToken) {
+            client = OAuthAsyncHttpClient.create(consumerKey, consumerSecret, (OAuth1AccessToken)(token));
+        } else {
+
+        }
+
+    }
     // Fetches a request token and retrieve and authorization url
     // Should open a browser in onReceivedRequestToken once the url has been received
     public void connect() {

app/src/main/java/com/codepath/oauth/OAuthLoginActionBarActivity.java

@@ -1,12 +1,12 @@
 package com.codepath.oauth;
 
-import com.codepath.utils.GenericsUtil;
-
 import android.content.Intent;
 import android.net.Uri;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.codepath.utils.GenericsUtil;
+
 
 // This is the ActionBarActivity supportv7 version of LoginActivity
 public abstract class OAuthLoginActionBarActivity<T extends OAuthBaseClient> extends

app/src/main/java/com/codepath/oauth/OAuthTokenClient.java

@@ -14,6 +14,7 @@
 import com.github.scribejava.core.oauth.OAuth10aService;
 import com.github.scribejava.core.oauth.OAuth20Service;
 import com.github.scribejava.core.oauth.OAuthService;
+import com.github.scribejava.httpclient.okhttp.OkHttpHttpClientConfig;
 
 /*
  * OAuthTokenClient is responsible for managing the request and access token exchanges and then
@@ -34,9 +35,10 @@ public OAuthTokenClient(BaseApi apiInstance, String consumerKey, String consumer
         this.handler = handler;
         if (callbackUrl == null) { callbackUrl = OAuthConstants.OUT_OF_BAND; };
         this.service = new ServiceBuilder()
-        	.apiKey(consumerKey)
-        	.apiSecret(consumerSecret).callback(callbackUrl)
-        	.build(apiInstance);
+                .apiKey(consumerKey)
+                .apiSecret(consumerSecret).callback(callbackUrl)
+                .httpClientConfig(OkHttpHttpClientConfig.defaultConfig())
+                .build(apiInstance);
     }
 
     // Get a request token and the authorization url
@@ -85,6 +87,7 @@ public void fetchAccessToken(final Token requestToken, final Uri uri) {
 
                             @Override
                             public void onCompleted(OAuth1AccessToken oAuth1AccessToken) {
+                                setAccessToken(oAuth1AccessToken);
                                 handler.onReceivedAccessToken(oAuth1AccessToken, service.getVersion());
                             }