A platform for community discussion. Free, open, simple.
FIX: Allow logged-in users to redeem invites when new registrations are disabled (#42026)
chapoiba63d427fd88
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rbindex 6416bae07cc..29ba52c4716 100644--- a/app/controllers/invites_controller.rb+++ b/app/controllers/invites_controller.rb@@ -681,6 +681,7 @@ class InvitesController < ApplicationControllerdef ensure_new_registrations_allowedreturn if SiteSetting.allow_new_registrations+ return if current_userflash[:error] = I18n.t("login.new_registrations_disabled")render layout: "no_ember"diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rbindex bfe25aec3c7..6d7dbdb361e 100644--- a/spec/requests/invites_controller_spec.rb+++ b/spec/requests/invites_controller_spec.rb@@ -311,6 +311,32 @@ RSpec.describe InvitesController doendend+ context "when new registrations are disabled" do+ fab!(:group)++ before do+ SiteSetting.allow_new_registrations = false+ invite.update!(email: nil, max_redemptions_allowed: 10)+ InvitedGroup.create!(invite: invite, group: group)+ end++ it "blocks anonymous visitors with the registration-disabled error" do+ get "/invites/#{invite.invite_key}"+ expect(response.status).to eq(200)+ expect(response.body).to have_tag(:body, with: { class: "no-ember" })+ expect(response.body).to include(I18n.t("login.new_registrations_disabled"))+ end++ it "still shows the accept invite page to an existing logged-in user" do+ sign_in(user)++ get "/invites/#{invite.invite_key}"+ expect(response.status).to eq(200)+ expect(response.body).not_to have_tag(:body, with: { class: "no-ember" })+ expect(response.body).not_to include(I18n.t("login.new_registrations_disabled"))+ end+ end+it "fails if invite does not exist" doget "/invites/missing"expect(response.status).to eq(200)@@ -1698,6 +1724,25 @@ RSpec.describe InvitesController doexpect(invite.redeemed?).to be_falseyexpect(response.body).to include(I18n.t("login.new_registrations_disabled"))end++ context "when the user is already logged in" do+ fab!(:group)+ fab!(:invite) { Fabricate(:invite, email: nil, max_redemptions_allowed: 10) }++ before do+ group.add_owner(invite.invited_by)+ InvitedGroup.create!(invite: invite, group: group)+ sign_in(user)+ end++ it "redeems the invite and adds the existing user to the group" do+ put "/invites/show/#{invite.invite_key}.json", params: { id: invite.invite_key }+ expect(response.status).to eq(200)+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.existing_user_success"))+ expect(invite.reload.invited_users.map(&:user)).to include(user)+ expect(user.reload.groups).to include(group)+ end+ endendcontext "when user is already logged in" do