Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Simplify invitations, replace revoking with soft delete
Damian Legawiec7e3a6810f99d
diff --git a/admin/app/controllers/spree/admin/invitations_controller.rb b/admin/app/controllers/spree/admin/invitations_controller.rbindex 460f0f24e9..1ac740d01c 100644--- a/admin/app/controllers/spree/admin/invitations_controller.rb+++ b/admin/app/controllers/spree/admin/invitations_controller.rb@@ -4,7 +4,7 @@ module Spreeskip_before_action :authorize_admin, only: [:show]before_action :load_invitation_resource- before_action :load_invitation, only: [:accept, :revoke, :destroy]+ before_action :load_invitation, only: [:accept, :destroy]before_action :load_roles, only: [:new, :create]layout :choose_layout@@ -63,14 +63,6 @@ module Spreeredirect_to spree.admin_invitations_path, notice: Spree.t('invitation_accepted')end- # PUT /admin/invitations/:id/revoke- def revoke- authorize! :update, @invitation-- @invitation.revoke!- redirect_to spree.admin_invitations_path, notice: Spree.t('invitation_revoked')- end-# PUT /admin/invitations/:id/resenddef resend@invitation = try_spree_current_user.invitations.pending.not_expired.find(params[:id])diff --git a/admin/app/views/spree/admin/invitations/_invitation.html.erb b/admin/app/views/spree/admin/invitations/_invitation.html.erbindex 18d323d512..70137f47c1 100644--- a/admin/app/views/spree/admin/invitations/_invitation.html.erb+++ b/admin/app/views/spree/admin/invitations/_invitation.html.erb@@ -13,8 +13,8 @@<td class="w-20"><% if invitation.accepted? %><span class="badge badge-success"><%= Spree.t(:accepted) %></span>- <% elsif invitation.revoked? %>- <span class="badge badge-danger"><%= Spree.t(:revoked) %></span>+ <% elsif invitation.deleted? %>+ <span class="badge badge-danger"><%= Spree.t(:deleted) %></span><% elsif invitation.expired? %><span class="badge badge-warning"><%= Spree.t(:expired) %></span><% else %>@@ -40,9 +40,9 @@<%= link_to_with_icon 'send', Spree.t('actions.resend'), spree.resend_admin_invitation_path(invitation),class: "dropdown-item",data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>- <%= link_to_with_icon 'trash', Spree.t('actions.revoke'), spree.revoke_admin_invitation_path(invitation),+ <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_invitation_path(invitation),class: "dropdown-item btn-danger",- data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>+ data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } if can?(:destroy, invitation) %></div></div><% end %>diff --git a/admin/config/routes.rb b/admin/config/routes.rbindex d6b41c40e4..264b0f0b31 100644--- a/admin/config/routes.rb+++ b/admin/config/routes.rb@@ -217,10 +217,9 @@ Spree::Core::Engine.add_routes do# account managementresources :roles, except: :show- resources :invitations, except: :destroy do+ resources :invitations domember doput :accept- put :revokeput :resendendenddiff --git a/core/app/models/spree/invitation.rb b/core/app/models/spree/invitation.rbindex ea372b63c0..01b4f33699 100644--- a/core/app/models/spree/invitation.rb+++ b/core/app/models/spree/invitation.rb@@ -1,6 +1,7 @@module Spreeclass Invitation < Basehas_secure_token+ acts_as_paranoid## Virtual Attributes@@ -31,7 +32,6 @@ module Spree#scope :pending, -> { where(status: 'pending') }scope :accepted, -> { where(status: 'accepted') }- scope :revoked, -> { where(status: 'revoked') }scope :not_expired, -> { where('expires_at > ?', Time.current) }#@@ -42,11 +42,6 @@ module Spreetransition :pending => :acceptedendafter_transition to: :accepted, do: [:set_accepted_at, :send_acceptance_notification]-- event :revoke do- transition :pending => :revoked- end- after_transition to: :revoked, do: [:set_revoked_at]end#@@ -77,7 +72,7 @@ module Spreeenddef resend!- return if expired? || revoked? || accepted?+ return if expired? || deleted? || accepted?send_invitation_emailend@@ -117,9 +112,5 @@ module Spreedef set_accepted_atupdate!(accepted_at: Time.current)end-- def set_revoked_at- update!(revoked_at: Time.current)- endendenddiff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex d5caaa40e1..d212db88e6 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -557,7 +557,6 @@ en:reject: Rejectresend: Resendresolve: Mark as resolved- revoke: Revokesave: Saveselect_file: Select filesend_invitation: Send invitationdiff --git a/core/db/migrate/20250410061306_create_spree_invitations.rb b/core/db/migrate/20250410061306_create_spree_invitations.rbindex e1f1272f34..e49f015123 100644--- a/core/db/migrate/20250410061306_create_spree_invitations.rb+++ b/core/db/migrate/20250410061306_create_spree_invitations.rb@@ -3,15 +3,15 @@ class CreateSpreeInvitations < ActiveRecord::Migration[7.2]create_table :spree_invitations do |t|t.string :email, index: true, null: falset.string :token, index: { unique: true }, null: false- t.string :status, null: false+ t.string :status, null: false, index: truet.references :resource, polymorphic: true, index: true, null: false # eg. Store, Vendor, Accountt.references :inviter, polymorphic: true, index: true, null: falset.references :invitee, polymorphic: true, index: truet.datetime :accepted_at- t.datetime :revoked_at- t.datetime :expires_at+ t.datetime :expires_at, index: true+ t.datetime :deleted_at, index: truet.timestampsenddiff --git a/core/spec/models/spree/invitation_spec.rb b/core/spec/models/spree/invitation_spec.rbindex 70ec4cf4d5..f157cabae1 100644--- a/core/spec/models/spree/invitation_spec.rb+++ b/core/spec/models/spree/invitation_spec.rb@@ -66,17 +66,6 @@ RSpec.describe Spree::Invitation, type: :model doexpect { invitation.accept }.to have_enqueued_job(ActionMailer::MailDeliveryJob)endend-- context 'when revoking an invitation' do- it 'changes status to revoked' do- invitation.revoke- expect(invitation.status).to eq('revoked')- end-- it 'sets revoked_at timestamp' do- expect { invitation.revoke }.to change { invitation.revoked_at }.from(nil)- end- endenddescribe '#expired?' do@@ -104,12 +93,6 @@ RSpec.describe Spree::Invitation, type: :model doinvitation.resend!end- it 'does not send invitation email if invitation is revoked' do- invitation.revoke- expect(invitation).not_to receive(:send_invitation_email)- invitation.resend!- end-it 'does not send invitation email if invitation is accepted' doinvitation.acceptexpect(invitation).not_to receive(:send_invitation_email)