Merge pull request fullstackreact#108 from iamham/patch-1

fullstackreact#84 Add idToken to credentials, use GSON to parse accessToken param

Author: auser

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

@@ -6,6 +6,8 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
+import com.google.gson.Gson;
+
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -398,15 +400,17 @@ private WritableMap accessTokenResponse(
   ) {
     WritableMap resp = Arguments.createMap();
     WritableMap response = Arguments.createMap();
+    Map accessTokenMap = new Gson().fromJson(accessToken.getRawResponse(), Map.class);
 
     Log.d(TAG, "Credential raw response: " + accessToken.getRawResponse());
-
+    
     resp.putString("status", "ok");
     resp.putBoolean("authorized", true);
     resp.putString("provider", providerName);
-    response.putString("uuid", accessToken.getParameter("user_id"));
+    String uuid = (String) accessTokenMap.get("user_id");
+    response.putString("uuid", uuid);
 
-    String tokenType = accessToken.getParameter("token_type");
+    String tokenType = (String) accessTokenMap.get("token_type");
     if (tokenType == null) {
       tokenType = "Bearer";
     }
@@ -434,24 +438,26 @@ private WritableMap accessTokenResponse(
   ) {
     WritableMap resp = Arguments.createMap();
     WritableMap response = Arguments.createMap();
+    Map accessTokenMap = new Gson().fromJson(accessToken.getRawResponse(), Map.class);
 
     resp.putString("status", "ok");
     resp.putBoolean("authorized", true);
     resp.putString("provider", providerName);
     try {
-      response.putString("uuid", accessToken.getParameter("user_id"));
+      String uuid = (String) accessTokenMap.get("user_id");
+      response.putString("uuid", uuid);
     } catch (Exception ex) {
       Log.e(TAG, "Exception while getting the access token");
       ex.printStackTrace();
     }
 
     WritableMap credentials = Arguments.createMap();
     Log.d(TAG, "Credential raw response: " + accessToken.getRawResponse());
-
+    
     credentials.putString("accessToken", accessToken.getAccessToken());
     String authHeader;
 
-    String tokenType = accessToken.getParameter("token_type");
+    String tokenType = (String) accessTokenMap.get("token_type");
     if (tokenType == null) {
       tokenType = "Bearer";
     }
@@ -462,12 +468,14 @@ private WritableMap accessTokenResponse(
     }
 
     String clientID = (String) cfg.get("client_id");
+    String idToken = (String) accessTokenMap.get("id_token");
 
     authHeader = tokenType + " " + accessToken.getAccessToken();
     credentials.putString("authorizationHeader", authHeader);
     credentials.putString("type", tokenType);
     credentials.putString("scopes", scope);
     credentials.putString("clientID", clientID);
+    credentials.putString("idToken", idToken);
     response.putMap("credentials", credentials);
 
     resp.putMap("response", response);
@@ -551,4 +559,4 @@ public static List<Object> recursivelyDeconstructReadableArray(ReadableArray rea
     }
     return deconstructedList;
   }
-}
+}