spree_emails 6.0.0.rc4 → 6.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b36e110ec9015b77d39145f10563eae41ad4c394dd10aaa9f6d4d3bef5a9f76
-  data.tar.gz: '0823eef14071ef5d4daec65492ddbc0ebfa5d1fd900f1a6ab04193ce9781e797'
+  metadata.gz: ea630ade954b2c48e6a43fac3a47575dd665b56fb6983aa76767e12274fcaf31
+  data.tar.gz: 15ece1bb35f725ac704927ba9c3284a88100a98fa193d2fec4db5e88cfa28321
 SHA512:
-  metadata.gz: f48a1be065a0bc1f1f59bb3eab63e020e64095770d4546337e6ea523af40c8564527d3789fc5c6ff8909719a77bf41bd9dc66850b0b84b32ca30b6f5e74a335e
-  data.tar.gz: ee58c5ab0ae6077bea4f2ccf7b2af58b6604bd0e4f9eb4f14a4986e58cc4a6a6c843c3ba654f56addec9137b50902d06dc59547c83661a2f4d98e60d1382d7c5
+  metadata.gz: d2692c4910601a7560781b75f319d06340a587725537d4cee8e70aa43c700e1ec07f0083f9b5a2cf0cd36d82fe7bb40e973fc34f1d07bdbb16100ac2c8a769d9
+  data.tar.gz: 3629776fb76d8a6e1c1685aabb562fb3dbd1e441a9d64f4372bafb5e611627c1ec68534a6d454b5ae6188fcd1b0e1fa07a3041f1ce0c27a2524be7e7d53166d4

data/app/mailers/spree/customer_mailer.rb

@@ -17,6 +17,24 @@ module Spree
       end
     end
 
+    # Asks the person to confirm a data request raised from their account
+    # (`data_request.confirmation_requested`). The link goes to the validated
+    # redirect URL when the storefront supplied one, falling back to the store's
+    # storefront URL, with the confirmation token appended.
+    def data_request_confirmation_email(data_request, confirmation_token, redirect_url: nil)
+      @data_request = data_request
+      @current_store = data_request.store
+      @confirmation_url = append_token(redirect_url.presence || @current_store.storefront_url, confirmation_token)
+      @expires_at = data_request.requested_at + Spree::DataRequest::CONFIRMATION_WINDOW
+
+      with_store_locale(@current_store) do
+        mail_template(
+          { kind: data_request.kind, confirmation_url: @confirmation_url, expires_at: @expires_at.iso8601 },
+          to: data_request.email, store_url: @current_store.storefront_url
+        )
+      end
+    end
+
     # The finished subject access export (GDPR Art. 15). The link is signed
     # and expires with the request, so the file is reachable by the person who
     # asked for it and not by anyone who later reads the mailbox.

data/app/serializers/spree/emails/address_serializer.rb

@@ -1,6 +1,7 @@
 module Spree
   module Emails
     class AddressSerializer < Spree::Api::V3::AddressSerializer
+      _attributes.delete(:owner)
     end
   end
 end

data/app/services/spree/emails/samples/data_request_confirmation.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Emails
+    module Samples
+      class DataRequestConfirmation < Base
+        def variables
+          {
+            kind: Spree::DataRequest::ACCESS,
+            confirmation_url: placeholder_url('account/data-requests/confirm'),
+            expires_at: Spree::DataRequest::CONFIRMATION_WINDOW.from_now.iso8601
+          }
+        end
+      end
+    end
+  end
+end

data/app/subscribers/spree/data_request_confirmation_email_subscriber.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Spree
+  # Asks the person to confirm a request raised from their account, at the
+  # address the request names, before Spree acts on it.
+  class DataRequestConfirmationEmailSubscriber < Spree::Subscriber
+    subscribes_to 'data_request.confirmation_requested'
+
+    def handle(event)
+      data_request = Spree::DataRequest.find_by_prefix_id(event.payload['id'])
+      return unless data_request&.confirmable?
+      return unless data_request.store.prefers_send_consumer_transactional_emails?
+
+      CustomerMailer.data_request_confirmation_email(
+        data_request,
+        event.payload['confirmation_token'],
+        redirect_url: event.payload['redirect_url']
+      ).deliver_later
+    end
+  end
+end

data/app/views/spree/customer_mailer/data_request_confirmation_email.liquid

@@ -0,0 +1,22 @@
+---
+subject: "{{ store.name }} {% if kind == 'erasure' %}{{ 'customer_mailer.data_request_confirmation_email.erasure.subject' | t }}{% else %}{{ 'customer_mailer.data_request_confirmation_email.access.subject' | t }}{% endif %}"
+---
+<mj-section>
+  <mj-column css-class="hero">
+    {% if kind == 'erasure' %}
+      <mj-text mj-class="heading">{{ 'customer_mailer.data_request_confirmation_email.erasure.subject' | t }}</mj-text>
+      <mj-text mj-class="greeting">{{ 'customer_mailer.data_request_confirmation_email.greeting' | t }}</mj-text>
+      <mj-text mj-class="lead">{{ 'customer_mailer.data_request_confirmation_email.erasure.instructions' | t }}</mj-text>
+    {% else %}
+      <mj-text mj-class="heading">{{ 'customer_mailer.data_request_confirmation_email.access.subject' | t }}</mj-text>
+      <mj-text mj-class="greeting">{{ 'customer_mailer.data_request_confirmation_email.greeting' | t }}</mj-text>
+      <mj-text mj-class="lead">{{ 'customer_mailer.data_request_confirmation_email.access.instructions' | t }}</mj-text>
+    {% endif %}
+    <mj-button href="{{ confirmation_url }}">{{ 'customer_mailer.data_request_confirmation_email.action' | t }}</mj-button>
+    {% if expires_at %}
+      {% assign expires_on = expires_at | date: 'long' %}
+      <mj-text mj-class="note">{{ 'customer_mailer.data_request_confirmation_email.expiry_notice' | t: date: expires_on }}</mj-text>
+    {% endif %}
+    <mj-text mj-class="note" padding="16px 0 0">{{ 'customer_mailer.data_request_confirmation_email.ignore_notice' | t }}</mj-text>
+  </mj-column>
+</mj-section>

data/config/locales/en.yml

@@ -18,6 +18,17 @@ en:
         ignore_notice: If you did not request a copy of your data, please contact us.
         instructions: Your copy of the personal data we hold about you is ready. Use the button below to download it.
         subject: Your Data Is Ready to Download
+      data_request_confirmation_email:
+        access:
+          instructions: We received a request for a copy of the personal data we hold about you. Once you confirm it, we will email you a link to download the file.
+          subject: Confirm Your Data Request
+        action: Review and Confirm
+        erasure:
+          instructions: We received a request to permanently erase the personal data we hold about you, including the names and addresses on your past orders. This cannot be undone.
+          subject: Confirm Your Erasure Request
+        expiry_notice: This link expires on %{date}.
+        greeting: Hello,
+        ignore_notice: If you did not make this request, you can ignore this email and nothing will happen.
       password_reset_email:
         action: Reset Password
         expiry_notice: This password reset link will expire shortly. If you did not request this, no action is needed.

data/lib/spree/emails/engine.rb

@@ -28,6 +28,7 @@ module Spree
           'spree/digital_asset_mailer/files_ready_email' => 'Spree::Emails::Samples::Downloads',
           'spree/customer_mailer/password_reset_email' => 'Spree::Emails::Samples::PasswordReset',
           'spree/customer_mailer/data_export_email' => 'Spree::Emails::Samples::DataExport',
+          'spree/customer_mailer/data_request_confirmation_email' => 'Spree::Emails::Samples::DataRequestConfirmation',
           'spree/newsletter_mailer/email_confirmation' => 'Spree::Emails::Samples::NewsletterConfirmation',
           'spree/company_mailer/invitation_email' => 'Spree::Emails::Samples::CompanyInvitation'
         }.each { |key, sample| Spree.editable_email_templates.register(key, kind: :email, sample: sample) }
@@ -48,6 +49,7 @@ module Spree
           Spree::NewsletterSubscriberEmailSubscriber,
           Spree::CustomerEmailSubscriber,
           Spree::DataRequestEmailSubscriber,
+          Spree::DataRequestConfirmationEmailSubscriber,
           Spree::CompanyEmailSubscriber,
           Spree::DigitalAssetEmailSubscriber,
           Spree::SellerEmailSubscriber

data/lib/spree/emails/previews/customer_preview.rb

@@ -12,6 +12,15 @@ class Spree::CustomerPreview < ActionMailer::Preview
     )
   end
 
+  def data_request_confirmation_email
+    data_request = Spree::DataRequest.new(
+      store: Spree::PreviewData.store(locale), kind: Spree::DataRequest::ERASURE,
+      email: Spree::PreviewData.customer.email, requested_at: Time.current
+    )
+
+    Spree::CustomerMailer.data_request_confirmation_email(data_request, 'preview-token')
+  end
+
   def data_export_email
     Spree::CustomerMailer.data_export_email(Spree::DataRequest.access.with_status(:completed).last)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_emails
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc4
+  version: 6.0.0.rc6
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-19 00:00:00.000000000 Z
+date: 2026-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc4
+        version: 6.0.0.rc6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc4
+        version: 6.0.0.rc6
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - app/services/spree/emails/samples/base.rb
 - app/services/spree/emails/samples/company_invitation.rb
 - app/services/spree/emails/samples/data_export.rb
+- app/services/spree/emails/samples/data_request_confirmation.rb
 - app/services/spree/emails/samples/downloads.rb
 - app/services/spree/emails/samples/fulfillment.rb
 - app/services/spree/emails/samples/newsletter_confirmation.rb
@@ -100,6 +101,7 @@ files:
 - app/services/spree/emails/samples/return.rb
 - app/subscribers/spree/company_email_subscriber.rb
 - app/subscribers/spree/customer_email_subscriber.rb
+- app/subscribers/spree/data_request_confirmation_email_subscriber.rb
 - app/subscribers/spree/data_request_email_subscriber.rb
 - app/subscribers/spree/digital_asset_email_subscriber.rb
 - app/subscribers/spree/fulfillment_email_subscriber.rb
@@ -110,6 +112,7 @@ files:
 - app/subscribers/spree/seller_email_subscriber.rb
 - app/views/spree/company_mailer/invitation_email.liquid
 - app/views/spree/customer_mailer/data_export_email.liquid
+- app/views/spree/customer_mailer/data_request_confirmation_email.liquid
 - app/views/spree/customer_mailer/password_reset_email.liquid
 - app/views/spree/digital_asset_mailer/files_ready_email.liquid
 - app/views/spree/fulfillment_mailer/fulfilled_email.liquid
@@ -190,9 +193,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.rc4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.rc6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc4
+  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc6
 post_install_message:
 rdoc_options: []
 require_paths: