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
Add `Spree::Invitation#accept` ability for users (#12715)
Damian Kaczmarczyk52936170bc87
diff --git a/admin/spec/controllers/spree/admin/invitations_controller_spec.rb b/admin/spec/controllers/spree/admin/invitations_controller_spec.rbindex a817ef29f6..4ae6ad32b6 100644--- a/admin/spec/controllers/spree/admin/invitations_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/invitations_controller_spec.rb@@ -226,12 +226,11 @@ RSpec.describe Spree::Admin::InvitationsController, type: :controller doenddescribe 'PUT #accept' do- stub_authorization!-let(:invitation) { create(:invitation, inviter: admin_user, invitee: another_user, resource: store) }let(:another_user) { create(:user) }before do+ allow(controller).to receive(:current_ability).and_return(Spree::Dependencies.ability_class.constantize.new(another_user))allow(controller).to receive(:try_spree_current_user).and_return(another_user)put :accept, params: { id: invitation.id }enddiff --git a/core/app/models/spree/ability.rb b/core/app/models/spree/ability.rbindex 18809d2afb..a263ce962d 100644--- a/core/app/models/spree/ability.rb+++ b/core/app/models/spree/ability.rb@@ -57,7 +57,7 @@ module Spreealias_action :create, :update, :destroy, to: :modifyend- def apply_admin_permissions(user, options)+ def apply_admin_permissions(_user, _options)can :manage, :allcannot :cancel, Spree::Ordercan :cancel, Spree::Order, &:allow_cancel?@@ -65,7 +65,7 @@ module Spreecannot [:edit, :update], Spree::ReimbursementType, mutable: falseend- def apply_user_permissions(user, options)+ def apply_user_permissions(user, _options)can :read, ::Spree::Countrycan :read, ::Spree::OptionTypecan :read, ::Spree::OptionValue@@ -96,6 +96,7 @@ module Spreecan [:create, :update, :destroy], ::Spree::WishedItem do |wished_item|wished_item.wishlist.user == userend+ can :accept, Spree::Invitation, invitee_id: [user.id, nil], invitee_type: user.class.name, status: 'pending'enddef protect_admin_rolediff --git a/core/app/models/spree/invitation.rb b/core/app/models/spree/invitation.rbindex 583eef75ff..c8152385af 100644--- a/core/app/models/spree/invitation.rb+++ b/core/app/models/spree/invitation.rb@@ -38,6 +38,7 @@ module Spree#state_machine initial: :pending, attribute: :status dostate :accepted do+ validate :accept_invitation_within_time_limitvalidates :invitee, presence: trueend@@ -142,5 +143,11 @@ module Spreeself.invitee = Spree.admin_user_class.find_by(email: email)end++ def accept_invitation_within_time_limit+ if Time.current > expires_at+ errors.add(:base, 'Invitation expired')+ end+ endendenddiff --git a/core/spec/models/spree/invitation_spec.rb b/core/spec/models/spree/invitation_spec.rbindex 81cf44ec50..da0d3399c7 100644--- a/core/spec/models/spree/invitation_spec.rb+++ b/core/spec/models/spree/invitation_spec.rb@@ -19,6 +19,17 @@ RSpec.describe Spree::Invitation, type: :model doendend+ context 'when invitation is accepted after expiration' do+ it 'is invalid' do+ invitation.expires_at = 1.day.ago+ expect(invitation.accept).to be_falsey++ expect(invitation.accepted_at).not_to be_present+ expect(invitation.status).to eq('pending')+ expect(invitation.errors[:base]).to include('Invitation expired')+ end+ end+context 'when invitee already exists in the store' doit 'is invalid' docreate(:admin_user, email: '[email protected]')