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.

Sign up for GitHub

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

Populate pi in error #707

Merged
merged 4 commits into from
May 29, 2024
Merged

Populate pi in error #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
631cec0
populate pi in error.
ianlin-bbpos May 10, 2024
dc186b5
fix lint issue.
ianlin-bbpos May 23, 2024
225c8df
improve solution.
ianlin-bbpos May 29, 2024
67290c2
Merge branch 'main' into bbpos/populate-pi-when-error
ianlin-bbpos May 29, 2024
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
5 changes: 5 additions & 0 deletions android/src/main/java/com/stripeterminalreactnative/Errors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ internal fun WritableMap.putError(throwable: Throwable): ReadableMap = apply {
putErrorContents(throwable)
}
)
if (throwable is TerminalException) {
throwable.paymentIntent?.let {
putMap("paymentIntent", mapFromPaymentIntent(it, ""))
}
}
}

private fun WritableMap.putErrorContents(throwable: Throwable?) {
Expand Down
4 changes: 2 additions & 2 deletions dev-app/src/screens/CollectCardPaymentScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ export default function CollectCardPaymentScreen() {
metadata: {
errorCode: error.code,
errorMessage: error.message,
pi: JSON.stringify(paymentIntent, undefined, 2),
},
},
],
Expand Down Expand Up @@ -440,7 +441,6 @@ export default function CollectCardPaymentScreen() {
);

if (error) {
const failedPI = await api.getPaymentIntent(collectedPaymentIntent.id);
addLogs({
name: 'Confirm Payment Intent',
events: [
Expand All @@ -450,7 +450,7 @@ export default function CollectCardPaymentScreen() {
metadata: {
errorCode: error.code,
errorMessage: error.message,
pi: JSON.stringify(failedPI, undefined, 2),
pi: JSON.stringify(paymentIntent, undefined, 2),
},
},
],
Expand Down
21 changes: 18 additions & 3 deletions ios/StripeTerminalReactNative.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,12 @@ class StripeTerminalReactNative: RCTEventEmitter, DiscoveryDelegate, BluetoothRe

Terminal.shared.createPaymentIntent(paymentParams, createConfig: offlineCreateConfig) { pi, error in
if let error = error as NSError? {
resolve(Errors.createError(nsError: error))
var result = Errors.createError(nsError: error)
if let pi {
let paymentIntent = Mappers.mapFromPaymentIntent(pi, uuid: "")
result["paymentIntent"] = paymentIntent
}
resolve(result)
} else if let pi = pi {
let uuid = UUID().uuidString
let paymentIntent = Mappers.mapFromPaymentIntent(pi, uuid: uuid)
Expand Down Expand Up @@ -550,7 +555,12 @@ class StripeTerminalReactNative: RCTEventEmitter, DiscoveryDelegate, BluetoothRe
collectConfig: collectConfig
) { pi, collectError in
if let error = collectError as NSError? {
resolve(Errors.createError(nsError: error))
var result = Errors.createError(nsError: error)
if let pi {
let paymentIntent = Mappers.mapFromPaymentIntent(pi, uuid: "")
result["paymentIntent"] = paymentIntent
}
resolve(result)
} else if let paymentIntent = pi {
let paymentIntent = Mappers.mapFromPaymentIntent(paymentIntent, uuid: uuid)
resolve(["paymentIntent": paymentIntent])
Expand Down Expand Up @@ -626,7 +636,12 @@ class StripeTerminalReactNative: RCTEventEmitter, DiscoveryDelegate, BluetoothRe

Terminal.shared.confirmPaymentIntent(paymentIntent) { pi, error in
if let error = error as NSError? {
resolve(Errors.createError(nsError: error))
var result = Errors.createError(nsError: error)
if let pi {
let paymentIntent = Mappers.mapFromPaymentIntent(pi, uuid: "")
result["paymentIntent"] = paymentIntent
}
resolve(result)
} else if let pi = pi {
let uuid = UUID().uuidString
let paymentIntent = Mappers.mapFromPaymentIntent(pi, uuid: uuid)
Expand Down
18 changes: 18 additions & 0 deletions src/functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,12 @@ export async function createPaymentIntent(
await StripeTerminalSdk.createPaymentIntent(innerParams);

if (error) {
if (paymentIntent) {
return {
error,
paymentIntent,
};
}
return {
error,
paymentIntent: undefined,
Expand Down Expand Up @@ -337,6 +343,12 @@ export async function collectPaymentMethod(
await StripeTerminalSdk.collectPaymentMethod(innerParams);

if (error) {
if (paymentIntent) {
return {
error,
paymentIntent,
};
}
return {
error,
paymentIntent: undefined,
Expand Down Expand Up @@ -417,6 +429,12 @@ export async function confirmPaymentIntent(
await StripeTerminalSdk.confirmPaymentIntent(innerPaymentIntent);

if (error) {
if (paymentIntent) {
return {
error,
paymentIntent: confirmedPaymentIntent,
};
}
return {
error,
paymentIntent: undefined,
Expand Down
4 changes: 4 additions & 0 deletions src/types/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,10 @@ export type PaymentIntentResultType =
| {
paymentIntent?: undefined;
error: StripeError;
}
| {
paymentIntent: PaymentIntent.Type;
error: StripeError;
};

export type SetupIntentResultType =
Expand Down