github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-08 14:50:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Return 400 when username params is invalid.

Browse Source
This commit is contained in:
Guo Xiang Tan 2019-01-30 16:04:47 +08:00
parent 421d47da1e
commit 60c1cd9f81
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/email_controller.rb
View File

@ -89,6 +89,8 @@ class Admin::EmailController < Admin::AdminController
params.require(:last_seen_at) params.require(:last_seen_at)
params.require(:username) params.require(:username)
user = User.find_by_username(params[:username]) user = User.find_by_username(params[:username])
raise Discourse::InvalidParameters unless user
renderer = Email::Renderer.new(UserNotifications.digest(user, since: params[:last_seen_at])) renderer = Email::Renderer.new(UserNotifications.digest(user, since: params[:last_seen_at]))
render json: MultiJson.dump(html_content: renderer.html, text_content: renderer.text) render json: MultiJson.dump(html_content: renderer.html, text_content: renderer.text)
end end

8
spec/requests/admin/email_controller_spec.rb
View File

@ -175,6 +175,14 @@ describe Admin::EmailController do
expect(response.status).to eq(400) expect(response.status).to eq(400)
end end
it "returns the right response when username is invalid" do
get "/admin/email/preview-digest.json", params: {
last_seen_at: 1.week.ago, username: "somerandomeusername"
}
expect(response.status).to eq(400)
end
it "previews the digest" do it "previews the digest" do
get "/admin/email/preview-digest.json", params: { get "/admin/email/preview-digest.json", params: {
last_seen_at: 1.week.ago, username: admin.username last_seen_at: 1.week.ago, username: admin.username