Merge branch 'master' into master

Kadi Kraman · web-flow · commit 005327a79702 · 2020-01-06T12:03:24.000Z
diff --git a/android/src/main/java/com/rnappauth/RNAppAuthModule.java b/android/src/main/java/com/rnappauth/RNAppAuthModule.java
@@ -96,7 +96,7 @@ public void prefetchConfiguration(
                     isPrefetched = true;
                     fetchConfigurationLatch.countDown();
                 } catch (Exception e) {
-                    promise.reject("RNAppAuth Error", "Failed to convert serviceConfiguration", e);
+                    promise.reject("configuration_error", "Failed to convert serviceConfiguration", e);
                 }
             } else if (mServiceConfiguration.get() == null) {
                 final Uri issuerUri = Uri.parse(issuer);
@@ -107,7 +107,7 @@ public void onFetchConfigurationCompleted(
                                     @Nullable AuthorizationServiceConfiguration fetchedConfiguration,
                                     @Nullable AuthorizationException ex) {
                                 if (ex != null) {
-                                    promise.reject("RNAppAuth Error", "Failed to fetch configuration", ex);
+                                    promise.reject("service_configuration_fetch_error", "Failed to fetch configuration", ex);
                                     return;
                                 }
                                 mServiceConfiguration.set(fetchedConfiguration);
@@ -126,7 +126,7 @@ public void onFetchConfigurationCompleted(
             fetchConfigurationLatch.await();
             promise.resolve(isPrefetched);
         } catch (Exception e) {
-            promise.reject("RNAppAuth Error", "Failed to await fetch configuration", e);
+            promise.reject("service_configuration_fetch_error", "Failed to await fetch configuration", e);
         }
     }
 
@@ -175,7 +175,7 @@ public void authorize(
                         additionalParametersMap
                 );
             } catch (Exception e) {
-                promise.reject("Failed to authenticate", e.getMessage());
+                promise.reject("authentication_failed", e.getMessage());
             }
         } else {
             final Uri issuerUri = Uri.parse(issuer);
@@ -186,7 +186,7 @@ public void onFetchConfigurationCompleted(
                                 @Nullable AuthorizationServiceConfiguration fetchedConfiguration,
                                 @Nullable AuthorizationException ex) {
                             if (ex != null) {
-                                promise.reject("Failed to fetch configuration", getErrorMessage(ex));
+                                promise.reject("service_configuration_fetch_error", getErrorMessage(ex));
                                 return;
                             }
 
@@ -257,7 +257,7 @@ public void refresh(
                         promise
                 );
             } catch (Exception e) {
-                promise.reject("Failed to refresh token", e.getMessage());
+                promise.reject("token_refresh_failed", e.getMessage());
             }
         } else {
             final Uri issuerUri = Uri.parse(issuer);
@@ -268,7 +268,7 @@ public void onFetchConfigurationCompleted(
                                 @Nullable AuthorizationServiceConfiguration fetchedConfiguration,
                                 @Nullable AuthorizationException ex) {
                             if (ex != null) {
-                                promise.reject("Failed to fetch configuration", getErrorMessage(ex));
+                                promise.reject("service_configuration_fetch_error", getErrorMessage(ex));
                                 return;
                             }
 
@@ -301,7 +301,7 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
         if (requestCode == 0) {
             if (data == null) {
                 if (promise != null) {
-                    promise.reject("Failed to authenticate", "Data intent is null" );
+                    promise.reject("authentication_error", "Data intent is null" );
                 }
                 return;
             }
@@ -310,7 +310,7 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
             AuthorizationException exception = AuthorizationException.fromIntent(data);
             if (exception != null) {
                 if (promise != null) {
-                    promise.reject("Failed to authenticate", getErrorMessage(exception));
+                    promise.reject("authentication_error", getErrorMessage(exception));
                 }
                 return;
             }
@@ -336,7 +336,7 @@ public void onTokenRequestCompleted(
                         }
                     } else {
                         if (promise != null) {
-                            promise.reject("Failed exchange token", getErrorMessage(ex));
+                            promise.reject("token_exchange_failed", getErrorMessage(ex));
                         }
                     }
                 }
@@ -476,7 +476,7 @@ public void onTokenRequestCompleted(@Nullable TokenResponse response, @Nullable
                     WritableMap map = TokenResponseFactory.tokenResponseToMap(response);
                     promise.resolve(map);
                 } else {
-                    promise.reject("Failed to refresh token", getErrorMessage(ex));
+                    promise.reject("token_refresh_failed", getErrorMessage(ex));
                 }
             }
         };
diff --git a/ios/RNAppAuth.m b/ios/RNAppAuth.m
@@ -64,7 +64,7 @@ - (dispatch_queue_t)methodQueue
         [OIDAuthorizationService discoverServiceConfigurationForIssuer:[NSURL URLWithString:issuer]
                                                             completion:^(OIDServiceConfiguration *_Nullable configuration, NSError *_Nullable error) {
                                                                 if (!configuration) {
-                                                                    reject(@"RNAppAuth Error", [error localizedDescription], error);
+                                                                    reject(@"service_configuration_fetch_error", [error localizedDescription], error);
                                                                     return;
                                                                 }
                                                                 [self authorizeWithConfiguration: configuration
@@ -110,7 +110,7 @@ - (dispatch_queue_t)methodQueue
         [OIDAuthorizationService discoverServiceConfigurationForIssuer:[NSURL URLWithString:issuer]
                                                             completion:^(OIDServiceConfiguration *_Nullable configuration, NSError *_Nullable error) {
                                                                 if (!configuration) {
-                                                                    reject(@"RNAppAuth Error", [error localizedDescription], error);
+                                                                    reject(@"service_configuration_fetch_error", [error localizedDescription], error);
                                                                     return;
                                                                 }
                                                                 [self refreshWithConfiguration: configuration
@@ -215,7 +215,7 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration
                                                            resolve([self formatResponse:authState.lastTokenResponse
                                                                withAuthResponse:authState.lastAuthorizationResponse]);
                                                        } else {
-                                                           reject(@"RNAppAuth Error", [error localizedDescription], error);
+                                                           reject(@"authentication_failed", [error localizedDescription], error);
                                                        }
                                                    }]; // end [OIDAuthState authStateByPresentingAuthorizationRequest:request
 }
@@ -252,7 +252,7 @@ - (void)refreshWithConfiguration: (OIDServiceConfiguration *)configuration
                                             if (response) {
                                                 resolve([self formatResponse:response]);
                                             } else {
-                                                reject(@"RNAppAuth Error", [error localizedDescription], error);
+                                                reject(@"token_refresh_failed", [error localizedDescription], error);
                                             }
                                         }];
 }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public void prefetchConfiguration(`
`96`	`96`	`isPrefetched = true;`
`97`	`97`	`fetchConfigurationLatch.countDown();`
`98`	`98`	`} catch (Exception e) {`
`99`		`- promise.reject("RNAppAuth Error", "Failed to convert serviceConfiguration", e);`
	`99`	`+ promise.reject("configuration_error", "Failed to convert serviceConfiguration", e);`
`100`	`100`	`}`
`101`	`101`	`} else if (mServiceConfiguration.get() == null) {`
`102`	`102`	`final Uri issuerUri = Uri.parse(issuer);`
`@@ -107,7 +107,7 @@ public void onFetchConfigurationCompleted(`
`107`	`107`	`@Nullable AuthorizationServiceConfiguration fetchedConfiguration,`
`108`	`108`	`@Nullable AuthorizationException ex) {`
`109`	`109`	`if (ex != null) {`
`110`		`- promise.reject("RNAppAuth Error", "Failed to fetch configuration", ex);`
	`110`	`+ promise.reject("service_configuration_fetch_error", "Failed to fetch configuration", ex);`
`111`	`111`	`return;`
`112`	`112`	`}`
`113`	`113`	`mServiceConfiguration.set(fetchedConfiguration);`
`@@ -126,7 +126,7 @@ public void onFetchConfigurationCompleted(`
`126`	`126`	`fetchConfigurationLatch.await();`
`127`	`127`	`promise.resolve(isPrefetched);`
`128`	`128`	`} catch (Exception e) {`
`129`		`- promise.reject("RNAppAuth Error", "Failed to await fetch configuration", e);`
	`129`	`+ promise.reject("service_configuration_fetch_error", "Failed to await fetch configuration", e);`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`@@ -175,7 +175,7 @@ public void authorize(`
`175`	`175`	`additionalParametersMap`
`176`	`176`	`);`
`177`	`177`	`} catch (Exception e) {`
`178`		`- promise.reject("Failed to authenticate", e.getMessage());`
	`178`	`+ promise.reject("authentication_failed", e.getMessage());`
`179`	`179`	`}`
`180`	`180`	`} else {`
`181`	`181`	`final Uri issuerUri = Uri.parse(issuer);`
`@@ -186,7 +186,7 @@ public void onFetchConfigurationCompleted(`
`186`	`186`	`@Nullable AuthorizationServiceConfiguration fetchedConfiguration,`
`187`	`187`	`@Nullable AuthorizationException ex) {`
`188`	`188`	`if (ex != null) {`
`189`		`- promise.reject("Failed to fetch configuration", getErrorMessage(ex));`
	`189`	`+ promise.reject("service_configuration_fetch_error", getErrorMessage(ex));`
`190`	`190`	`return;`
`191`	`191`	`}`
`192`	`192`
`@@ -257,7 +257,7 @@ public void refresh(`
`257`	`257`	`promise`
`258`	`258`	`);`
`259`	`259`	`} catch (Exception e) {`
`260`		`- promise.reject("Failed to refresh token", e.getMessage());`
	`260`	`+ promise.reject("token_refresh_failed", e.getMessage());`
`261`	`261`	`}`
`262`	`262`	`} else {`
`263`	`263`	`final Uri issuerUri = Uri.parse(issuer);`
`@@ -268,7 +268,7 @@ public void onFetchConfigurationCompleted(`
`268`	`268`	`@Nullable AuthorizationServiceConfiguration fetchedConfiguration,`
`269`	`269`	`@Nullable AuthorizationException ex) {`
`270`	`270`	`if (ex != null) {`
`271`		`- promise.reject("Failed to fetch configuration", getErrorMessage(ex));`
	`271`	`+ promise.reject("service_configuration_fetch_error", getErrorMessage(ex));`
`272`	`272`	`return;`
`273`	`273`	`}`
`274`	`274`
`@@ -301,7 +301,7 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,`
`301`	`301`	`if (requestCode == 0) {`
`302`	`302`	`if (data == null) {`
`303`	`303`	`if (promise != null) {`
`304`		`- promise.reject("Failed to authenticate", "Data intent is null" );`
	`304`	`+ promise.reject("authentication_error", "Data intent is null" );`
`305`	`305`	`}`
`306`	`306`	`return;`
`307`	`307`	`}`
`@@ -310,7 +310,7 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,`
`310`	`310`	`AuthorizationException exception = AuthorizationException.fromIntent(data);`
`311`	`311`	`if (exception != null) {`
`312`	`312`	`if (promise != null) {`
`313`		`- promise.reject("Failed to authenticate", getErrorMessage(exception));`
	`313`	`+ promise.reject("authentication_error", getErrorMessage(exception));`
`314`	`314`	`}`
`315`	`315`	`return;`
`316`	`316`	`}`
`@@ -336,7 +336,7 @@ public void onTokenRequestCompleted(`
`336`	`336`	`}`
`337`	`337`	`} else {`
`338`	`338`	`if (promise != null) {`
`339`		`- promise.reject("Failed exchange token", getErrorMessage(ex));`
	`339`	`+ promise.reject("token_exchange_failed", getErrorMessage(ex));`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`	`}`
`@@ -476,7 +476,7 @@ public void onTokenRequestCompleted(@Nullable TokenResponse response, @Nullable`
`476`	`476`	`WritableMap map = TokenResponseFactory.tokenResponseToMap(response);`
`477`	`477`	`promise.resolve(map);`
`478`	`478`	`} else {`
`479`		`- promise.reject("Failed to refresh token", getErrorMessage(ex));`
	`479`	`+ promise.reject("token_refresh_failed", getErrorMessage(ex));`
`480`	`480`	`}`
`481`	`481`	`}`
`482`	`482`	`};`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ - (dispatch_queue_t)methodQueue`
`64`	`64`	`[OIDAuthorizationService discoverServiceConfigurationForIssuer:[NSURL URLWithString:issuer]`
`65`	`65`	`completion:^(OIDServiceConfiguration _Nullable configuration, NSError _Nullable error) {`
`66`	`66`	`if (!configuration) {`
`67`		`- reject(@"RNAppAuth Error", [error localizedDescription], error);`
	`67`	`+ reject(@"service_configuration_fetch_error", [error localizedDescription], error);`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`	`70`	`[self authorizeWithConfiguration: configuration`
`@@ -110,7 +110,7 @@ - (dispatch_queue_t)methodQueue`
`110`	`110`	`[OIDAuthorizationService discoverServiceConfigurationForIssuer:[NSURL URLWithString:issuer]`
`111`	`111`	`completion:^(OIDServiceConfiguration _Nullable configuration, NSError _Nullable error) {`
`112`	`112`	`if (!configuration) {`
`113`		`- reject(@"RNAppAuth Error", [error localizedDescription], error);`
	`113`	`+ reject(@"service_configuration_fetch_error", [error localizedDescription], error);`
`114`	`114`	`return;`
`115`	`115`	`}`
`116`	`116`	`[self refreshWithConfiguration: configuration`
`@@ -215,7 +215,7 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration`
`215`	`215`	`resolve([self formatResponse:authState.lastTokenResponse`
`216`	`216`	`withAuthResponse:authState.lastAuthorizationResponse]);`
`217`	`217`	`} else {`
`218`		`- reject(@"RNAppAuth Error", [error localizedDescription], error);`
	`218`	`+ reject(@"authentication_failed", [error localizedDescription], error);`
`219`	`219`	`}`
`220`	`220`	`}]; // end [OIDAuthState authStateByPresentingAuthorizationRequest:request`
`221`	`221`	`}`
`@@ -252,7 +252,7 @@ - (void)refreshWithConfiguration: (OIDServiceConfiguration *)configuration`
`252`	`252`	`if (response) {`
`253`	`253`	`resolve([self formatResponse:response]);`
`254`	`254`	`} else {`
`255`		`- reject(@"RNAppAuth Error", [error localizedDescription], error);`
	`255`	`+ reject(@"token_refresh_failed", [error localizedDescription], error);`
`256`	`256`	`}`
`257`	`257`	`}];`
`258`	`258`	`}`