chore: add SessionCheckoutService and minor cleanups

Adyen · Jan 2, 2024 · f4cb062 · f4cb062
1 parent 2898fe6
commit f4cb062
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 15 deletions.
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
-        <service android:name="com.adyenreactnativesdk.component.dropin.AdyenCheckoutService" android:exported="false" />
+        <service android:name="com.adyenreactnativesdk.component.dropin.AdvancedCheckoutService" android:exported="false" />
+        <service android:name="com.adyenreactnativesdk.component.dropin.SessionCheckoutService" android:exported="false" />
     </application>
 </manifest>
diff --git a/android/src/main/java/com/adyenreactnativesdk/component/SessionHelperModule.kt b/android/src/main/java/com/adyenreactnativesdk/component/SessionHelperModule.kt
@@ -1,5 +1,6 @@
 package com.adyenreactnativesdk.component
 
+import androidx.lifecycle.lifecycleScope
 import com.adyen.checkout.components.core.internal.Configuration
 import com.adyen.checkout.dropin.DropInConfiguration
 import com.adyen.checkout.redirect.RedirectComponent
@@ -9,9 +10,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 
 class SessionHelperModule(context: ReactApplicationContext?) : BaseModule(context) {
@@ -44,8 +43,7 @@ class SessionHelperModule(context: ReactApplicationContext?) : BaseModule(contex
         configurationJSON: ReadableMap,
         promise: Promise
     ) {
-        val myPluginScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
-        myPluginScope.launch {
+        appCompatActivity.lifecycleScope.launch(Dispatchers.IO) {
             super.createSessionAsync(sessionModelJSON, configurationJSON, promise)
         }
     }

diff --git a/android/src/main/java/com/adyenreactnativesdk/component/base/BaseModule.kt b/android/src/main/java/com/adyenreactnativesdk/component/base/BaseModule.kt
@@ -11,6 +11,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
 import com.adyen.checkout.action.core.internal.ActionHandlingComponent
 import com.adyen.checkout.components.core.PaymentComponentData
 import com.adyen.checkout.components.core.PaymentComponentState
@@ -46,9 +47,6 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import org.json.JSONException
 import org.json.JSONObject
@@ -193,7 +191,7 @@ abstract class BaseModule(context: ReactApplicationContext?) : ReactContextBaseJ
         val httpClient = HttpClientFactory.getHttpClient(environment)
         val sessionService = SessionService(httpClient)
 
-        CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+        appCompatActivity.lifecycleScope
             .launch {
                 session?.let {
                     val request = SessionDetailsRequest(

diff --git a/android/src/main/java/com/adyenreactnativesdk/component/base/ModuleException.kt b/android/src/main/java/com/adyenreactnativesdk/component/base/ModuleException.kt
@@ -70,4 +70,14 @@ sealed class ModuleException(code: String, message: String, cause: Throwable? =
         code = "session",
         message = "Something went wrong while starting session"
     )
+
+    class NoActivity : ModuleException(
+        code = "noActivity",
+        message = "Launcher not registered. Please call AdyenCheckout.setLauncherActivity() on MainActivity.onCreate()"
+    )
+
+    class WrongFlow : ModuleException(
+        code = "noActivity",
+        message = "ViewModel callback is inconsistent"
+    )
 }
diff --git a/.../component/dropin/AdyenCheckoutService.kt → ...mponent/dropin/AdvancedCheckoutService.kt b/.../component/dropin/AdyenCheckoutService.kt → ...mponent/dropin/AdvancedCheckoutService.kt
@@ -17,7 +17,7 @@ import com.adyenreactnativesdk.component.CheckoutProxy.ModuleEventListener
 import com.facebook.react.bridge.ReadableMap
 import org.json.JSONObject
 
-open class AdyenCheckoutService : DropInService(), ModuleEventListener {
+open class AdvancedCheckoutService : DropInService(), ModuleEventListener {
 
     override fun onCreate() {
         super.onCreate()

diff --git a/android/src/main/java/com/adyenreactnativesdk/component/dropin/DropInModule.kt b/android/src/main/java/com/adyenreactnativesdk/component/dropin/DropInModule.kt
@@ -69,18 +69,20 @@ class DropInModule(context: ReactApplicationContext?) : BaseModule(context),
                     it,
                     session,
                     dropInConfiguration,
+                    SessionCheckoutService::class.java
                 )
-            }
+            } ?: throw ModuleException.NoActivity()
         } else {
+
             AdyenCheckout.dropInLauncher?.let {
                 startPayment(
                     reactApplicationContext,
                     it,
                     paymentMethodsResponse,
                     dropInConfiguration,
-                    AdyenCheckoutService::class.java
+                    AdvancedCheckoutService::class.java
                 )
-            }
+            } ?: throw ModuleException.NoActivity()
         }
     }
 

diff --git a/android/src/main/java/com/adyenreactnativesdk/component/dropin/SessionCheckoutService.kt b/android/src/main/java/com/adyenreactnativesdk/component/dropin/SessionCheckoutService.kt
@@ -0,0 +1,6 @@
+package com.adyenreactnativesdk.component.dropin
+
+import com.adyen.checkout.dropin.SessionDropInService
+
+class SessionCheckoutService() : SessionDropInService() {
+}
diff --git a/android/src/main/java/com/adyenreactnativesdk/component/googlepay/GooglePayFragment.kt b/android/src/main/java/com/adyenreactnativesdk/component/googlepay/GooglePayFragment.kt
@@ -45,7 +45,7 @@ class GooglePayFragment(
                 configuration,
                 it
             )
-        }) ?: throw ModuleException.Unknown("ViewModel callback is inconsistent")
+        }) ?: throw ModuleException.WrongFlow()
 
         this.component = component
         AdyenCheckout.setIntentHandler(component)

diff --git a/android/src/main/java/com/adyenreactnativesdk/component/instant/InstantFragment.kt b/android/src/main/java/com/adyenreactnativesdk/component/instant/InstantFragment.kt
@@ -47,7 +47,7 @@ class InstantFragment(
                 configuration,
                 it
             )
-        }) ?: throw ModuleException.Unknown("ViewModel callback is inconsistent")
+        }) ?: throw ModuleException.WrongFlow()
 
         this.component = component
         AdyenCheckout.setIntentHandler(component)