Feat: upgrade, downgrade, and cross-grade functionality for the Stripe payment gateway.#247
Feat: upgrade, downgrade, and cross-grade functionality for the Stripe payment gateway.#247VeenaYemmiganur merged 18 commits intomasterfrom
Conversation
WalkthroughPackage version updated to "3.8.9-stripe-up-downgrade.9". Changes
Sequence DiagramsequenceDiagram
participant Client
participant AccessType
participant GlobalAccessType as global.AccessType
participant SwitchPaymentOptions
participant Stripe
Client->>AccessType: initStripePayment(options)
alt intent === 'switch'
AccessType->>GlobalAccessType: fetchSwitchPaymentOptions()
GlobalAccessType-->>AccessType: switchPaymentOptions
AccessType->>AccessType: build payload (switch_type, subscription_plan_id, subscriptionId, success/cancel URLs)
AccessType->>SwitchPaymentOptions: switchPaymentOptions.stripe.proceed(payload)
SwitchPaymentOptions->>Stripe: process switch payment
Stripe-->>Client: payment result
else non-switch
AccessType->>SwitchPaymentOptions: paymentOptions.stripe.proceed(paymentObject)
SwitchPaymentOptions->>Stripe: process standard payment
Stripe-->>Client: payment result
end
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes 🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches🧪 Generate unit tests (beta)
No actionable comments were generated in the recent review. 🎉 Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
src/components/access-type.js (1)
402-406:⚠️ Potential issue | 🟡 MinorUse error semantics appropriate for async functions instead of returning
false.The function throws on some errors (line 420) but returns
falseon validation failure, creating inconsistent error handling. Async functions should reject or throw for errors rather than return falsy primitives, which makes error handling and debugging more difficult downstream.Suggested fix
initStripePayment = async (options = {}) => { if (!options.selectedPlan) { - console.warn('Stripe pay needs a plan') - return false + const err = new Error('Stripe pay needs a plan') + console.warn(err.message) + throw err }
🤖 Fix all issues with AI agents
In `@src/components/access-type.js`:
- Around line 414-430: When handling intent === 'switch' (the awaitHelper call
to global.AccessType.getPaymentOptions and the switchPaymentOptions result), add
guards to ensure switchPaymentOptions and switchPaymentOptions.stripe exist and
that stripe.proceed is a function before calling it; if missing, throw a clear
error. Also validate options?.successUrl and options?.cancelUrl are non-empty
strings (or provide safe defaults) before building payload.urls and calling
stripe.proceed; if either URL is invalid, throw an error indicating which URL is
missing/invalid. Ensure these checks are applied around the existing
paymentObject/payload construction and the call to
switchPaymentOptions.stripe.proceed.
| if (intent === 'switch') { | ||
| const { error, data: switchPaymentOptions } = await awaitHelper( | ||
| global.AccessType.getPaymentOptions(null, null, "switch") | ||
| ); | ||
|
|
||
| if (error) throw new Error("payment options fetch failed"); | ||
| const payload = { | ||
| ...paymentObject, | ||
| switch_type: switchType, | ||
| subscription_plan_id: options?.selectedPlan?.id, | ||
| subscriptionId: options?.selectedPlan?.subscriptionId, | ||
| urls : { | ||
| success_url: options?.successUrl, | ||
| cancel_url: options?.cancelUrl | ||
| } | ||
| }; | ||
| return switchPaymentOptions.stripe.proceed(payload); |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
cat -n src/components/access-type.js | sed -n '414,430p'Repository: quintype/quintype-node-components
Length of output: 822
🏁 Script executed:
cat -n src/components/access-type.js | sed -n '380,435p'Repository: quintype/quintype-node-components
Length of output: 2478
🏁 Script executed:
rg -n "awaitHelper" src/components/access-type.js -B 2 -A 2Repository: quintype/quintype-node-components
Length of output: 3261
🏁 Script executed:
rg -n "export.*awaitHelper|function awaitHelper" src/utils -B 2 -A 10Repository: quintype/quintype-node-components
Length of output: 126
🏁 Script executed:
rg -n "export.*awaitHelper|function awaitHelper" -B 2 -A 10Repository: quintype/quintype-node-components
Length of output: 855
🏁 Script executed:
rg -n "initStripePayment" src/components/access-type.js -B 2 -A 5Repository: quintype/quintype-node-components
Length of output: 3098
🏁 Script executed:
cat -n src/components/access-type.js | sed -n '387,400p'Repository: quintype/quintype-node-components
Length of output: 709
🏁 Script executed:
rg -n "switchPaymentOptions\|switchPaymentOptions.stripe" src/components/access-type.js -B 2 -A 2Repository: quintype/quintype-node-components
Length of output: 59
🏁 Script executed:
rg -n "\.stripe\." src/components/access-type.js -B 2 -A 2Repository: quintype/quintype-node-components
Length of output: 350
Guard against missing Stripe provider and validate payment URLs before proceeding.
The switch case directly accesses switchPaymentOptions.stripe.proceed() without verifying that stripe exists, while the default case (lines 432-434) includes this guard. Additionally, successUrl and cancelUrl are constructed with optional chaining and may be undefined, which can break the Stripe flow. Both the provider and URLs must be validated before use.
Suggested fix
if (intent === 'switch') {
const { error, data: switchPaymentOptions } = await awaitHelper(
global.AccessType.getPaymentOptions(null, null, "switch")
);
if (error) throw new Error("payment options fetch failed");
+ if (!switchPaymentOptions?.stripe) {
+ return Promise.reject({ message: 'Payment option is loading...' })
+ }
+ if (!options?.successUrl || !options?.cancelUrl) {
+ throw new Error('successUrl and cancelUrl are required for switch')
+ }
const payload = {
...paymentObject,
switch_type: switchType,
subscription_plan_id: options?.selectedPlan?.id,
subscriptionId: options?.selectedPlan?.subscriptionId,
urls: {
- success_url: options?.successUrl,
- cancel_url: options?.cancelUrl
+ success_url: options.successUrl,
+ cancel_url: options.cancelUrl
}
};
return switchPaymentOptions.stripe.proceed(payload);
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| if (intent === 'switch') { | |
| const { error, data: switchPaymentOptions } = await awaitHelper( | |
| global.AccessType.getPaymentOptions(null, null, "switch") | |
| ); | |
| if (error) throw new Error("payment options fetch failed"); | |
| const payload = { | |
| ...paymentObject, | |
| switch_type: switchType, | |
| subscription_plan_id: options?.selectedPlan?.id, | |
| subscriptionId: options?.selectedPlan?.subscriptionId, | |
| urls : { | |
| success_url: options?.successUrl, | |
| cancel_url: options?.cancelUrl | |
| } | |
| }; | |
| return switchPaymentOptions.stripe.proceed(payload); | |
| if (intent === 'switch') { | |
| const { error, data: switchPaymentOptions } = await awaitHelper( | |
| global.AccessType.getPaymentOptions(null, null, "switch") | |
| ); | |
| if (error) throw new Error("payment options fetch failed"); | |
| if (!switchPaymentOptions?.stripe) { | |
| return Promise.reject({ message: 'Payment option is loading...' }) | |
| } | |
| if (!options?.successUrl || !options?.cancelUrl) { | |
| throw new Error('successUrl and cancelUrl are required for switch') | |
| } | |
| const payload = { | |
| ...paymentObject, | |
| switch_type: switchType, | |
| subscription_plan_id: options?.selectedPlan?.id, | |
| subscriptionId: options?.selectedPlan?.subscriptionId, | |
| urls: { | |
| success_url: options.successUrl, | |
| cancel_url: options.cancelUrl | |
| } | |
| }; | |
| return switchPaymentOptions.stripe.proceed(payload); | |
| } |
🤖 Prompt for AI Agents
In `@src/components/access-type.js` around lines 414 - 430, When handling intent
=== 'switch' (the awaitHelper call to global.AccessType.getPaymentOptions and
the switchPaymentOptions result), add guards to ensure switchPaymentOptions and
switchPaymentOptions.stripe exist and that stripe.proceed is a function before
calling it; if missing, throw a clear error. Also validate options?.successUrl
and options?.cancelUrl are non-empty strings (or provide safe defaults) before
building payload.urls and calling stripe.proceed; if either URL is invalid,
throw an error indicating which URL is missing/invalid. Ensure these checks are
applied around the existing paymentObject/payload construction and the call to
switchPaymentOptions.stripe.proceed.
2 participants
Description
Implementing the upgrade, downgrade, and cross-grade functionality for the Stripe payment gateway.
The prorated amount will be calculated based on the selected switch type
Fixes # (issue-reference)
https://github.com/quintype/page-builder/issues/4289
Summary by CodeRabbit
New Features
Chores