Merge fullstackreact/react-native-oauth master branch into shalin-jasani/fullstackreact/react-native-oauth master branch

.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/

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

@@ -109,7 +109,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
  mWebView.setVisibility(View.VISIBLE);
  mWebView.getSettings().setJavaScriptEnabled(true);
  mWebView.getSettings().setDomStorageEnabled(true);
- mWebView.getSettings().setUserAgentString("Mozilla/5.0 Google");
 
 
  LayoutParams layoutParams = this.getFullscreenLayoutParams(context);
@@ -172,7 +171,7 @@ private LayoutParams getFullscreenLayoutParams(Context context) {
  realHeight = display.getHeight();
  }
 
- return new LayoutParams(realWidth, realHeight-convertDpToPixel(50f,context));
+ return new LayoutParams(realWidth, realHeight);
  }
 
 

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

@@ -7,6 +7,7 @@
 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;
@@ -400,18 +401,36 @@ 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());
-
+
+ /* 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);
- String uuid = (String) accessTokenMap.get("user_id");
+
+ String uuid = accessToken.getParameter("user_id");
  response.putString("uuid", uuid);
- String oauthTokenSecret = (String) accessTokenMap.get("oauth_token_secret");
+ String oauthTokenSecret = (String) accessToken.getParameter("oauth_token_secret");
 
- String tokenType = (String) accessTokenMap.get("token_type");
+ String tokenType = (String) accessToken.getParameter("token_type");
  if (tokenType == null) {
  tokenType = "Bearer";
  }
@@ -422,7 +441,6 @@ private WritableMap accessTokenResponse(
  credentials.putString("access_token", accessToken.getToken());
  credentials.putString("access_token_secret", oauthTokenSecret);
  credentials.putString("type", tokenType);
- // credentials.putString("scope", accessToken.getScope());
  credentials.putString("consumerKey", consumerKey);
 
  response.putMap("credentials", credentials);
@@ -440,26 +458,21 @@ 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 {
- 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();
- }
+
+ String uuid = accessToken.getParameter("user_id");
+ response.putString("uuid", uuid);
 
  WritableMap credentials = Arguments.createMap();
  Log.d(TAG, "Credential raw response: " + accessToken.getRawResponse());
 
  credentials.putString("accessToken", accessToken.getAccessToken());
  String authHeader;
 
- String tokenType = (String) accessTokenMap.get("token_type");
+ String tokenType = accessToken.getTokenType();
  if (tokenType == null) {
  tokenType = "Bearer";
  }
@@ -470,7 +483,7 @@ private WritableMap accessTokenResponse(
  }
 
  String clientID = (String) cfg.get("client_id");
- String idToken = (String) accessTokenMap.get("id_token");
+ String idToken = accessToken.getParameter("id_token");
 
  authHeader = tokenType + " " + accessToken.getAccessToken();
  credentials.putString("authorizationHeader", authHeader);

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();
  }

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

@@ -268,19 +268,11 @@ private static ServiceBuilder _oauth2ServiceBuilder(
  builder.scope(scopeStr);
  }
 
- boolean rawScopes = (cfg.containsKey("rawScopes") && ((String)cfg.get("rawScopes")).equalsIgnoreCase("true"));
-
  if (opts != null && opts.hasKey("scopes")) {
  scopes = (String) opts.getString("scopes");
- String scopeStr = null;
-
- if (!rawScopes)
- scopeStr = OAuthManagerProviders.getScopeString(scopes, ",");
- else
- scopeStr = scopes;
-
+ String scopeStr = OAuthManagerProviders.getScopeString(scopes, ",");
  builder.scope(scopeStr);
- } 
+ }
 
  if (callbackUrl != null) {
  builder.callback(callbackUrl);

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

@@ -91,7 +91,9 @@ + (BOOL)setupOAuthHandler:(UIApplication *)application
  dispatch_async(dispatch_get_main_queue(), ^{
  safariViewController = [[SFSafariViewController alloc] initWithURL:URL];
  UIViewController *viewController = application.keyWindow.rootViewController;
- [viewController presentViewController:safariViewController animated:YES completion: nil];
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [viewController presentViewController:safariViewController animated:YES completion: nil];
+ });
  });
  } else {
  [application openURL:URL];
@@ -305,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]) {
@@ -488,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
@@ -512,9 +518,11 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
  };
  callback(@[errResp]);
  } else {
+
  NSDictionary *resp = @{
  @"status": @(statusCode),
- @"data": data != nil ? data : @[]
+ @"data": data != nil ? data : @[],
+ @"headers": headers,
  };
  callback(@[[NSNull null], resp]);
  }