Merge pull request #475 from aeirola/fix-android-null-issuer-crash

Fix android crashing on null issuer

Author: Kadi Kraman

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

@@ -97,15 +97,15 @@ public void prefetchConfiguration(
         final CountDownLatch fetchConfigurationLatch = new CountDownLatch(1);
 
         if(!isPrefetched) {
-            if (serviceConfiguration != null && !mServiceConfigurations.containsKey(issuer)) {
+            if (serviceConfiguration != null && !this.hasServiceConfiguration(issuer)) {
                 try {
-                    mServiceConfigurations.put(issuer, createAuthorizationServiceConfiguration(serviceConfiguration));
+                    setServiceConfiguration(issuer, createAuthorizationServiceConfiguration(serviceConfiguration));
                     isPrefetched = true;
                     fetchConfigurationLatch.countDown();
                 } catch (Exception e) {
                     promise.reject("configuration_error", "Failed to convert serviceConfiguration", e);
                 }
-            } else if (!mServiceConfigurations.containsKey(issuer)) {
+            } else if (!hasServiceConfiguration(issuer)) {
                 final Uri issuerUri = Uri.parse(issuer);
                 AuthorizationServiceConfiguration.fetchFromUrl(
                         buildConfigurationUriFromIssuer(issuerUri),
@@ -117,7 +117,7 @@ public void onFetchConfigurationCompleted(
                                     promise.reject("service_configuration_fetch_error", "Failed to fetch configuration", ex);
                                     return;
                                 }
-                                mServiceConfigurations.put(issuer, fetchedConfiguration);
+                                setServiceConfiguration(issuer, fetchedConfiguration);
                                 isPrefetched = true;
                                 fetchConfigurationLatch.countDown();
                             }
@@ -157,9 +157,9 @@ public void register(
         final HashMap<String, String> additionalParametersMap = MapUtil.readableMapToHashMap(additionalParameters);
 
         // when serviceConfiguration is provided, we don't need to hit up the OpenID well-known id endpoint
-        if (serviceConfiguration != null || mServiceConfigurations.containsKey(issuer)) {
+        if (serviceConfiguration != null || hasServiceConfiguration(issuer)) {
             try {
-                final AuthorizationServiceConfiguration serviceConfig = mServiceConfigurations.containsKey(issuer)? mServiceConfigurations.get(issuer) : createAuthorizationServiceConfiguration(serviceConfiguration);
+                final AuthorizationServiceConfiguration serviceConfig = hasServiceConfiguration(issuer)? getServiceConfiguration(issuer) : createAuthorizationServiceConfiguration(serviceConfiguration);
                 registerWithConfiguration(
                         serviceConfig,
                         appAuthConfiguration,
@@ -187,7 +187,7 @@ public void onFetchConfigurationCompleted(
                                 return;
                             }
 
-                            mServiceConfigurations.put(issuer, fetchedConfiguration);
+                            setServiceConfiguration(issuer, fetchedConfiguration);
 
                             registerWithConfiguration(
                                     fetchedConfiguration,
@@ -234,9 +234,9 @@ public void authorize(
         this.clientAuthMethod = clientAuthMethod;
 
         // when serviceConfiguration is provided, we don't need to hit up the OpenID well-known id endpoint
-        if (serviceConfiguration != null || mServiceConfigurations.containsKey(issuer)) {
+        if (serviceConfiguration != null || hasServiceConfiguration(issuer)) {
             try {
-                final AuthorizationServiceConfiguration serviceConfig = mServiceConfigurations.containsKey(issuer)? mServiceConfigurations.get(issuer) : createAuthorizationServiceConfiguration(serviceConfiguration);
+                final AuthorizationServiceConfiguration serviceConfig = hasServiceConfiguration(issuer) ? getServiceConfiguration(issuer) : createAuthorizationServiceConfiguration(serviceConfiguration);
                 authorizeWithConfiguration(
                         serviceConfig,
                         appAuthConfiguration,
@@ -264,7 +264,7 @@ public void onFetchConfigurationCompleted(
                                 return;
                             }
 
-                            mServiceConfigurations.put(issuer, fetchedConfiguration);
+                            setServiceConfiguration(issuer, fetchedConfiguration);
 
                             authorizeWithConfiguration(
                                     fetchedConfiguration,
@@ -315,9 +315,9 @@ public void refresh(
         this.additionalParametersMap = additionalParametersMap;
 
         // when serviceConfiguration is provided, we don't need to hit up the OpenID well-known id endpoint
-        if (serviceConfiguration != null || mServiceConfigurations.containsKey(issuer)) {
+        if (serviceConfiguration != null || hasServiceConfiguration(issuer)) {
             try {
-                final AuthorizationServiceConfiguration serviceConfig = mServiceConfigurations.containsKey(issuer) ? mServiceConfigurations.get(issuer) : createAuthorizationServiceConfiguration(serviceConfiguration);
+                final AuthorizationServiceConfiguration serviceConfig = hasServiceConfiguration(issuer) ? getServiceConfiguration(issuer) : createAuthorizationServiceConfiguration(serviceConfiguration);
                 refreshWithConfiguration(
                         serviceConfig,
                         appAuthConfiguration,
@@ -348,7 +348,7 @@ public void onFetchConfigurationCompleted(
                                 return;
                             }
 
-                            mServiceConfigurations.put(issuer, fetchedConfiguration);
+                            setServiceConfiguration(issuer, fetchedConfiguration);
 
                             refreshWithConfiguration(
                                     fetchedConfiguration,
@@ -773,6 +773,24 @@ public void onServiceDisconnected(ComponentName name) {
         CustomTabsClient.bindCustomTabsService(context, CUSTOM_TAB_PACKAGE_NAME, connection);
     }
 
+    private boolean hasServiceConfiguration(@Nullable String issuer) {
+        return issuer != null && mServiceConfigurations.containsKey(issuer);
+    }
+
+    private AuthorizationServiceConfiguration getServiceConfiguration(@Nullable String issuer) {
+        if (issuer == null) {
+            return null;
+        } else {
+            return mServiceConfigurations.get(issuer);
+        }
+    }
+
+    private void setServiceConfiguration(@Nullable String issuer, AuthorizationServiceConfiguration serviceConfiguration) {
+        if (issuer != null) {
+            mServiceConfigurations.put(issuer, serviceConfiguration);
+        }
+    }
+
     @Override
     public void onNewIntent(Intent intent) {