[flutter_appauth] Check if intent is null in onActivityResult (MaikuB…

…#146) * Check if intent is null in onActivityResult This seems to crash apps when intent is null. * Update FlutterAppauthPlugin.java * Update FlutterAppauthPlugin.java * tweaks to PR and bump plugin version Co-authored-by: Michael Bui <[email protected]>
wdfw-fp · Oct 11, 2020 · defe695 · defe695
1 parent a08796a
commit defe695
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/flutter_appauth/CHANGELOG.md b/flutter_appauth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.2+6
+
+* [Android] community has reported that there seem to be instances where the plugin encounters a null intent on some devices upon processing a authorisation request. This resulted in a crash before but will now throw a `PlatformException`. Thanks to the PR from [Leon Havenga](https://github.com/li0nza)
+
 ## 0.9.2+5
 
 * Updated the Android setup section in the readme to include information for apps targeting Android 11 (API 30) or newer

diff --git a/...auth/android/src/main/java/io/crossingthestreams/flutterappauth/FlutterAppauthPlugin.java b/...auth/android/src/main/java/io/crossingthestreams/flutterappauth/FlutterAppauthPlugin.java
@@ -48,10 +48,12 @@ public class FlutterAppauthPlugin implements FlutterPlugin, MethodCallHandler, P
     private static final String AUTHORIZE_AND_EXCHANGE_CODE_ERROR_CODE = "authorize_and_exchange_code_failed";
     private static final String AUTHORIZE_ERROR_CODE = "authorize_failed";
     private static final String TOKEN_ERROR_CODE = "token_failed";
+    private static final String NULL_INTENT_ERROR_CODE = "null_intent";
 
     private static final String DISCOVERY_ERROR_MESSAGE_FORMAT = "Error retrieving discovery document: [error: %s, description: %s]";
     private static final String TOKEN_ERROR_MESSAGE_FORMAT = "Failed to get token: [error: %s, description: %s]";
     private static final String AUTHORIZE_ERROR_MESSAGE_FORMAT = "Failed to authorize: [error: %s, description: %s]";
+    private static final String NULL_INTENT_ERROR_FORMAT = "Failed to authorize: Null intent received";
 
     private final int RC_AUTH_EXCHANGE_CODE = 65030;
     private final int RC_AUTH = 65031;
@@ -385,9 +387,13 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent intent)
             return false;
         }
         if (requestCode == RC_AUTH_EXCHANGE_CODE || requestCode == RC_AUTH) {
-            final AuthorizationResponse authResponse = AuthorizationResponse.fromIntent(intent);
-            AuthorizationException ex = AuthorizationException.fromIntent(intent);
-            processAuthorizationData(authResponse, ex, requestCode == RC_AUTH_EXCHANGE_CODE);
+            if (intent == null) {
+                finishWithError(NULL_INTENT_ERROR_CODE, NULL_INTENT_ERROR_FORMAT);
+            } else {
+                final AuthorizationResponse authResponse = AuthorizationResponse.fromIntent(intent);
+                AuthorizationException ex = AuthorizationException.fromIntent(intent);
+                processAuthorizationData(authResponse, ex, requestCode == RC_AUTH_EXCHANGE_CODE);
+            }
             return true;
         }
         return false;

diff --git a/flutter_appauth/pubspec.yaml b/flutter_appauth/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_appauth
 description: This plugin provides an abstraction around the Android and iOS AppAuth SDKs so it can be used to communicate with OAuth 2.0 and OpenID Connect providers
-version: 0.9.2+5
+version: 0.9.2+6
 homepage: https://github.com/MaikuB/flutter_appauth/tree/master/flutter_appauth
 
 environment: