break(amplify_auth_cognito): fixes getCurrentUser disparity (#773)

haverchuck · web-flow · commit f5820c6ed21d · 2021-09-08T13:58:00.000-07:00
diff --git a/packages/amplify_analytics_pinpoint/android/build.gradle b/packages/amplify_analytics_pinpoint/android/build.gradle
@@ -60,8 +60,8 @@ dependencies {
     api amplifyCore
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.amplifyframework:aws-analytics-pinpoint:1.22.0'
-    implementation 'com.amplifyframework:aws-auth-cognito:1.22.0'
+    implementation 'com.amplifyframework:aws-analytics-pinpoint:1.25.1'
+    implementation 'com.amplifyframework:aws-auth-cognito:1.25.1'
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.mockito:mockito-core:3.1.0'
     testImplementation 'org.mockito:mockito-inline:3.1.0'
diff --git a/packages/amplify_api/android/build.gradle b/packages/amplify_api/android/build.gradle
@@ -55,8 +55,8 @@ dependencies {
     api amplifyCore
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.amplifyframework:aws-api:1.22.0"
-    implementation "com.amplifyframework:aws-api-appsync:1.22.0"
+    implementation "com.amplifyframework:aws-api:1.25.1"
+    implementation "com.amplifyframework:aws-api-appsync:1.25.1"
 
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.mockito:mockito-core:3.10.0'
diff --git a/packages/amplify_auth_cognito/android/build.gradle b/packages/amplify_auth_cognito/android/build.gradle
@@ -62,7 +62,7 @@ android {
 dependencies {
     api amplifyCore
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.amplifyframework:aws-auth-cognito:1.22.0'
+    implementation 'com.amplifyframework:aws-auth-cognito:1.25.1'
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.mockito:mockito-core:3.10.0'
     testImplementation 'org.mockito:mockito-inline:3.1.0'
diff --git a/packages/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/AuthCognito.kt b/packages/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/AuthCognito.kt
@@ -51,6 +51,7 @@ import com.amazonaws.amplify.amplify_auth_cognito.types.FlutterResendUserAttribu
 import com.amazonaws.amplify.amplify_auth_cognito.types.FlutterResendUserAttributeConfirmationCodeResult
 import com.amazonaws.amplify.amplify_core.exception.ExceptionUtil.Companion.handleAddPluginException
 import com.amazonaws.amplify.amplify_auth_cognito.utils.isRedirectActivityDeclared
+import com.amazonaws.mobile.client.AWSMobileClient
 import com.amplifyframework.auth.AuthException
 import com.amplifyframework.auth.AuthProvider
 import com.amplifyframework.auth.AuthSession
@@ -383,13 +384,37 @@ public class AuthCognito : FlutterPlugin, ActivityAware, MethodCallHandler, Plug
 
   private fun onGetCurrentUser(@NonNull flutterResult: Result) {
     try {
-      var user: AuthUser? = Amplify.Auth.currentUser;
-      if (user is AuthUser) {
-        prepareUserResult(flutterResult, user);
-      } else {
-        // TODO: Mechanism to check guest access status
-        throw AuthException.SignedOutException(AuthException.GuestAccess.GUEST_ACCESS_DISABLED)
-      }
+      /* 
+        Because Android does not preserve the user after session expiration but iOS does so,
+        we need to use the mobileclient to get the old username to enforce platform parity.
+      */
+      Amplify.Auth.fetchAuthSession(
+        { result ->
+          val cognitoAuthSession = result as AWSCognitoAuthSession
+          when (cognitoAuthSession.userSub.type) {
+            // If the user sub accessor successful the user is present and the session should be valid
+            AuthSessionResult.Type.SUCCESS -> {
+              val awsMobileClient = AWSMobileClient.getInstance()
+              val username = awsMobileClient.username
+              prepareUserResult(flutterResult, AuthUser(cognitoAuthSession.userSub.toString(), username));
+            }
+            // If the user sub accessor failed, check the signIn state
+            AuthSessionResult.Type.FAILURE -> {
+              // if signedIn flag still true, we know session is expired so get the old user
+              if (result.isSignedIn) {
+                val awsMobileClient = AWSMobileClient.getInstance()
+                val username = awsMobileClient.username
+                val userid = awsMobileClient.userSub
+                prepareUserResult(flutterResult, AuthUser(userid, username));
+              // if signIn flag is false, we assume user is signed out so throw exception
+              } else {
+                errorHandler.handleAuthError(flutterResult, AuthException.SignedOutException())
+              }
+            }
+          }
+        },
+        { error -> errorHandler.handleAuthError(flutterResult, error) }
+      )
     } catch (e: AuthException) {
       errorHandler.handleAuthError(flutterResult, e)
     } catch (e: Exception) {
diff --git a/packages/amplify_auth_cognito/android/src/test/kotlin/com/amazonaws/amplify/amplify_auth_cognito/AmplifyAuthCognitoPluginTest.kt b/packages/amplify_auth_cognito/android/src/test/kotlin/com/amazonaws/amplify/amplify_auth_cognito/AmplifyAuthCognitoPluginTest.kt
@@ -70,8 +70,20 @@ class AmplifyAuthCognitoPluginTest {
     private val mockSignInResult = AuthSignInResult(false, signInStep)
     private val mockResetPasswordResult = AuthResetPasswordResult(false, resetStep)
     private val mockUpdateUserAttributeResult = AuthUpdateAttributeResult(true, updateAttributeStep)
+    private val id = AuthSessionResult.success("id")
+    private val awsCredentials: AuthSessionResult<AWSCredentials> = AuthSessionResult.success(BasicAWSCredentials("access", "secret"))
+    private val userSub = AuthSessionResult.success("sub")
+    private val tokens = AuthSessionResult.success(AWSCognitoUserPoolTokens("access", "id", "refresh"))
+    private val mockSession = AWSCognitoAuthSession(
+        true,
+        id,
+        awsCredentials,
+        userSub,
+        tokens
+    )
     private var mockAuth = mock(AuthCategory::class.java)
 
+
     @Before
     fun setup() {
         plugin = AuthCognito(AuthCognitoHubEventStreamHandler(), mock(Activity::class.java))
@@ -514,13 +526,18 @@ class AmplifyAuthCognitoPluginTest {
     fun getCurrentUser_returnsSuccess() {
         // Arrange
         doAnswer { invocation: InvocationOnMock ->
-            plugin.prepareUpdatePasswordResult(mockResult)
+            plugin.prepareUserResult(mockResult, AuthUser("username", "userSub"))
+            null as Void?
+        }.`when`(mockAuth).currentUser
+
+        doAnswer { invocation: InvocationOnMock ->
+            plugin.prepareCognitoSessionResult(mockResult, mockSession)
             null as Void?
-        }.`when`(mockAuth).getCurrentUser()
+        }.`when`(mockAuth).fetchAuthSession(any(), any())
 
         val data: HashMap<*, *> = hashMapOf(
-                "username" to "username",
-                "userSub" to "userSub"
+            "username" to "username",
+            "userSub" to "userSub"
         )
         val arguments: HashMap<String, Any> = hashMapOf("data" to data)
         val call = MethodCall("getCurrentUser", arguments)
@@ -561,18 +578,6 @@ class AmplifyAuthCognitoPluginTest {
 
     @Test
     fun fetchSession_returnsSuccess() {
-        val id = AuthSessionResult.success("id")
-        val awsCredentials: AuthSessionResult<AWSCredentials> = AuthSessionResult.success(BasicAWSCredentials("access", "secret"))
-        val userSub = AuthSessionResult.success("sub")
-        val tokens = AuthSessionResult.success(AWSCognitoUserPoolTokens("access", "id", "refresh"))
-        val mockSession = AWSCognitoAuthSession(
-        true,
-            id,
-            awsCredentials,
-            userSub,
-            tokens
-        )
-
         // Arrange
         doAnswer { invocation: InvocationOnMock ->
             plugin.prepareCognitoSessionResult(mockResult, mockSession)
diff --git a/packages/amplify_core/android/build.gradle b/packages/amplify_core/android/build.gradle
@@ -61,7 +61,7 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.amplifyframework:core:1.22.0'
+    implementation 'com.amplifyframework:core:1.25.1'
     implementation 'com.google.code.gson:gson:2.8.6'
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.mockito:mockito-core:3.1.0'
diff --git a/packages/amplify_datastore/android/build.gradle b/packages/amplify_datastore/android/build.gradle
@@ -57,8 +57,8 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.amplifyframework:aws-datastore:1.22.0"
-    implementation "com.amplifyframework:aws-api-appsync:1.22.0"
+    implementation "com.amplifyframework:aws-datastore:1.25.1"
+    implementation "com.amplifyframework:aws-api-appsync:1.25.1"
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.mockito:mockito-core:3.10.0'
     testImplementation 'org.mockito:mockito-inline:3.10.0'
diff --git a/packages/amplify_flutter/android/build.gradle b/packages/amplify_flutter/android/build.gradle
@@ -58,13 +58,13 @@ android {
 
 dependencies {
     api amplifyCore
-    implementation 'com.amplifyframework:core:1.22.0'
+    implementation 'com.amplifyframework:core:1.25.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.mockito:mockito-core:3.1.0'
     testImplementation 'org.mockito:mockito-inline:3.1.0'
     testImplementation 'androidx.test:core:1.3.0'
     testImplementation 'org.robolectric:robolectric:4.3.1'
     testImplementation 'com.google.code.gson:gson:2.8.6'
-    testImplementation 'com.amplifyframework:aws-auth-cognito:1.22.0'
+    testImplementation 'com.amplifyframework:aws-auth-cognito:1.25.1'
 }
diff --git a/packages/amplify_storage_s3/android/build.gradle b/packages/amplify_storage_s3/android/build.gradle
@@ -49,5 +49,5 @@ android {
 dependencies {
     api amplifyCore
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.amplifyframework:aws-storage-s3:1.22.0'
+    implementation 'com.amplifyframework:aws-storage-s3:1.25.1'
 }

Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,5 @@ android {`
`49`	`49`	`dependencies {`
`50`	`50`	`api amplifyCore`
`51`	`51`	`implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`
`52`		`- implementation 'com.amplifyframework:aws-storage-s3:1.22.0'`
	`52`	`+ implementation 'com.amplifyframework:aws-storage-s3:1.25.1'`
`53`	`53`	`}`