Merge pull request #84 from capacitor-community/feat/web-payment-sheet

feat(web): support web platform
capacitor-community · Jul 23, 2021 · a7cc524 · a7cc524
2 parents a075594 + 0230b0e
commit a7cc524
Show file tree

Hide file tree

Showing 11 changed files with 365 additions and 103 deletions.
diff --git a/android/src/main/java/com/getcapacitor/community/stripe/StripePlugin.java b/android/src/main/java/com/getcapacitor/community/stripe/StripePlugin.java
@@ -2,9 +2,7 @@
 
 import android.app.Activity;
 import android.util.Log;
-
 import androidx.activity.ComponentActivity;
-
 import com.getcapacitor.NativePlugin;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
@@ -17,7 +15,7 @@
 @NativePlugin(name = "Stripe", requestCodes = { 9972, 50000, 50001, 6000 })
 public class StripePlugin extends Plugin {
 
-//    private Stripe stripeInstance;
+    //    private Stripe stripeInstance;
     private String publishableKey;
     private Boolean isTest = true;
     private GooglePayCallback googlePayCallback = null;
@@ -32,9 +30,13 @@ public class StripePlugin extends Plugin {
 
     @Override
     public void load() {
-        this.paymentSheetExecutor.paymentSheet = new PaymentSheet(getActivity(), result -> {
-            this.paymentSheetExecutor.onPaymentSheetResult(bridge, callbackId, result);
-        });
+        this.paymentSheetExecutor.paymentSheet =
+            new PaymentSheet(
+                getActivity(),
+                result -> {
+                    this.paymentSheetExecutor.onPaymentSheetResult(bridge, callbackId, result);
+                }
+            );
     }
 
     @PluginMethod
@@ -46,7 +48,7 @@ public void initialize(final PluginCall call) {
                 call.reject("you must provide a valid key");
                 return;
             }
-//            stripeInstance = new Stripe(getContext(), publishableKey);
+            //            stripeInstance = new Stripe(getContext(), publishableKey);
             isTest = publishableKey.contains("test");
             PaymentConfiguration.init(getContext(), publishableKey);
             call.resolve();

diff --git a/...id/src/main/java/com/getcapacitor/community/stripe/paymentsheet/PaymentSheetExecutor.java b/...id/src/main/java/com/getcapacitor/community/stripe/paymentsheet/PaymentSheetExecutor.java
@@ -3,10 +3,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
-
 import androidx.activity.ComponentActivity;
 import androidx.core.util.Supplier;
-
 import com.getcapacitor.Bridge;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
@@ -19,6 +17,7 @@
 import com.stripe.android.paymentsheet.PaymentSheetResultCallback;
 
 public class PaymentSheetExecutor extends Executor {
+
     public PaymentSheet paymentSheet;
     private final JSObject emptyObject = new JSObject();
     private PaymentSheet.Configuration paymentConfiguration;
@@ -48,20 +47,17 @@ public void createPaymentSheet(final PluginCall call, String publishableKey) {
             return;
         }
 
-
         String merchantDisplayName = call.getString("merchantDisplayName");
 
         if (merchantDisplayName == null) {
             merchantDisplayName = "";
         }
 
-        paymentConfiguration = new PaymentSheet.Configuration(
+        paymentConfiguration =
+            new PaymentSheet.Configuration(
                 merchantDisplayName,
-                new PaymentSheet.CustomerConfiguration(
-                        customerId,
-                        customerEphemeralKeySecret
-                )
-        );
+                new PaymentSheet.CustomerConfiguration(customerId, customerEphemeralKeySecret)
+            );
 
         Boolean useGooglePay = call.getBoolean("useGooglePay", false);
 
@@ -73,11 +69,10 @@ public void createPaymentSheet(final PluginCall call, String publishableKey) {
                 environment = PaymentSheet.GooglePayConfiguration.Environment.Test;
             }
 
-            final PaymentSheet.GooglePayConfiguration googlePayConfiguration =
-                    new PaymentSheet.GooglePayConfiguration(
-                            environment,
-                            call.getString("countryCode", "US")
-                    );
+            final PaymentSheet.GooglePayConfiguration googlePayConfiguration = new PaymentSheet.GooglePayConfiguration(
+                environment,
+                call.getString("countryCode", "US")
+            );
             paymentConfiguration.setGooglePay(googlePayConfiguration);
         }
 
@@ -87,20 +82,13 @@ public void createPaymentSheet(final PluginCall call, String publishableKey) {
 
     public void presentPaymentSheet(final PluginCall call) {
         try {
-            paymentSheet.presentWithPaymentIntent(
-                    paymentIntentClientSecret,
-                    paymentConfiguration
-            );
+            paymentSheet.presentWithPaymentIntent(paymentIntentClientSecret, paymentConfiguration);
         } catch (Exception ex) {
             call.reject(ex.getLocalizedMessage(), ex);
         }
     }
 
-    public void onPaymentSheetResult(
-            Bridge bridge,
-            String callbackId,
-            final PaymentSheetResult paymentSheetResult
-    ) {
+    public void onPaymentSheetResult(Bridge bridge, String callbackId, final PaymentSheetResult paymentSheetResult) {
         PluginCall call = bridge.getSavedCall(callbackId);
 
         if (paymentSheetResult instanceof PaymentSheetResult.Canceled) {

diff --git a/demo/angular/android/app/src/main/java/io/ionic/starter/MainActivity.java b/demo/angular/android/app/src/main/java/io/ionic/starter/MainActivity.java
@@ -5,9 +5,9 @@
 
 public class MainActivity extends BridgeActivity {
 
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    registerPlugin(com.getcapacitor.community.stripe.StripePlugin.class);
-  }
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        registerPlugin(com.getcapacitor.community.stripe.StripePlugin.class);
+    }
 }
diff --git a/demo/angular/package-lock.json b/demo/angular/package-lock.json
diff --git a/demo/angular/package.json b/demo/angular/package.json
@@ -24,6 +24,7 @@
     "@capacitor/android": "^3.1.1",
     "@capacitor/core": "3.0.0",
     "@ionic/angular": "^5.5.2",
+    "@stripe-elements/stripe-elements": "0.0.1",
     "rxjs": "~6.6.0",
     "tslib": "^2.0.0",
     "zone.js": "~0.11.4"

diff --git a/demo/angular/src/app/tab1/tab1.page.html b/demo/angular/src/app/tab1/tab1.page.html
@@ -12,6 +12,8 @@
       <ion-title size="large">Tab 1</ion-title>
     </ion-toolbar>
   </ion-header>
-
-  <div class="ion-text-center ion-padding"><ion-button (click)="presentPaymentSheet()">決済表示</ion-button></div>
+  <ion-list>
+    <ion-item button="true" (click)="createPaymentSheet()" [disabled]="process === 'Ready'"><ion-label>準備</ion-label></ion-item>
+    <ion-item button="true" (click)="presentPaymentSheet()" [disabled]="process === 'willReady'"><ion-label>実行</ion-label></ion-item>
+  </ion-list>
 </ion-content>