Merge branch 'master' into master

Author: auser

.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["env"],
+  "plugins": ["transform-async-to-generator", "transform-object-rest-spread"]
+}

.gitignore

@@ -17,3 +17,4 @@ xcuserdata/
 .idea
 .vscode
 javac-services.0.log*
+dist/

README.md

@@ -34,6 +34,10 @@ manager.authorize('google', {scopes: 'profile email'})
 .catch(err => console.log('There was an error'));
 ```
 
+### Help
+
+Due to other time contraints, I cannot continue to work on react-native-oauth for the time it deserves. If you're interested in supporting this library, please help! It's a widely used library and I'd love to continue supporting it. Looking for maintainers!
+
 ## Features
 
 * Isolates the OAuth experience to a few simple methods.

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

@@ -6,6 +6,9 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -400,7 +403,25 @@ private WritableMap accessTokenResponse(
     WritableMap response = Arguments.createMap();
 
     Log.d(TAG, "Credential raw response: " + accessToken.getRawResponse());
-    
+
+    /* Some things return as JSON, some as x-www-form-urlencoded (querystring) */
+
+    Map accessTokenMap = null;
+    try {
+      accessTokenMap = new Gson().fromJson(accessToken.getRawResponse(), Map.class);
+    } catch (JsonSyntaxException e) {
+      /*
+      failed to parse as JSON, so turn it into a HashMap which looks like the one we'd
+      get back from the JSON parser, so the rest of the code continues unchanged.
+      */
+      Log.d(TAG, "Credential looks like a querystring; parsing as such");
+      accessTokenMap = new HashMap();
+      accessTokenMap.put("user_id", accessToken.getParameter("user_id"));
+      accessTokenMap.put("oauth_token_secret", accessToken.getParameter("oauth_token_secret"));
+      accessTokenMap.put("token_type", accessToken.getParameter("token_type"));
+    }
+
+
     resp.putString("status", "ok");
     resp.putBoolean("authorized", true);
     resp.putString("provider", providerName);

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

@@ -22,7 +22,6 @@ public OAuthManagerPackage() {
      * @param reactContext react application context that can be used to create modules
      * @return list of native modules to register with the newly created catalyst instance
      */
-    @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
         modules.add(new OAuthManagerModule(reactContext));
@@ -45,7 +44,6 @@ public List<Class<? extends JavaScriptModule>> createJSModules() {
      * @param reactContext
      * @return a list of view managers that should be registered with {@link UIManagerModule}
      */
-    @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
         return Collections.emptyList();
     }

ios/OAuthManager/OAuthManager.h

@@ -7,16 +7,16 @@
 
 #import <Foundation/Foundation.h>
 
-#if __has_include("RCTBridgeModule.h")
-    #import "RCTBridgeModule.h"
-#else
+#if __has_include(<React/RCTBridgeModule.h>)
     #import <React/RCTBridgeModule.h>
+#else
+    #import "RCTBridgeModule.h"
 #endif
 
-#if __has_include("RCTLinkingManager.h")
-    #import "RCTLinkingManager.h"
-#else
+#if __has_include(<React/RCTLinkingManager.h>)
     #import <React/RCTLinkingManager.h>
+#else
+    #import "RCTLinkingManager.h"
 #endif
 
 

ios/OAuthManager/OAuthManager.m

@@ -88,9 +88,13 @@ + (BOOL)setupOAuthHandler:(UIApplication *)application
     [authPlatform setURLOpener: ^void(NSURL *URL, DCTAuthPlatformCompletion completion) {
         // [sharedManager setPendingAuthentication:YES];
         if ([SFSafariViewController class] != nil) {
-            safariViewController = [[SFSafariViewController alloc] initWithURL:URL];
-            UIViewController *viewController = application.keyWindow.rootViewController;
-            [viewController presentViewController:safariViewController animated:YES completion: nil];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                safariViewController = [[SFSafariViewController alloc] initWithURL:URL];
+                UIViewController *viewController = application.keyWindow.rootViewController;
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [viewController presentViewController:safariViewController animated:YES completion: nil];
+                });
+            });
         } else {
             [application openURL:URL];
         }
@@ -153,7 +157,7 @@ - (BOOL) _configureProvider:(NSString *)providerName andConfig:(NSDictionary *)c
         _callbackUrls = [arr copy];
         NSLog(@"Saved callback url: %@ in %@", saveCallbackUrl, _callbackUrls);
     }
-
+    
 
     // Convert objects of url type
     for (NSString *name in [config allKeys]) {
@@ -303,7 +307,8 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
     NSMutableDictionary *cfg = [[manager getConfigForProvider:providerName] mutableCopy];
 
     DCTAuthAccount *existingAccount = [manager accountForProvider:providerName];
-    NSString *clientID = ((DCTOAuth2Credential *) existingAccount).clientID;
+    NSString *clientID = ([providerName isEqualToString:@"google"]) ? ((DCTOAuth2Credential *) existingAccount).clientID : (NSString *)nil;
+
     if (([providerName isEqualToString:@"google"] && existingAccount && clientID != nil)
         || (![providerName isEqualToString:@"google"] && existingAccount != nil)) {
         if ([existingAccount isAuthorized]) {
@@ -354,14 +359,14 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
 
     [manager addPending:client];
     _pendingAuthentication = YES;
-
+    
     NSLog(@"Calling authorizeWithUrl: %@ with callbackURL: %@\n %@", providerName, callbackUrl, cfg);
 
     [client authorizeWithUrl:providerName
                          url:callbackUrl
                          cfg:cfg
                    onSuccess:^(DCTAuthAccount *account) {
-                      NSLog(@"on success called with account: %@", account);
+                       NSLog(@"on success called with account: %@", account);
                        NSDictionary *accountResponse = [manager getAccountResponse:account cfg:cfg];
                        _pendingAuthentication = NO;
                        [manager removePending:client];
@@ -443,16 +448,27 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
      URL:apiUrl
      items:items];
 
+    // Allow json body in POST / PUT requests
     NSDictionary *body = [opts objectForKey:@"body"];
     if (body != nil) {
+        NSMutableArray *items = [NSMutableArray array];
+        
         for (NSString *key in body) {
-            NSData *data = [[NSString stringWithFormat:@"%@", [body valueForKey:key]] dataUsingEncoding:NSUTF8StringEncoding];
-            [request addMultiPartData:data withName:key type:@"application/json"]; // TODO: How should we handle different body types?
+            NSString *value = [body valueForKey:key];
+            
+            DCTAuthContentItem *item = [[DCTAuthContentItem alloc] initWithName:key value:value];
+            
+            if(item != nil) {
+                [items addObject: item];
+            }
         }
+        
+        DCTAuthContent *content = [[DCTAuthContent alloc] initWithEncoding:NSUTF8StringEncoding
+                                                                      type:DCTAuthContentTypeJSON
+                                                                     items:items];
+        [request setContent:content];
     }
 
-    request.account = existingAccount;
-    
     // If there are headers
     NSDictionary *headers = [opts objectForKey:@"headers"];
     if (headers != nil) {
@@ -463,6 +479,8 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
         request.HTTPHeaders = existingHeaders;
     }
 
+    request.account = existingAccount;
+    
     [request performRequestWithHandler:^(DCTAuthResponse *response, NSError *error) {
         if (error != nil) {
             NSDictionary *errorDict = @{
@@ -473,9 +491,12 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
         } else {
             NSInteger statusCode = response.statusCode;
             NSData *rawData = response.data;
+            NSDictionary *headers = response.HTTPHeaders;
 
             NSError *err;
             NSArray *data;
+
+            
 
             // Check if returned data is a valid JSON
             // != nil returned if the rawdata is not a valid JSON
@@ -487,20 +508,21 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
 
                 // Parse XML
                 data = [XMLReader dictionaryForXMLData:rawData
-                                            options:XMLReaderOptionsProcessNamespaces
-                                                    error:&err];
+                                               options:XMLReaderOptionsProcessNamespaces
+                                                 error:&err];
             }
-            
             if (err != nil) {
                 NSDictionary *errResp = @{
                                           @"status": @"error",
                                           @"msg": [NSString stringWithFormat:@"JSON parsing error: %@", [err localizedDescription]]
                                           };
                 callback(@[errResp]);
             } else {
+                
                 NSDictionary *resp = @{
                                        @"status": @(statusCode),
-                                       @"data": data
+                                       @"data": data != nil ? data : @[],
+                                       @"headers": headers,
                                        };
                 callback(@[[NSNull null], resp]);
             }
@@ -527,7 +549,7 @@ - (DCTAuthAccount *) accountForProvider:(NSString *) providerName
 }
 
 - (NSDictionary *) credentialForAccount:(NSString *)providerName
-                                                cfg:(NSDictionary *)cfg
+                                    cfg:(NSDictionary *)cfg
 {
     DCTAuthAccount *account = [self accountForProvider:providerName];
     if (!account) {
@@ -715,3 +737,4 @@ - (NSString *) stringHost:(NSURL *)url
 }
 
 @end
+

lib/authProviders.js

@@ -73,7 +73,18 @@ export const authProviders = {
       client_id: [notEmpty],
       client_secret: [notEmpty]
     })
-  }
+  },
+  'spotify': {
+    auth_version: "2.0",
+    authorize_url: 'https://accounts.spotify.com/authorize',
+    api_url: 'https://api.spotify.com/',
+    callback_url: ({app_name}) => `${app_name}://authorize`,
+
+    validate: validate({
+      client_id: [notEmpty],
+      client_secret: [notEmpty]
+    })
+  },
 }
 
-export default authProviders;
+export default authProviders;