Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update mock.js #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions android/src/main/java/com/reactnativestripesdk/StripeSdkModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,73 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
return null
}

/**
* Custom
*/

private fun extractPaymentMethodCreateParams(options: ReadableMap, token: String?): PaymentMethodCreateParams {
val cardParams = getMapOrNull(options, "card")
val billingDetailsParams = getMapOrNull(options, "billingDetails")
val addressParams = getMapOrNull(billingDetailsParams, "address")
val address = mapToAddress(addressParams, null)
val billingDetails = PaymentMethod.BillingDetails.Builder()
.setAddress(address)
.setEmail(getValOr(billingDetailsParams, "email"))
.setName(getValOr(billingDetailsParams, "name"))
.setPhone(getValOr(billingDetailsParams, "phone"))
.build()
val card = if (token != null) {
PaymentMethodCreateParams.Card.create(token)
} else {
PaymentMethodCreateParams.Card.Builder()
.setCvc(cardParams?.getString("cvc"))
.setExpiryMonth(cardParams?.getInt("expMonth"))
.setExpiryYear(cardParams?.getInt("expYear"))
.setNumber(cardParams?.getString("number"))
.build()
}
return PaymentMethodCreateParams.create(
card,
billingDetails,
)
}

@ReactMethod
fun createPaymentMethodCustomNative(params: ReadableMap, promise: Promise) {
val billingDetailsParams = getMapOrNull(params, "billingDetails")
val addressParams = getMapOrNull(billingDetailsParams, "address")
val cardParamsMap = getMapOrNull(params, "card")
val cardParams = CardParams(
number = getValOr(cardParamsMap, "number") as String,
expMonth = cardParamsMap?.getInt("expMonth") ?: 0,
expYear = cardParamsMap?.getInt("expYear") ?: 0,
cvc = getValOr(cardParamsMap, "cvc", null) as String,
address = mapToAddress(addressParams, null),
name = getValOr(billingDetailsParams, "name"),
)

CoroutineScope(Dispatchers.IO).launch {
runCatching {
val token = stripe.createCardToken(
cardParams = cardParams,
stripeAccountId = stripeAccountId
)
CoroutineScope(Dispatchers.IO).launch {
val pmcp = extractPaymentMethodCreateParams(params, token.id)
runCatching {
val paymentMethod = stripe.createPaymentMethod(pmcp)
val paymentMethodMap: WritableMap = mapFromPaymentMethod(paymentMethod)
promise.resolve(createResult("paymentMethod", paymentMethodMap))
}.onFailure {
promise.resolve(createError("Failed", it))
}
}
}.onFailure {
promise.resolve(createError(CreateTokenErrorType.Failed.toString(), it))
}
}
}

companion object {
const val NAME = "StripeSdk"
}
Expand Down
14 changes: 14 additions & 0 deletions ios/ApplePayViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ extension StripeSdk : PKPaymentAuthorizationViewControllerDelegate, STPApplePayC
didAuthorizePayment payment: PKPayment,
handler completion: @escaping (PKPaymentAuthorizationResult) -> Void
) {
if (self.hasLegacyApplePayListeners) {
// Legacy, remove when useApplePay hook is removed
let contact = payment.shippingContact
if ((contact) != nil) {
sendEvent(withName: "onDidSetShippingContact", body: ["shippingContact": Mappers.mapFromShippingContact(shippingContact: contact!)])
}
}
applePaymentMethodFlowCanBeCanceled = false

if (platformPayUsesDeprecatedTokenFlow) {
Expand Down Expand Up @@ -165,6 +172,13 @@ extension StripeSdk : PKPaymentAuthorizationViewControllerDelegate, STPApplePayC
paymentInformation: PKPayment,
completion: @escaping STPIntentClientSecretCompletionBlock
) {
if (self.hasLegacyApplePayListeners) {
// Legacy, remove when useApplePay hook is removed
let contact = paymentInformation.shippingContact
if ((contact) != nil) {
sendEvent(withName: "onDidSetShippingContact", body: ["shippingContact": Mappers.mapFromShippingContact(shippingContact: contact!)])
}
}
if let clientSecret = self.confirmApplePayPaymentClientSecret {
completion(clientSecret, nil)
} else if let clientSecret = self.confirmApplePaySetupClientSecret {
Expand Down
5 changes: 5 additions & 0 deletions ios/StripeSdk.m
Original file line number Diff line number Diff line change
Expand Up @@ -193,4 +193,9 @@ @interface RCT_EXTERN_MODULE(StripeSdk, RCTEventEmitter)
resolver: (RCTPromiseResolveBlock)resolve
rejecter: (RCTPromiseRejectBlock)reject
)
RCT_EXTERN_METHOD(
createPaymentMethodCustomNative:(NSDictionary *)params
resolver: (RCTPromiseResolveBlock)resolve
rejecter: (RCTPromiseRejectBlock)reject
)
@end
60 changes: 60 additions & 0 deletions ios/StripeSdk.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1171,6 +1171,66 @@ class StripeSdk: RCTEventEmitter, STPBankSelectionViewControllerDelegate, UIAdap
break
}
}

// Custom
func extractPaymentMethodCreateParams(
options: NSDictionary,
token: String?
) -> STPPaymentMethodParams {
let cardParams = options["card"] as? NSDictionary
let billingDetailsParams = options["billingDetails"] as? NSDictionary
let addressParams = billingDetailsParams?["address"] as? NSDictionary
let card = STPPaymentMethodCardParams()
let billingDetails = STPPaymentMethodBillingDetails()
let address = STPPaymentMethodAddress(address: Mappers.mapToAddress(address: addressParams))
billingDetails.address = address
billingDetails.email = billingDetailsParams?["email"] as? String
billingDetails.name = billingDetailsParams?["name"] as? String
billingDetails.phone = billingDetailsParams?["phone"] as? String
if let token = token {
card.token = token
} else {
card.number = cardParams?["number"] as? String
card.expMonth = cardParams?["expMonth"] as? NSNumber
card.expYear = cardParams?["expYear"] as? NSNumber
card.cvc = cardParams?["cvc"] as? String
}
return STPPaymentMethodParams(card: card, billingDetails: billingDetails, metadata: nil)
}

@objc(createPaymentMethodCustomNative:resolver:rejecter:)
func createPaymentMethodCustomNative(
params: NSDictionary,
resolver resolve: @escaping RCTPromiseResolveBlock,
rejecter reject: @escaping RCTPromiseRejectBlock
) -> Void {
let billingDetailsParams = params["billingDetails"] as? NSDictionary
let addressParams = billingDetailsParams?["address"] as? NSDictionary
let cardParamsMap = params["card"] as? NSDictionary
let cardSourceParams = STPCardParams()
cardSourceParams.number = cardParamsMap?["number"] as? String
cardSourceParams.expMonth = UInt(truncating: cardParamsMap?["expMonth"] as? NSNumber ?? 0)
cardSourceParams.expYear = UInt(truncating: cardParamsMap?["expYear"] as? NSNumber ?? 0)
cardSourceParams.cvc = cardParamsMap?["cvc"] as? String
cardSourceParams.address = Mappers.mapToAddress(address: addressParams)
cardSourceParams.name = billingDetailsParams?["name"] as? String
STPAPIClient.shared.createToken(withCard: cardSourceParams) { token, error in
if let token = token {
let pmcp = self.extractPaymentMethodCreateParams(options: params, token: token.tokenId)
STPAPIClient.shared.createPaymentMethod(with: pmcp) { paymentMethod, error in
if let error = error {
resolve(Errors.createError(ErrorType.Failed, error as NSError))
return
}
resolve(
Mappers.createResult("paymentMethod", Mappers.mapFromPaymentMethod(paymentMethod))
)
}
} else {
resolve(Errors.createError(ErrorType.Failed, error as NSError?))
}
}
}
}

func findViewControllerPresenter(from uiViewController: UIViewController) -> UIViewController {
Expand Down
13 changes: 13 additions & 0 deletions jest/mock.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,17 @@ module.exports = {
AddToWalletButton: () => 'AddToWalletButton',
PlatformPayButton: () => 'PlatformPayButton',
useStripe: jest.fn(() => mockHooks),
PlatformPay: {
ContactField: {
EmailAddress: "emailAddress",
Name: "name",
PhoneNumber: "phoneNumber",
PhoneticName: "phoneticName",
PostalAddress: "postalAddress",
},
BillingAddressFormat: {
Full: "FULL",
Min: "MIN",
},
},
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@stripe/stripe-react-native",
"version": "0.26.0",
"version": "0.26.1",
"author": "Stripe",
"description": "Stripe SDK for React Native",
"main": "lib/commonjs/index",
Expand Down
3 changes: 3 additions & 0 deletions src/NativeStripeSdk.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ type NativeStripeSdkType = {
webServiceUrl: string,
authenticationToken: string
): Promise<void>;
createPaymentMethodCustomNative(
params: PaymentMethod.CreateParams
): Promise<CreatePaymentMethodResult>;
};

const { StripeSdk } = NativeModules;
Expand Down
10 changes: 10 additions & 0 deletions src/functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -927,3 +927,13 @@ export const openPlatformPaySetup = async (): Promise<void> => {
await NativeStripeSdk.openApplePaySetup();
}
};

/**
* Use this method to create a payment method from a custom form.
* This include the token creation and payment method creation performed natively by stripe.
*/
export const createPaymentMethodCustom = async (
params: PaymentMethod.CreateParams
): Promise<CreatePaymentMethodResult> => {
return await NativeStripeSdk.createPaymentMethodCustomNative(params);
};
11 changes: 11 additions & 0 deletions src/types/PaymentMethod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@ export type CardParams =
cvc?: string;
billingDetails?: BillingDetails;
};
}
| {
paymentMethodType: 'Card';
billingDetails?: BillingDetails;
card: {
number: string;
cvc: string;
expMonth: number;
expYear: number;
name: string;
};
};

export interface IdealParams {
Expand Down
5 changes: 4 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,8 @@
"node",
"jest"
]
}
},
"exclude": [
"example"
]
}