@@ -223,28 +223,10 @@ public void makeRequest(
223
223
httpVerb = Verb .TRACE ;
224
224
} else {
225
225
httpVerb = Verb .GET ;
226
- }
226
+ }
227
227
228
- OAuthRequest request = new OAuthRequest (httpVerb , url .toString (), service );
229
-
230
- // Params
231
- if (params .hasKey ("params" )) {
232
- final Map <String ,String > params = (Map <String ,String >) params .get ("params" );
233
- ReadableMapKeySetIterator iterator = params .keySetIterator ();
234
- while (iterator .hasNextKey ()) {
235
- String key = iterator .nextKey ();
236
- ReadableType readableType = params .getType (key );
237
- switch (readableType ) {
238
- case String :
239
- String val = params .getString (key );
240
- // String escapedVal = Uri.encode(val);
241
- request .addParameter (key , val );
242
- break ;
243
- default :
244
- throw new IllegalArgumentException ("Could not read object with key: " + key );
245
- }
246
- }
247
- }
228
+ final ReadableMap requestParams = ((Map <String ,ReadableMap >) params ).get ("params" );
229
+ OAuthRequest request = oauthRequestWithParams (providerName , cfg , authVersion , httpVerb , url , requestParams );
248
230
249
231
if (authVersion .equals ("1.0" )) {
250
232
final OAuth10aService service =
@@ -289,6 +271,50 @@ public void makeRequest(
289
271
}
290
272
}
291
273
274
+ private OAuthRequest oauthRequestWithParams (
275
+ final String providerName ,
276
+ final HashMap <String ,Object > cfg ,
277
+ final String authVersion ,
278
+ final Verb httpVerb ,
279
+ final URL url ,
280
+ final ReadableMap params
281
+ ) throws Exception {
282
+ OAuthRequest request ;
283
+
284
+ if (authVersion .equals ("1.0" )) {
285
+ final OAuth10aService service =
286
+ OAuthManagerProviders .getApiFor10aProvider (providerName , cfg , null );
287
+ request = new OAuthRequest (httpVerb , url .toString (), service );
288
+ } else if (authVersion .equals ("2.0" )) {
289
+ final OAuth20Service service =
290
+ OAuthManagerProviders .getApiFor20Provider (providerName , cfg , null );
291
+
292
+ request = new OAuthRequest (httpVerb , url .toString (), service );
293
+ } else {
294
+ Log .e (TAG , "Error in making request method" );
295
+ throw new Exception ("Provider not handled yet" );
296
+ }
297
+ // Params
298
+ if (params .hasKey ("params" )) {
299
+ ReadableMapKeySetIterator iterator = params .keySetIterator ();
300
+ while (iterator .hasNextKey ()) {
301
+ String key = iterator .nextKey ();
302
+ ReadableType readableType = params .getType (key );
303
+ switch (readableType ) {
304
+ case String :
305
+ String val = params .getString (key );
306
+ // String escapedVal = Uri.encode(val);
307
+ request .addParameter (key , val );
308
+ break ;
309
+ default :
310
+ throw new IllegalArgumentException ("Could not read object with key: " + key );
311
+ }
312
+ }
313
+ }
314
+
315
+ return request ;
316
+ }
317
+
292
318
@ ReactMethod
293
319
public void getSavedAccounts (final ReadableMap options , final Callback onComplete ) {
294
320
// Log.d(TAG, "getSavedAccounts");
0 commit comments