A platform for community discussion. Free, open, simple.
DEV: Add missing actions to requires_login in UsersController (#38584)
Isaac Janzen35689bcee18e
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rbindex 44efc166dbb..ccddf6e16d8 100644--- a/app/controllers/users_controller.rb+++ b/app/controllers/users_controller.rb@@ -40,6 +40,11 @@ class UsersController < ApplicationControllerreset_recent_searchesuser_menu_bookmarksuser_menu_messages+ update_primary_email+ destroy_email+ badge_title+ remove_password+ private_message_topic_tracking_statetoggle_anon]diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex ae26ff568dd..764bcb0c1dc 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -194,9 +194,10 @@ RSpec.describe UsersController doenddescribe "#remove_password" do- it "responds forbidden when not logged in" do+ it "requires login" doput "/u/#{user.username}/remove-password.json"expect(response.status).to eq(403)+ expect(response.parsed_body["error_type"]).to eq("not_logged_in")endcontext "when logged in with no associated account, no passkeys" do@@ -3426,6 +3427,12 @@ RSpec.describe UsersController dofab!(:badge)let(:user_badge) { BadgeGranter.grant(badge, user1) }+ it "requires login" do+ put "/u/#{user1.username}/preferences/badge_title.json", params: { user_badge_id: 1 }+ expect(response.status).to eq(403)+ expect(response.parsed_body["error_type"]).to eq("not_logged_in")+ end+it "sets the user's title to the badge name if it is titleable" dosign_in(user1)@@ -4330,41 +4337,55 @@ RSpec.describe UsersController dolet(:user_email) { user1.primary_email }fab!(:other_email) { Fabricate(:secondary_email, user: user1) }- before do- SiteSetting.email_editable = true-- sign_in(user1)+ it "requires login" do+ put "/u/#{user1.username}/preferences/primary-email.json",+ params: {+ email: other_email.email,+ }+ expect(response.status).to eq(403)+ expect(response.parsed_body["error_type"]).to eq("not_logged_in")end- it "changes user's primary email" do- put "/u/#{user1.username}/preferences/primary-email.json", params: { email: user_email.email }- expect(response.status).to eq(200)- expect(user_email.reload.primary).to eq(true)- expect(other_email.reload.primary).to eq(false)-- event =- DiscourseEvent- .track_events do- expect {- put "/u/#{user1.username}/preferences/primary-email.json",- params: {- email: other_email.email,- }- }.to change {- UserHistory.where(- action: UserHistory.actions[:update_email],- acting_user_id: user1.id,- ).count- }.by(1)- end- .last+ context "when logged in" do+ before do+ SiteSetting.email_editable = true- expect(response.status).to eq(200)- expect(user_email.reload.primary).to eq(false)- expect(other_email.reload.primary).to eq(true)+ sign_in(user1)+ end++ it "changes user's primary email" do+ put "/u/#{user1.username}/preferences/primary-email.json",+ params: {+ email: user_email.email,+ }+ expect(response.status).to eq(200)+ expect(user_email.reload.primary).to eq(true)+ expect(other_email.reload.primary).to eq(false)++ event =+ DiscourseEvent+ .track_events do+ expect {+ put "/u/#{user1.username}/preferences/primary-email.json",+ params: {+ email: other_email.email,+ }+ }.to change {+ UserHistory.where(+ action: UserHistory.actions[:update_email],+ acting_user_id: user1.id,+ ).count+ }.by(1)+ end+ .last++ expect(response.status).to eq(200)+ expect(user_email.reload.primary).to eq(false)+ expect(other_email.reload.primary).to eq(true)- expect(event[:event_name]).to eq(:user_updated)- expect(event[:params].first).to eq(user1)+ expect(event[:event_name]).to eq(:user_updated)+ expect(event[:params].first).to eq(user1)+ endendend@@ -4372,85 +4393,93 @@ RSpec.describe UsersController dofab!(:user_email) { user1.primary_email }fab!(:other_email) { Fabricate(:secondary_email, user: user1) }- before do- SiteSetting.email_editable = true-- sign_in(user1)+ it "requires login" do+ delete "/u/#{user1.username}/preferences/email.json", params: { email: other_email.email }+ expect(response.status).to eq(403)+ expect(response.parsed_body["error_type"]).to eq("not_logged_in")end- it "can destroy secondary emails" do- delete "/u/#{user1.username}/preferences/email.json", params: { email: user_email.email }- expect(response.status).to eq(428)- expect(user1.reload.user_emails.pluck(:email)).to contain_exactly(- user_email.email,- other_email.email,- )+ context "when logged in" do+ before do+ SiteSetting.email_editable = true- event =- DiscourseEvent- .track_events do- expect {- delete "/u/#{user1.username}/preferences/email.json",- params: {- email: other_email.email,- }- }.to change {- UserHistory.where(- action: UserHistory.actions[:destroy_email],- acting_user_id: user1.id,- ).count- }.by(1)- end- .last+ sign_in(user1)+ end- expect(response.status).to eq(200)- expect(user1.reload.user_emails.pluck(:email)).to contain_exactly(user_email.email)+ it "can destroy secondary emails" do+ delete "/u/#{user1.username}/preferences/email.json", params: { email: user_email.email }+ expect(response.status).to eq(428)+ expect(user1.reload.user_emails.pluck(:email)).to contain_exactly(+ user_email.email,+ other_email.email,+ )- expect(event[:event_name]).to eq(:user_updated)- expect(event[:params].first).to eq(user1)- end+ event =+ DiscourseEvent+ .track_events do+ expect {+ delete "/u/#{user1.username}/preferences/email.json",+ params: {+ email: other_email.email,+ }+ }.to change {+ UserHistory.where(+ action: UserHistory.actions[:destroy_email],+ acting_user_id: user1.id,+ ).count+ }.by(1)+ end+ .last++ expect(response.status).to eq(200)+ expect(user1.reload.user_emails.pluck(:email)).to contain_exactly(user_email.email)++ expect(event[:event_name]).to eq(:user_updated)+ expect(event[:params].first).to eq(user1)+ end++ it "can destroy unconfirmed emails" do+ request_1 =+ EmailChangeRequest.create!(+ user: user1,+ new_email: user_email.email,+ change_state: EmailChangeRequest.states[:authorizing_new],+ )- it "can destroy unconfirmed emails" do- request_1 =EmailChangeRequest.create!(user: user1,- new_email: user_email.email,+ new_email: other_email.email,change_state: EmailChangeRequest.states[:authorizing_new],)- EmailChangeRequest.create!(- user: user1,- new_email: other_email.email,- change_state: EmailChangeRequest.states[:authorizing_new],- )-- EmailChangeRequest.create!(- user: user1,- new_email: other_email.email,- change_state: EmailChangeRequest.states[:authorizing_new],- )+ EmailChangeRequest.create!(+ user: user1,+ new_email: other_email.email,+ change_state: EmailChangeRequest.states[:authorizing_new],+ )- delete "/u/#{user1.username}/preferences/email.json", params: { email: other_email.email }+ delete "/u/#{user1.username}/preferences/email.json", params: { email: other_email.email }- expect(user1.user_emails.pluck(:email)).to contain_exactly(- user_email.email,- other_email.email,- )- expect(user1.email_change_requests).to contain_exactly(request_1)- end+ expect(user1.user_emails.pluck(:email)).to contain_exactly(+ user_email.email,+ other_email.email,+ )+ expect(user1.email_change_requests).to contain_exactly(request_1)+ end- it "destroys associated email tokens and email change requests" do- new_email = "[email protected]"- updater = EmailUpdater.new(guardian: user1.guardian, user: user1)- updater.change_to(new_email)+ it "destroys associated email tokens and email change requests" do+ new_email = "[email protected]"+ updater = EmailUpdater.new(guardian: user1.guardian, user: user1)+ updater.change_to(new_email)- email_token = updater.change_req.new_email_token- expect(email_token).to be_present+ email_token = updater.change_req.new_email_token+ expect(email_token).to be_present- delete "/u/#{user1.username}/preferences/email.json", params: { email: new_email }+ delete "/u/#{user1.username}/preferences/email.json", params: { email: new_email }- expect(EmailToken.find_by(id: email_token.id)).to eq(nil)- expect(EmailChangeRequest.find_by(id: updater.change_req.id)).to eq(nil)+ expect(EmailToken.find_by(id: email_token.id)).to eq(nil)+ expect(EmailChangeRequest.find_by(id: updater.change_req.id)).to eq(nil)+ endendend@@ -7438,26 +7467,34 @@ RSpec.describe UsersController do).topicend- before { sign_in(user_2) }-- it "does not allow an unauthorized user to access the state of another user" do+ it "requires login" doget "/u/#{user1.username}/private-message-topic-tracking-state.json"-expect(response.status).to eq(403)+ expect(response.parsed_body["error_type"]).to eq("not_logged_in")end- it "returns the right response" do- get "/u/#{user_2.username}/private-message-topic-tracking-state.json"+ context "when logged in" do+ before { sign_in(user_2) }- expect(response.status).to eq(200)+ it "does not allow an unauthorized user to access the state of another user" do+ get "/u/#{user1.username}/private-message-topic-tracking-state.json"++ expect(response.status).to eq(403)+ end++ it "returns the right response" do+ get "/u/#{user_2.username}/private-message-topic-tracking-state.json"- topic_state = response.parsed_body.first+ expect(response.status).to eq(200)- expect(topic_state["topic_id"]).to eq(private_message.id)- expect(topic_state["highest_post_number"]).to eq(1)- expect(topic_state["last_read_post_number"]).to eq(nil)- expect(topic_state["notification_level"]).to eq(NotificationLevels.all[:watching])- expect(topic_state["group_ids"]).to eq([])+ topic_state = response.parsed_body.first++ expect(topic_state["topic_id"]).to eq(private_message.id)+ expect(topic_state["highest_post_number"]).to eq(1)+ expect(topic_state["last_read_post_number"]).to eq(nil)+ expect(topic_state["notification_level"]).to eq(NotificationLevels.all[:watching])+ expect(topic_state["group_ids"]).to eq([])+ endendend