Merge pull request #133 from FormidableLabs/bugfix/empty-scope-android

Allow empty scopes on Android

Author: kadikraman

android/src/main/java/com/reactlibrary/RNAppAuthModule.java

@@ -67,8 +67,6 @@ public void authorize(
             final Boolean dangerouslyAllowInsecureHttpRequests,
             final Promise promise
     ) {
-
-        final String scopesString = this.arrayToString(scopes);
         final ConnectionBuilder builder = createConnectionBuilder(dangerouslyAllowInsecureHttpRequests);
         final AppAuthConfiguration appAuthConfiguration = this.createAppAuthConfiguration(builder);
         final HashMap<String, String> additionalParametersMap = MapUtils.readableMapToHashMap(additionalParameters);
@@ -90,7 +88,7 @@ public void authorize(
                         createAuthorizationServiceConfiguration(serviceConfiguration),
                         appAuthConfiguration,
                         clientId,
-                        scopesString,
+                        scopes,
                         redirectUrl,
                         additionalParametersMap
                 );
@@ -114,7 +112,7 @@ public void onFetchConfigurationCompleted(
                                     fetchedConfiguration,
                                     appAuthConfiguration,
                                     clientId,
-                                    scopesString,
+                                    scopes,
                                     redirectUrl,
                                     additionalParametersMap
                             );
@@ -142,7 +140,6 @@ public void refresh(
             final Boolean dangerouslyAllowInsecureHttpRequests,
             final Promise promise
     ) {
-        final String scopesString = this.arrayToString(scopes);
         final ConnectionBuilder builder = createConnectionBuilder(dangerouslyAllowInsecureHttpRequests);
         final AppAuthConfiguration appAuthConfiguration = createAppAuthConfiguration(builder);
         final HashMap<String, String> additionalParametersMap = MapUtils.readableMapToHashMap(additionalParameters);
@@ -163,7 +160,7 @@ public void refresh(
                         appAuthConfiguration,
                         refreshToken,
                         clientId,
-                        scopesString,
+                        scopes,
                         redirectUrl,
                         additionalParametersMap,
                         clientSecret,
@@ -191,7 +188,7 @@ public void onFetchConfigurationCompleted(
                                     appAuthConfiguration,
                                     refreshToken,
                                     clientId,
-                                    scopesString,
+                                    scopes,
                                     redirectUrl,
                                     additionalParametersMap,
                                     clientSecret,
@@ -258,11 +255,17 @@ private void authorizeWithConfiguration(
             final AuthorizationServiceConfiguration serviceConfiguration,
             final AppAuthConfiguration appAuthConfiguration,
             final String clientId,
-            final String scopesString,
+            final ReadableArray scopes,
             final String redirectUrl,
             final Map<String, String> additionalParametersMap
     ) {
 
+        String scopesString = null;
+
+        if (scopes != null) {
+            scopesString = this.arrayToString(scopes);
+        }
+
         final Context context = this.reactContext;
         final Activity currentActivity = getCurrentActivity();
 
@@ -272,8 +275,12 @@ private void authorizeWithConfiguration(
                         clientId,
                         ResponseTypeValues.CODE,
                         Uri.parse(redirectUrl)
-                )
-                        .setScope(scopesString);
+                );
+
+        if (scopesString != null) {
+            authRequestBuilder.setScope(scopesString);
+        }
+
 
         if (additionalParametersMap != null) {
             // handle additional parameters separately to avoid exceptions from AppAuth
@@ -316,24 +323,33 @@ private void refreshWithConfiguration(
             final AppAuthConfiguration appAuthConfiguration,
             final String refreshToken,
             final String clientId,
-            final String scopesString,
+            final ReadableArray scopes,
             final String redirectUrl,
             final Map<String, String> additionalParametersMap,
             final String clientSecret,
             final Promise promise
     ) {
 
+        String scopesString = null;
+
+        if (scopes != null) {
+            scopesString = this.arrayToString(scopes);
+        }
+
         final Context context = this.reactContext;
 
         TokenRequest.Builder tokenRequestBuilder =
                 new TokenRequest.Builder(
                         serviceConfiguration,
                         clientId
                 )
-                        .setScope(scopesString)
                         .setRefreshToken(refreshToken)
                         .setRedirectUri(Uri.parse(redirectUrl));
 
+        if (scopesString != null) {
+            tokenRequestBuilder.setScope(scopesString);
+        }
+
         if (!additionalParametersMap.isEmpty()) {
             tokenRequestBuilder.setAdditionalParameters(additionalParametersMap);
         }