Skip to content

Prepare for deferred confirm #252

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

Closed
elia wants to merge 9 commits into from
Closed

Prepare for deferred confirm #252

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8b83f87
Autocreate the sandbox before starting bin/dev
elia Mar 23, 2023
d22673a
Fix migrations updater timestamp and order
elia Mar 23, 2023
a717e97
Don't break the obfuscated card number line
elia Mar 27, 2023
1b302eb
Rely on the payment method's auto capture settings
elia Mar 27, 2023
0c1e36a
Silence rubocop on multiline ternary operators
elia Mar 27, 2023
68b6ffa
Use `@stripe/stripe-js` as a module with importmap
rainerdema Mar 28, 2023
d73896c
Include Stripe custom partial payment info
elia Mar 27, 2023
950e678
Ensure it's the right form when handling the payment submit
elia Mar 28, 2023
b401f6b
Don't try to update migrations on the CI
elia Mar 28, 2023
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
12 changes: 12 additions & 0 deletions lib/generators/solidus_stripe/install/install_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,18 @@ def install_solidus_starter_frontend_support
template engine.root.join(path), path
end
end

storefront_layout_path = Rails.root.join("app/views/layouts/storefront.html.erb")

if storefront_layout_path.exist?
insert_into_file(
storefront_layout_path.to_s,
"\n <script async src='https://js.stripe.com/v3/'></script>",

@kennyadsl kennyadsl Mar 29, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this approach?

@elia elia Mar 29, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comes straight outta importmaps-rails https://github.com/rails/importmap-rails/blob/main/lib/install/install.rb#L1-L9 and is in line with Stripe advising to load the JS on every page to better support fraud prevention. The stripe-js imported in .js files on the other hand is just a thin layer that will load this same file if it's not already available, so we can have the global script tag marked as async and at the same time use a comfy import in our JS files.

before: %r{\s*</head>},
)
end

run 'bin/importmap pin @stripe/stripe-js'
end
end

Expand Down
5 changes: 3 additions & 2 deletions ...s_stripe/install/templates/app/javascript/controllers/solidus_stripe_intent_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Controller } from '@hotwired/stimulus'
import { loadStripe } from '@stripe/stripe-js'

export default class extends Controller {
static values = {
Expand All @@ -24,8 +25,8 @@ export default class extends Controller {
return document.querySelector(this.radioSelectorValue)
}

connect() {
this.stripe = Stripe(this.publishableKeyValue)
async connect() {
this.stripe = await loadStripe(this.publishableKeyValue)
this.setupPaymentElement()
}

Expand Down
2 changes: 0 additions & 2 deletions lib/generators/solidus_stripe/install/templates/app/views/checkouts/payment/_stripe.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<script src="https://js.stripe.com/v3/"></script>

<% intent = payment_method.intent_for_order(current_order) %>

<div
Expand Down