fix (amplify_auth_cognito): fixes swallowed usercancelled exception with hosted ui android, and updates auth exampl… (#1015)

* fixes swallowed error with hosted ui android, and updates auth example app

* Update packages/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/AuthCognito.kt

Co-authored-by: Dillon Nys <[email protected]>

Co-authored-by: Noyes <[email protected]>
Co-authored-by: Dillon Nys <[email protected]>

Author: 3 people

packages/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/AuthCognito.kt

@@ -16,6 +16,7 @@
 package com.amazonaws.amplify.amplify_auth_cognito
 
 import android.app.Activity
+import android.app.Activity.RESULT_CANCELED
 import android.content.Context
 import android.content.Intent
 import android.os.Handler
@@ -131,9 +132,14 @@ public class AuthCognito : FlutterPlugin, ActivityAware, MethodCallHandler, Plug
 
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
     var isHostedUIActivity = isRedirectActivityDeclared(context)
-    if (!isHostedUIActivity && requestCode == AWSCognitoAuthPlugin.WEB_UI_SIGN_IN_ACTIVITY_CODE) {
-      Amplify.Auth.handleWebUISignInResponse(data)
-      return true
+    if (requestCode == AWSCognitoAuthPlugin.WEB_UI_SIGN_IN_ACTIVITY_CODE) {
+        /// The HostedUI activity in amplify-android handles success case
+        /// We need a response handler if the HostedUI activity isn't used...
+         /// ... or if the HostedUI activity is used, but the user cancels
+        if (!isHostedUIActivity || resultCode == RESULT_CANCELED) {
+            Amplify.Auth.handleWebUISignInResponse(data)
+            return true
+        }
     }
     return false
   }

packages/amplify_auth_cognito/example/android/app/src/main/AndroidManifest.xml

@@ -5,6 +5,17 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
+    
+    <queries>
+      <intent>
+        <action android:name="android.intent.action.VIEW" />
+        <data android:scheme="https" />
+      </intent>
+      <intent>
+        <action android:name=
+            "android.support.customtabs.action.CustomTabsService" />
+      </intent>
+    </queries>
     <application
         android:name="io.flutter.app.FlutterApplication"
         android:label="amplify_auth_cognito_example"
@@ -38,13 +49,15 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.amazonaws.mobileconnectors.cognitoauth.activities.CustomTabsRedirectActivity">
-          <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="myapp" />
-          </intent-filter>
+        <activity
+            android:name="com.amplifyframework.auth.cognito.activities.HostedUIRedirectActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="myapp" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->