fix(auth): device metadata migration (#4503)

* merge main

* chore: added a bracket and removed new keywords

* chore: changed signature of deleteLegacyDeviceSecrets and regenerated pigeons. Changed legacysecrethandler.kt file to .txt to "comment" it out

* chore: run dart format on generated file

* chore: migrateLegacyDeviceSecrets now gets called before deleteLegacyCredentials. Cognito_device_secrets return type fixed

* chore: add delete and fetch methods to the cognito swift file

* fix: various issues with implementation

* chore: fix lint issues

* test: update test to include mfa and token refresh

* chore: use coroutines, add plugin

* chore: remove generate code in iOS

* chore: fetch asf deviceId from shared prefs directly

* chore: update error name

* chore: remove native auth plugin

* chore: remove old legacy handler

* chore: remove check for null device metadata

* chore: flatten nested if statements

* chore: remove unused type

---------

Co-authored-by: Kha Truong <64438356+khatruong2009@users.noreply.github.com>

Author: Jordan-Nelson

packages/amplify_native_legacy_wrapper/android/build.gradle

@@ -47,6 +47,7 @@ android {
     namespace 'com.amazonaws.amplify.amplify_native_legacy_wrapper'
 }
 dependencies {
-    implementation 'com.amazonaws:aws-android-sdk-mobile-client:2.73.0'
-    implementation 'com.amazonaws:aws-android-sdk-cognitoauth:2.73.0'
+    implementation 'com.amplifyframework:core:1.38.6'
+    implementation 'com.amplifyframework:core-kotlin:0.22.8'
+    implementation 'com.amplifyframework:aws-auth-cognito:1.38.6'
 }

packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/AmplifyNativeLegacyWrapperPlugin.kt

@@ -4,66 +4,75 @@
 package com.amazonaws.amplify.amplify_native_legacy_wrapper
 
 import android.content.Context
-import com.amazonaws.mobile.client.AWSMobileClient
-import com.amazonaws.mobile.client.Callback
-import com.amazonaws.mobile.config.AWSConfiguration
+import com.amazonaws.amplify.amplify_native_legacy_wrapper.pigeons.LegacyNativePlugin
+import com.amplifyframework.AmplifyException
+import com.amplifyframework.auth.AuthException
+import com.amplifyframework.auth.cognito.AWSCognitoAuthPlugin
+import com.amplifyframework.kotlin.core.Amplify
+import com.amplifyframework.core.AmplifyConfiguration
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import kotlinx.coroutines.runBlocking
 import org.json.JSONObject
 
 
 /** AmplifyNativeLegacyWrapperPlugin */
-class AmplifyNativeLegacyWrapperPlugin: FlutterPlugin, LegacyNativePluginPigeon.LegacyNativePlugin {
+class AmplifyNativeLegacyWrapperPlugin: FlutterPlugin, LegacyNativePlugin {
 
   private lateinit var context: Context
-  private val awsMobileClient = AWSMobileClient.getInstance()
 
   override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
     context = flutterPluginBinding.applicationContext
-    LegacyNativePluginPigeon.LegacyNativePlugin.setup(flutterPluginBinding.binaryMessenger, this)
+    LegacyNativePlugin.setUp(flutterPluginBinding.binaryMessenger, this)
   }
 
   override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    LegacyNativePluginPigeon.LegacyNativePlugin.setup(binding.binaryMessenger, null)
+    LegacyNativePlugin.setUp(binding.binaryMessenger, null)
   }
 
-  override fun configure(config: String, result: LegacyNativePluginPigeon.Result<Void>) {
-    val mobileClientConfig =  JSONObject(config).getJSONObject("auth").getJSONObject("plugins").getJSONObject("awsCognitoAuthPlugin")
-    awsMobileClient.initialize(
-      context,
-      AWSConfiguration(mobileClientConfig),
-      ResultCallback(result)
-    )
-  }
-
-  override fun signOut(result: LegacyNativePluginPigeon.Result<Void>) {
-    awsMobileClient.signOut(null, ResultCallback(result))
+  override fun configure(config: String, callback: (Result<Unit>) -> Unit) {
+    try {
+      val configuration = AmplifyConfiguration.builder(JSONObject(config))
+        .devMenuEnabled(false)
+        .build()
+      Amplify.addPlugin(AWSCognitoAuthPlugin())
+      Amplify.configure(configuration, context)
+      callback(Result.success(Unit))
+    } catch (e: AmplifyException) {
+      callback(Result.failure(e))
+    }
   }
 
-  override fun signIn(
-    username: String,
-    password: String,
-    result: LegacyNativePluginPigeon.Result<Void>
-  ) {
+  override fun signIn(username: String, password: String, callback: (Result<Unit>) -> Unit) {
     runBlocking {
-      awsMobileClient.signIn(
-        username,
-        password,
-        HashMap(),
-        ResultCallback(result)
-      )
+      try {
+        Amplify.Auth.signIn(username, password)
+        callback(Result.success(Unit))
+      } catch (error: AuthException) {
+        callback(Result.failure(error))
+      }
     }
   }
 
-}
-
-class ResultCallback<T>(private val result: LegacyNativePluginPigeon.Result<Void>) : Callback<T> {
-  override fun onResult(res: T) {
-    this.result.success(null)
+  override fun signOut(callback: (Result<Unit>) -> Unit) {
+    runBlocking {
+      try {
+        Amplify.Auth.signOut()
+        callback(Result.success(Unit))
+      } catch (error: AuthException) {
+        callback(Result.failure(error))
+      }
+    }
   }
 
-  override fun onError(e: Exception) {
-    this.result.error(e)
+  override fun rememberDevice(callback: (Result<Unit>) -> Unit) {
+    runBlocking {
+      try {
+        Amplify.Auth.rememberDevice()
+        callback(Result.success(Unit))
+      } catch (error: AuthException) {
+        callback(Result.failure(error))
+      }
+    }
   }
 
 }