Skip to content

armgit / spree

Public Imported from GitHub
0

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.

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.rb
index 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 do
end
describe '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 }
end
diff --git a/core/app/models/spree/ability.rb b/core/app/models/spree/ability.rb
index 18809d2afb..a263ce962d 100644
--- a/core/app/models/spree/ability.rb
+++ b/core/app/models/spree/ability.rb
@@ -57,7 +57,7 @@ module Spree
alias_action :create, :update, :destroy, to: :modify
end
- def apply_admin_permissions(user, options)
+ def apply_admin_permissions(_user, _options)
can :manage, :all
cannot :cancel, Spree::Order
can :cancel, Spree::Order, &:allow_cancel?
@@ -65,7 +65,7 @@ module Spree
cannot [:edit, :update], Spree::ReimbursementType, mutable: false
end
- def apply_user_permissions(user, options)
+ def apply_user_permissions(user, _options)
can :read, ::Spree::Country
can :read, ::Spree::OptionType
can :read, ::Spree::OptionValue
@@ -96,6 +96,7 @@ module Spree
can [:create, :update, :destroy], ::Spree::WishedItem do |wished_item|
wished_item.wishlist.user == user
end
+ can :accept, Spree::Invitation, invitee_id: [user.id, nil], invitee_type: user.class.name, status: 'pending'
end
def protect_admin_role
diff --git a/core/app/models/spree/invitation.rb b/core/app/models/spree/invitation.rb
index 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 do
state :accepted do
+ validate :accept_invitation_within_time_limit
validates :invitee, presence: true
end
@@ -142,5 +143,11 @@ module Spree
self.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
+ end
end
end
diff --git a/core/spec/models/spree/invitation_spec.rb b/core/spec/models/spree/invitation_spec.rb
index 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 do
end
end
+ 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' do
it 'is invalid' do
create(:admin_user, email: '[email protected]')