Skip to content

check promise before calling it in the android onActivityResult function #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 6, 2020
Merged

check promise before calling it in the android onActivityResult function #427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fb0058
check promise before calling it in the android onActivityResult function
Shervanator Dec 19, 2019
005327a
Merge branch 'master' into master
Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions android/src/main/java/com/rnappauth/RNAppAuthModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,18 @@ public void onFetchConfigurationCompleted(
public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
if (requestCode == 0) {
if (data == null) {
promise.reject("authentication_error", "Data intent is null" );
if (promise != null) {
promise.reject("authentication_error", "Data intent is null" );
}
return;
}

final AuthorizationResponse response = AuthorizationResponse.fromIntent(data);
AuthorizationException exception = AuthorizationException.fromIntent(data);
if (exception != null) {
promise.reject("authentication_error", getErrorMessage(exception));
if (promise != null) {
promise.reject("authentication_error", getErrorMessage(exception));
}
return;
}

Expand All @@ -327,9 +331,13 @@ public void onTokenRequestCompleted(
TokenResponse resp, AuthorizationException ex) {
if (resp != null) {
WritableMap map = TokenResponseFactory.tokenResponseToMap(resp, response);
authorizePromise.resolve(map);
if (authorizePromise != null) {
authorizePromise.resolve(map);
}
} else {
promise.reject("token_exchange_failed", getErrorMessage(ex));
if (promise != null) {
promise.reject("token_exchange_failed", getErrorMessage(ex));
}
}
}
};
Expand Down