WIP: handle errors on android

Author: auser

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

@@ -197,6 +197,7 @@ public void onPageFinished(String url) {
     @Override
     public void onPageError(int errorCode, String description, String failingUrl) {
       Log.e(TAG, "onPageError: " + failingUrl);
+      mController.onError(errorCode, description, failingUrl);
     }
 
     @Override

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

@@ -150,8 +150,10 @@ public void loaded20AccessToken(final OAuth2AccessToken accessToken) {
     mListener.onOAuth2AccessToken(accessToken);
   }
 
-  public void onError() {
+  public void onError(int errorCode, String description, String failingUrl) {
+    Log.e(TAG, "Error in OAuthManagerFragmentController: " + description);
     this.dismissDialog();
+    mListener.onRequestTokenError(new Exception(description));
   }
 
   public void getRequestTokenUrlAndLoad(AdvancedWebView webView) {
@@ -265,7 +267,7 @@ protected void onPostExecute(final String url) {
         @Override
         public void run() {
           if (url == null) {
-            mCtrl.onError();
+            mCtrl.onError(-1, "No url", "");
             return;
           }
           if (authVersion.equals("1.0")) {
@@ -315,7 +317,7 @@ protected void onPostExecute(final OAuth1AccessToken accessToken) {
         @Override
         public void run() {
           if (accessToken == null) {
-            mCtrl.onError();
+            mCtrl.onError(-1, "No accessToken found", "");
             return;
           }
           mCtrl.loaded10aAccessToken(accessToken);
@@ -359,7 +361,7 @@ protected void onPostExecute(final OAuth2AccessToken accessToken) {
         @Override
         public void run() {
           if (accessToken == null) {
-            mCtrl.onError();
+            mCtrl.onError(-1, "No accessToken found", "");
             return;
           }
           mCtrl.loaded20AccessToken(accessToken);

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

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
+import java.util.Iterator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.ArrayList;
@@ -30,6 +31,7 @@
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.ReactContext;
@@ -91,6 +93,7 @@ public void configureProvider(
     String callbackUrlStr = params.getString("callback_url");
     _callbackUrls.add(callbackUrlStr);
 
+    Log.d(TAG, "Added callback url " + callbackUrlStr + " for providler " + providerName);
 
     // Keep configuration map
     HashMap<String, Object> cfg = new HashMap<String,Object>();
@@ -130,7 +133,10 @@ public void authorize(
       String callbackUrl = "http://localhost/" + providerName;
 
       OAuthManagerOnAccessTokenListener listener = new OAuthManagerOnAccessTokenListener() {
-        public void onRequestTokenError(final Exception ex) {}
+        public void onRequestTokenError(final Exception ex) {
+          Log.e(TAG, "Exception with request token: " + ex.getMessage());
+          _credentialsStore.delete(providerName);
+        }
         public void onOAuth1AccessToken(final OAuth1AccessToken accessToken) {
           _credentialsStore.store(providerName, accessToken);
           _credentialsStore.commit();
@@ -284,18 +290,23 @@ private OAuthRequest oauthRequestWithParams(
     @Nullable final ReadableMap params
     ) throws Exception {
     OAuthRequest request;
+    OAuthConfig config;
+    OAuth1AccessToken oa1token = null;
+    OAuth2AccessToken oa2token = null;
 
     if (authVersion.equals("1.0")) {  
       final OAuth10aService service = 
           OAuthManagerProviders.getApiFor10aProvider(providerName, cfg, null);
+      oa1token = _credentialsStore.get(providerName, OAuth1AccessToken.class);
 
-      final OAuthConfig config = service.getConfig();
+      config = service.getConfig();
       request = new OAuthRequest(httpVerb, url.toString(), config);
     } else if (authVersion.equals("2.0")) {
       final OAuth20Service service =
         OAuthManagerProviders.getApiFor20Provider(providerName, cfg, null);
+      oa2token = _credentialsStore.get(providerName, OAuth2AccessToken.class);
 
-      final OAuthConfig config = service.getConfig();
+      config = service.getConfig();
       request = new OAuthRequest(httpVerb, url.toString(), config);
     } else {
       Log.e(TAG, "Error in making request method");
@@ -311,6 +322,13 @@ private OAuthRequest oauthRequestWithParams(
           case String:
             String val = params.getString(key);
             // String escapedVal = Uri.encode(val);
+            if (val.equals("access_token")) {
+              if (oa1token != null) {
+                val = oa1token.toString();
+              } else if (oa2token != null) {
+                val = oa2token.toString();
+              }
+            }
             request.addParameter(key, val);
             break;
           default:
@@ -449,7 +467,7 @@ private WritableMap accessTokenResponse(
 
     return resp;
   }
-  
+
 
   private void exceptionCallback(Exception ex, final Callback onFail) {
     WritableMap error = Arguments.createMap();
@@ -459,4 +477,71 @@ private void exceptionCallback(Exception ex, final Callback onFail) {
 
     onFail.invoke(error);
   }
-}
+
+    public static Map<String, Object> recursivelyDeconstructReadableMap(ReadableMap readableMap) {
+    Map<String, Object> deconstructedMap = new HashMap<>();
+    if (readableMap == null) {
+      return deconstructedMap;
+    }
+
+    ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
+    while (iterator.hasNextKey()) {
+      String key = iterator.nextKey();
+      ReadableType type = readableMap.getType(key);
+      switch (type) {
+        case Null:
+          deconstructedMap.put(key, null);
+          break;
+        case Boolean:
+          deconstructedMap.put(key, readableMap.getBoolean(key));
+          break;
+        case Number:
+          deconstructedMap.put(key, readableMap.getDouble(key));
+          break;
+        case String:
+          deconstructedMap.put(key, readableMap.getString(key));
+          break;
+        case Map:
+          deconstructedMap.put(key, OAuthManagerModule.recursivelyDeconstructReadableMap(readableMap.getMap(key)));
+          break;
+        case Array:
+          deconstructedMap.put(key, OAuthManagerModule.recursivelyDeconstructReadableArray(readableMap.getArray(key)));
+          break;
+        default:
+          throw new IllegalArgumentException("Could not convert object with key: " + key + ".");
+      }
+
+    }
+    return deconstructedMap;
+  }
+
+  public static List<Object> recursivelyDeconstructReadableArray(ReadableArray readableArray) {
+    List<Object> deconstructedList = new ArrayList<>(readableArray.size());
+    for (int i = 0; i < readableArray.size(); i++) {
+      ReadableType indexType = readableArray.getType(i);
+      switch (indexType) {
+        case Null:
+          deconstructedList.add(i, null);
+          break;
+        case Boolean:
+          deconstructedList.add(i, readableArray.getBoolean(i));
+          break;
+        case Number:
+          deconstructedList.add(i, readableArray.getDouble(i));
+          break;
+        case String:
+          deconstructedList.add(i, readableArray.getString(i));
+          break;
+        case Map:
+          deconstructedList.add(i, OAuthManagerModule.recursivelyDeconstructReadableMap(readableArray.getMap(i)));
+          break;
+        case Array:
+          deconstructedList.add(i, OAuthManagerModule.recursivelyDeconstructReadableArray(readableArray.getArray(i)));
+          break;
+        default:
+          throw new IllegalArgumentException("Could not convert object at index " + i + ".");
+      }
+    }
+    return deconstructedList;
+  }
+}