fix: increase strictness of respondWith

modules/@shopify/checkout-sheet-kit/android/src/main/java/com/shopify/reactnative/checkoutsheetkit/CheckoutEventType.java

@@ -0,0 +1,59 @@
+/*
+MIT License
+
+Copyright 2023 - Present, Shopify Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+package com.shopify.reactnative.checkoutsheetkit;
+
+/**
+ * Registering a new type in this enum will automatically register a channel
+ * that can trigger an event to be received back in React Native.
+ *
+ * For example, you can trigger an event from Java/Kotlin by calling:
+ *
+ *   RCTCheckoutWebView.sendEvent(CheckoutEventType.ON_START, null);
+ *
+ * This will execute the corresponding prop in JavaScript:
+ *
+ *   <ShopifyCheckout
+ *     onStart={() => {}} // <- Will be executed
+ *   />
+ */
+public enum CheckoutEventType {
+  ON_START("onStart"),
+  ON_ERROR("onError"),
+  ON_COMPLETE("onComplete"),
+  ON_CANCEL("onCancel"),
+  ON_LINK_CLICK("onLinkClick"),
+  ON_ADDRESS_CHANGE_START("onAddressChangeStart"),
+  ON_PAYMENT_METHOD_CHANGE_START("onPaymentMethodChangeStart"),
+  ON_SUBMIT_START("onSubmitStart");
+
+  private final String eventName;
+
+  CheckoutEventType(String eventName) {
+    this.eventName = eventName;
+  }
+
+  public String getEventName() {
+    return eventName;
+  }
+}

modules/@shopify/checkout-sheet-kit/android/src/main/java/com/shopify/reactnative/checkoutsheetkit/RCTCheckoutWebView.java

@@ -27,7 +27,6 @@ of this software and associated documentation files (the "Software"), to deal
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
-import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.FrameLayout;
 
@@ -42,6 +41,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import com.shopify.checkoutsheetkit.Authentication;
 import com.shopify.checkoutsheetkit.CheckoutException;
+import com.shopify.checkoutsheetkit.CheckoutPaymentMethodChangeStartParams;
 import com.shopify.checkoutsheetkit.DefaultCheckoutEventProcessor;
 import com.shopify.checkoutsheetkit.CheckoutOptions;
 import com.shopify.checkoutsheetkit.CheckoutWebView;
@@ -55,11 +55,14 @@ of this software and associated documentation files (the "Software"), to deal
 import com.shopify.checkoutsheetkit.lifecycleevents.CheckoutStartEvent;
 import com.shopify.checkoutsheetkit.rpc.events.CheckoutAddressChangeStart;
 import com.shopify.checkoutsheetkit.rpc.events.CheckoutAddressChangeStartEvent;
-import com.shopify.checkoutsheetkit.rpc.events.CheckoutSubmitStart;
-import com.shopify.checkoutsheetkit.rpc.events.CheckoutSubmitStartEvent;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.shopify.checkoutsheetkit.rpc.events.CheckoutPaymentMethodChangeStart;
+
+import com.shopify.checkoutsheetkit.rpc.events.CheckoutSubmitStart;
+import com.shopify.checkoutsheetkit.rpc.events.CheckoutSubmitStartEvent;
+
 
 import java.util.HashMap;
 import java.util.Map;
@@ -286,18 +289,18 @@ private String getErrorTypeName(CheckoutException error) {
     }
   }
 
-  private void sendEvent(String eventName, WritableMap params) {
+  private void sendEvent(CheckoutEventType eventType, WritableMap params) {
     ReactContext reactContext = this.context.getReactApplicationContext();
     int viewId = getId();
 
     EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, viewId);
     if (eventDispatcher == null) {
-      Log.w(TAG, "Cannot send event '" + eventName + "': EventDispatcher not available (viewId=" + viewId + ")");
+      Log.w(TAG, "Cannot send event '" + eventType.getEventName() + "': EventDispatcher not available (viewId=" + viewId + ")");
       return;
     }
 
     int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
-    eventDispatcher.dispatchEvent(new CheckoutEvent(surfaceId, viewId, eventName, params));
+    eventDispatcher.dispatchEvent(new CheckoutEvent(surfaceId, viewId, eventType.getEventName(), params));
   }
 
   private class InlineCheckoutEventProcessor extends DefaultCheckoutEventProcessor {
@@ -310,7 +313,7 @@ public InlineCheckoutEventProcessor(android.content.Context context) {
     public void onStart(@NonNull CheckoutStartEvent event) {
       try {
         WritableMap data = serializeToWritableMap(event);
-        sendEvent("onStart", data);
+        sendEvent(CheckoutEventType.ON_START, data);
       } catch (Exception e) {
         Log.e(TAG, "Error processing start event", e);
       }
@@ -320,20 +323,20 @@ public void onStart(@NonNull CheckoutStartEvent event) {
     public void onComplete(@NonNull CheckoutCompleteEvent event) {
       try {
         WritableMap data = serializeToWritableMap(event);
-        sendEvent("onComplete", data);
+        sendEvent(CheckoutEventType.ON_COMPLETE, data);
       } catch (Exception e) {
         Log.e(TAG, "Error processing complete event", e);
       }
     }
 
     @Override
     public void onFail(@NonNull CheckoutException error) {
-      sendEvent("onError", buildErrorMap(error));
+      sendEvent(CheckoutEventType.ON_ERROR, buildErrorMap(error));
     }
 
     @Override
     public void onCancel() {
-      sendEvent("onCancel", null);
+      sendEvent(CheckoutEventType.ON_CANCEL, null);
     }
 
     @Override
@@ -347,13 +350,28 @@ public void onAddressChangeStart(@NonNull CheckoutAddressChangeStart event) {
         eventData.put("addressType", params.getAddressType());
         eventData.put("cart", params.getCart());
 
-        sendEvent("onAddressChangeStart", serializeToWritableMap(eventData));
+        sendEvent(CheckoutEventType.ON_ADDRESS_CHANGE_START, serializeToWritableMap(eventData));
       } catch (Exception e) {
         Log.e(TAG, "Error processing address change start event", e);
       }
     }
 
     @Override
+    public void onPaymentMethodChangeStart(@NonNull CheckoutPaymentMethodChangeStart event) {
+      try {
+        CheckoutPaymentMethodChangeStartParams params = event.getParams();
+
+        Map<String, Object> eventData = new HashMap<>();
+        eventData.put("id", event.getId());
+        eventData.put("type", "paymentMethodChangeStart");
+        eventData.put("cart", params.getCart());
+
+        sendEvent(CheckoutEventType.ON_PAYMENT_METHOD_CHANGE_START, serializeToWritableMap(eventData));
+      } catch (Exception e) {
+        Log.e(TAG, "Error processing address change start event", e);
+      }
+    }
+
     public void onSubmitStart(@NonNull CheckoutSubmitStart event) {
       try {
         CheckoutSubmitStartEvent params = event.getParams();
@@ -367,7 +385,7 @@ public void onSubmitStart(@NonNull CheckoutSubmitStart event) {
         checkoutData.put("id", params.getCheckout().getId());
         eventData.put("checkout", checkoutData);
 
-        sendEvent("onSubmitStart", serializeToWritableMap(eventData));
+        sendEvent(CheckoutEventType.ON_SUBMIT_START, serializeToWritableMap(eventData));
       } catch (Exception e) {
         Log.e(TAG, "Error processing submit start event", e);
       }
@@ -377,7 +395,7 @@ public void onSubmitStart(@NonNull CheckoutSubmitStart event) {
     public void onLinkClick(@NonNull Uri uri) {
       WritableMap params = Arguments.createMap();
       params.putString("url", uri.toString());
-      sendEvent("onLinkClick", params);
+      sendEvent(CheckoutEventType.ON_LINK_CLICK, params);
     }
   }
 }

modules/@shopify/checkout-sheet-kit/android/src/main/java/com/shopify/reactnative/checkoutsheetkit/RCTCheckoutWebViewManager.java

@@ -85,22 +85,15 @@ public void receiveCommand(@NonNull RCTCheckoutWebView view, String commandId, @
   @Override
   public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
     Map<String, Object> events = new HashMap<>();
-    events.put("onStart", createEventMap("onStart"));
-    events.put("onError", createEventMap("onError"));
-    events.put("onComplete", createEventMap("onComplete"));
-    events.put("onCancel", createEventMap("onCancel"));
-    events.put("onLinkClick", createEventMap("onLinkClick"));
-    events.put("onAddressChangeStart", createEventMap("onAddressChangeStart"));
-    events.put("onSubmitStart", createEventMap("onSubmitStart"));
+    for (CheckoutEventType eventType : CheckoutEventType.values()) {
+      String eventName = eventType.getEventName();
+      Map<String, String> event = new HashMap<>();
+      event.put("registrationName", eventName);
+      events.put(eventName, event);
+    }
     return events;
   }
 
-  private Map<String, String> createEventMap(String eventName) {
-    Map<String, String> event = new HashMap<>();
-    event.put("registrationName", eventName);
-    return event;
-  }
-
   @Override
   public void onDropViewInstance(@NonNull RCTCheckoutWebView view) {
     Log.d(TAG, "onDropViewInstance: Properly cleaning up CheckoutWebView");

modules/@shopify/checkout-sheet-kit/android/src/main/java/com/shopify/reactnative/checkoutsheetkit/SheetCheckoutEventProcessor.java

@@ -32,6 +32,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import com.shopify.checkoutsheetkit.CheckoutException;
 import com.shopify.checkoutsheetkit.CheckoutExpiredException;
+import com.shopify.checkoutsheetkit.CheckoutPaymentMethodChangeStartParams;
 import com.shopify.checkoutsheetkit.CheckoutSheetKitException;
 import com.shopify.checkoutsheetkit.ClientException;
 import com.shopify.checkoutsheetkit.ConfigurationException;
@@ -44,6 +45,8 @@ of this software and associated documentation files (the "Software"), to deal
 import com.shopify.checkoutsheetkit.lifecycleevents.CheckoutStartEvent;
 import com.shopify.checkoutsheetkit.rpc.events.CheckoutAddressChangeStart;
 import com.shopify.checkoutsheetkit.rpc.events.CheckoutAddressChangeStartEvent;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.shopify.checkoutsheetkit.rpc.events.CheckoutPaymentMethodChangeStart;
 import com.shopify.checkoutsheetkit.rpc.events.CheckoutSubmitStart;
 import com.shopify.checkoutsheetkit.rpc.events.CheckoutSubmitStartEvent;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -175,6 +178,22 @@ public void onAddressChangeStart(@NonNull CheckoutAddressChangeStart event) {
   }
 
   @Override
+  public void onPaymentMethodChangeStart(@NonNull CheckoutPaymentMethodChangeStart event) {
+    try {
+      CheckoutPaymentMethodChangeStartParams params = event.getParams();
+
+      Map<String, Object> eventData = new HashMap<>();
+      eventData.put("id", event.getId());
+      eventData.put("type", "paymentMethodChangeStart");
+      eventData.put("cart", params.getCart());
+
+      String data = mapper.writeValueAsString(eventData);
+      sendEventWithStringData("paymentMethodChangeStart", data);
+    } catch (IOException e) {
+      Log.e(TAG, "Error processing address change start event", e);
+    }
+  }
+
   public void onSubmitStart(@NonNull CheckoutSubmitStart event) {
     try {
       CheckoutSubmitStartEvent params = event.getParams();
@@ -200,7 +219,6 @@ public void onSubmitStart(@NonNull CheckoutSubmitStart event) {
   }
 
   // Private
-
   private Map<String, Object> populateErrorDetails(CheckoutException error) {
     Map<String, Object> errorMap = new HashMap<>(Map.of(
       "__typename", getErrorTypeName(error),