From bf8387fe27323f30c20651e41a9bec0272670d7e Mon Sep 17 00:00:00 2001 From: nikos9413 Date: Tue, 21 Nov 2023 18:36:53 +0200 Subject: [PATCH] feat(applePay): add requirement for email in applePay paymentSheet flow feat(): change package name feat(): change package name in various files, bump version feat(): prepare for new pubish feat(): rename files, bump version --- package.json | 4 ++-- ...y.podspec => CovveCapacitorStripeIdentity.podspec} | 2 +- packages/identity/package.json | 2 +- ...ityStripe.podspec => CovveCapacitorStripe.podspec} | 2 +- .../Plugin/PaymentSheet/PaymentSheetExecutor.swift | 11 ++++++++++- packages/payment/ios/Plugin/StripePlugin.swift | 2 +- packages/payment/package-lock.json | 4 ++-- packages/payment/package.json | 4 ++-- packages/payment/src/web.ts | 8 ++++---- ...l.podspec => CovveCapacitorStripeTerminal.podspec} | 2 +- packages/terminal/package.json | 2 +- 11 files changed, 26 insertions(+), 17 deletions(-) rename packages/identity/{CapacitorCommunityStripeIdentity.podspec => CovveCapacitorStripeIdentity.podspec} (92%) rename packages/payment/{CapacitorCommunityStripe.podspec => CovveCapacitorStripe.podspec} (94%) rename packages/terminal/{CapacitorCommunityStripeTerminal.podspec => CovveCapacitorStripeTerminal.podspec} (92%) diff --git a/package.json b/package.json index f7d7db321..736efb4fa 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@capacitor-community/stripe", + "name": "@covve/capacitor-stripe", "version": "6.2.1", "engines": { "node": ">=18.0.0" @@ -8,7 +8,7 @@ "private": false, "description": "Stripe SDK bindings for Capacitor Applications", "scripts": { - "release": "np --no-tests --no-publish && node ./release.js" + "release": "np --no-tests --no-publish --any-branch && node ./release.js" }, "repository": { "type": "git", diff --git a/packages/identity/CapacitorCommunityStripeIdentity.podspec b/packages/identity/CovveCapacitorStripeIdentity.podspec similarity index 92% rename from packages/identity/CapacitorCommunityStripeIdentity.podspec rename to packages/identity/CovveCapacitorStripeIdentity.podspec index 7fc202424..e8dd01954 100644 --- a/packages/identity/CapacitorCommunityStripeIdentity.podspec +++ b/packages/identity/CovveCapacitorStripeIdentity.podspec @@ -3,7 +3,7 @@ require 'json' package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) Pod::Spec.new do |s| - s.name = 'CapacitorCommunityStripeIdentity' + s.name = 'CovveCapacitorStripeIdentity' s.version = package['version'] s.summary = package['description'] s.license = package['license'] diff --git a/packages/identity/package.json b/packages/identity/package.json index 2be193266..6cebc0f67 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -14,7 +14,7 @@ "android/build.gradle", "dist/", "ios/Plugin/", - "CapacitorCommunityStripeIdentity.podspec" + "CovveCapacitorStripeIdentity.podspec" ], "author": "Masahiko Sakakibara", "license": "MIT", diff --git a/packages/payment/CapacitorCommunityStripe.podspec b/packages/payment/CovveCapacitorStripe.podspec similarity index 94% rename from packages/payment/CapacitorCommunityStripe.podspec rename to packages/payment/CovveCapacitorStripe.podspec index e555d82d0..73e7dd41a 100644 --- a/packages/payment/CapacitorCommunityStripe.podspec +++ b/packages/payment/CovveCapacitorStripe.podspec @@ -3,7 +3,7 @@ require 'json' package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) Pod::Spec.new do |s| - s.name = 'CapacitorCommunityStripe' + s.name = 'CovveCapacitorStripe' s.version = package['version'] s.summary = package['description'] s.license = package['license'] diff --git a/packages/payment/ios/Plugin/PaymentSheet/PaymentSheetExecutor.swift b/packages/payment/ios/Plugin/PaymentSheet/PaymentSheetExecutor.swift index 319f0d31e..c32d420e6 100644 --- a/packages/payment/ios/Plugin/PaymentSheet/PaymentSheetExecutor.swift +++ b/packages/payment/ios/Plugin/PaymentSheet/PaymentSheetExecutor.swift @@ -1,6 +1,7 @@ import Foundation import Capacitor import StripePaymentSheet +import PassKit class PaymentSheetExecutor: NSObject { weak var plugin: StripePlugin? @@ -54,7 +55,15 @@ class PaymentSheetExecutor: NSObject { if call.getBool("enableApplePay", false) && applePayMerchantId != "" { configuration.applePay = .init( merchantId: applePayMerchantId, - merchantCountryCode: call.getString("countryCode", "US") + merchantCountryCode: call.getString("countryCode", "US"), + customHandlers: .init( + paymentRequestHandler: { (req: PKPaymentRequest) -> PKPaymentRequest in + var contactFieldArray: [PKContactField] = [] + contactFieldArray.append(.emailAddress) + req.requiredShippingContactFields = Set(contactFieldArray) + return req + } + ) ) } diff --git a/packages/payment/ios/Plugin/StripePlugin.swift b/packages/payment/ios/Plugin/StripePlugin.swift index 406376891..fbccb84dc 100644 --- a/packages/payment/ios/Plugin/StripePlugin.swift +++ b/packages/payment/ios/Plugin/StripePlugin.swift @@ -29,7 +29,7 @@ public class StripePlugin: CAPPlugin { STPAPIClient.shared.stripeAccount = stripeAccount } - STPAPIClient.shared.appInfo = STPAppInfo(name: "@capacitor-community/stripe", partnerId: nil, version: nil, url: nil) + STPAPIClient.shared.appInfo = STPAppInfo(name: "@covve/capacitor-stripe", partnerId: nil, version: nil, url: nil) call.resolve() } diff --git a/packages/payment/package-lock.json b/packages/payment/package-lock.json index f13c3b5cf..5b0a78cdd 100644 --- a/packages/payment/package-lock.json +++ b/packages/payment/package-lock.json @@ -1,11 +1,11 @@ { - "name": "@capacitor-community/stripe", + "name": "@covve/capacitor-stripe", "version": "6.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@capacitor-community/stripe", + "name": "@covve/capacitor-stripe", "version": "6.2.1", "license": "MIT", "devDependencies": { diff --git a/packages/payment/package.json b/packages/payment/package.json index c551100f7..ad1a2c4c6 100644 --- a/packages/payment/package.json +++ b/packages/payment/package.json @@ -1,5 +1,5 @@ { - "name": "@capacitor-community/stripe", + "name": "@covve/capacitor-stripe", "version": "6.2.1", "engines": { "node": ">=18.0.0" @@ -26,7 +26,7 @@ "dist/", "src/", "ios/Plugin/", - "CapacitorCommunityStripe.podspec" + "CovveCapacitorStripe.podspec" ], "author": "Masahiko Sakakibara ", "license": "MIT", diff --git a/packages/payment/src/web.ts b/packages/payment/src/web.ts index e2283c1f5..c08085145 100644 --- a/packages/payment/src/web.ts +++ b/packages/payment/src/web.ts @@ -71,7 +71,7 @@ export class StripeWeb extends WebPlugin implements StripePlugin { this.paymentSheet.stripeAccount = this.stripeAccount; } - this.paymentSheet.applicationName = '@capacitor-community/stripe'; + this.paymentSheet.applicationName = '@covve/capacitor-stripe'; this.paymentSheet.intentClientSecret = options.paymentIntentClientSecret; this.paymentSheet.intentType = 'payment'; @@ -140,7 +140,7 @@ export class StripeWeb extends WebPlugin implements StripePlugin { this.paymentSheet.stripeAccount = this.stripeAccount; } - this.paymentSheet.applicationName = '@capacitor-community/stripe'; + this.paymentSheet.applicationName = '@covve/capacitor-stripe'; // eslint-disable-next-line no-prototype-builtins if (options.hasOwnProperty('paymentIntentClientSecret')) { @@ -293,7 +293,7 @@ export class StripeWeb extends WebPlugin implements StripePlugin { requestButton.stripeAccount = this.stripeAccount; } - requestButton.applicationName = '@capacitor-community/stripe'; + requestButton.applicationName = '@covve/capacitor-stripe'; return await requestButton.isAvailable(type).finally(() => requestButton.remove()); } @@ -310,7 +310,7 @@ export class StripeWeb extends WebPlugin implements StripePlugin { requestButton.stripeAccount = this.stripeAccount; } - requestButton.applicationName = '@capacitor-community/stripe'; + requestButton.applicationName = '@covve/capacitor-stripe'; return requestButton; } diff --git a/packages/terminal/CapacitorCommunityStripeTerminal.podspec b/packages/terminal/CovveCapacitorStripeTerminal.podspec similarity index 92% rename from packages/terminal/CapacitorCommunityStripeTerminal.podspec rename to packages/terminal/CovveCapacitorStripeTerminal.podspec index 26098c939..e8a5eb725 100644 --- a/packages/terminal/CapacitorCommunityStripeTerminal.podspec +++ b/packages/terminal/CovveCapacitorStripeTerminal.podspec @@ -3,7 +3,7 @@ require 'json' package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) Pod::Spec.new do |s| - s.name = 'CapacitorCommunityStripeTerminal' + s.name = 'CovveCapacitorStripeTerminal' s.version = package['version'] s.summary = package['description'] s.license = package['license'] diff --git a/packages/terminal/package.json b/packages/terminal/package.json index 51d065890..de32d5c73 100644 --- a/packages/terminal/package.json +++ b/packages/terminal/package.json @@ -14,7 +14,7 @@ "android/build.gradle", "dist/", "ios/Plugin/", - "CapacitorCommunityStripeTerminal.podspec" + "CovveCapacitorStripeTerminal.podspec" ], "author": "Masahiko Sakakibara", "license": "MIT",