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

[Urgent] make zip code optional for apple/gpay, make stripe detection more reliable #38

Merged
merged 4 commits into from
Sep 11, 2024
Merged

[Urgent] make zip code optional for apple/gpay, make stripe detection more reliable #38

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4268c41
make stripe detect more stable
syvlabs Sep 11, 2024
4148466
add logging
syvlabs Sep 11, 2024
6ba29b5
make zip code optional
syvlabs Sep 11, 2024
b602053
bump ver
syvlabs Sep 11, 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: 4 additions & 1 deletion lib/components/form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,19 @@ const ElementsForm: FC<ElementsFormProps> = (props) => {

const confirmPaymentFlow = async (): Promise<void> => {
const nextActionType = eventPayload.nextActionMetadata['type'];
console.log('[form] Confirm payment flow: next actions:', eventPayload.nextActionMetadata);
if (nextActionType === undefined) {
console.log('[form] Confirming payment flow (No-op)');
// Nothing to do
} else if (nextActionType === 'stripe_3ds') {
console.log('[form] Confirming payment flow (Stripe 3DS');
await confirmPaymentFlowFor3DS(eventPayload);
} else if (nextActionType === 'stripe_payment_request') {
if (!stripePm) {
// This is only applicable for PRs
throw new Error(`Stripe PM not set`);
}
console.log('[form] Confirming payment flow');
console.log('[form] Confirming payment flow (Stripe PR');
await confirmPaymentFlowForStripePR(eventPayload, stripePm);
} else {
throw new Error(`Unknown next action type: ${nextActionType}`);
Expand Down
7 changes: 7 additions & 0 deletions lib/utils/event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ export const constructSubmitEventPayload = (

console.log(`[form] Constructing ${eventType} payload:`, extraData);

if (checkoutPaymentMethod.provider === 'apple_pay' || checkoutPaymentMethod.provider === 'google_pay') {
if (!extraData[FieldName.ZIP_CODE]) {
console.log('[form] Overriding empty zip code (only for google and apple pay)');
extraData[FieldName.ZIP_CODE] = '00000';
}
}

const payload = SubmitEventPayload.safeParse(extraData);

if (!payload.success) {
Expand Down
10 changes: 5 additions & 5 deletions lib/utils/stripe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ const ourCurrencyToTheirs: Record<string, string> = {
brl: 'brl',
};

const getLoadedStripe = (publishableKey: string): StripeType => {
const getLoadedStripe = async (publishableKey: string): Promise<StripeType> => {
for (let i = 0; i < 10; i++) {
if (!isStripeJsPresent()) {
sleep(200);
await sleep(500);
}
}
if (!isStripeJsPresent()) {
Expand All @@ -36,7 +36,7 @@ export const createStripePaymentRequest = async (
totalAmountAtom: number,
currency: string
): Promise<PaymentRequest> => {
const stripe = getLoadedStripe(stripePubKey);
const stripe = await getLoadedStripe(stripePubKey);
const stripeCurrency = ourCurrencyToTheirs[currency];
const paymentRequest = stripe.paymentRequest({
// TODO: replace this with stripe account country as soon as we support it
Expand Down Expand Up @@ -102,7 +102,7 @@ export const confirmPaymentFlowForStripePR = async (
if (stripePm.paymentMethod.id !== payload.paymentFlowMetadata['stripePmId']) {
throw new Error(`PM ID mismatch: ${stripePm.paymentMethod.id} != ${payload.paymentFlowMetadata['stripePmId']}`);
}
const stripe = getLoadedStripe(nextActionMetadata.stripe_pk);
const stripe = await getLoadedStripe(nextActionMetadata.stripe_pk);
const confirmResult = await stripe.confirmCardSetup(nextActionMetadata.client_secret, {
payment_method: payload.paymentFlowMetadata['stripePmId'],
});
Expand All @@ -116,7 +116,7 @@ export const confirmPaymentFlowForStripePR = async (

export const confirmPaymentFlowFor3DS = async (payload: PaymentFlowStartedEventPayload): Promise<void> => {
const nextActionMetadata = payload.nextActionMetadata;
const stripe = getLoadedStripe(nextActionMetadata.stripe_pk);
const stripe = await getLoadedStripe(nextActionMetadata.stripe_pk);
const confirmResult = await stripe.confirmCardSetup(nextActionMetadata.client_secret, {
payment_method: nextActionMetadata.stripe_pm_id,
});
Expand Down