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

FIX: Scope the cn to the subfolder

Browse Source
This commit is contained in:
Robin Ward
2018-06-28 11:03:36 -04:00
parent 2c971c41f6
commit fd7bb8e656
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/widgets/notification-item.js.es6
View File

@ -143,7 +143,8 @@ createWidget("notification-item", {
const id = this.attrs.id; const id = this.attrs.id;
setTransientHeader("Discourse-Clear-Notifications", id); setTransientHeader("Discourse-Clear-Notifications", id);
if (document && document.cookie) { if (document && document.cookie) {
document.cookie = `cn=${id}; expires=Fri, 31 Dec 9999 23:59:59 GMT`; let path = Discourse.BaseUri || "/";
document.cookie = `cn=${id}; path=${path}; expires=Fri, 31 Dec 9999 23:59:59 GMT`;
} }
if (wantsNewWindow(e)) { if (wantsNewWindow(e)) {
return; return;

4
app/controllers/application_controller.rb
View File

@ -257,7 +257,9 @@ class ApplicationController < ActionController::Base
Notification.read(current_user, notification_ids) Notification.read(current_user, notification_ids)
current_user.reload current_user.reload
current_user.publish_notifications_state current_user.publish_notifications_state
cookies.delete('cn') cookie_args = {}
cookie_args[:path] = Discourse.base_uri if Discourse.base_uri.present?
cookies.delete('cn', cookie_args)
end end
end end
end end

2
spec/requests/topics_controller_spec.rb
View File

@ -1281,6 +1281,7 @@ RSpec.describe TopicsController do
describe 'clear_notifications' do describe 'clear_notifications' do
it 'correctly clears notifications if specified via cookie' do it 'correctly clears notifications if specified via cookie' do
Discourse.stubs(:base_uri).returns("/eviltrout")
notification = Fabricate(:notification) notification = Fabricate(:notification)
sign_in(notification.user) sign_in(notification.user)
@ -1290,6 +1291,7 @@ RSpec.describe TopicsController do
expect(response.status).to eq(200) expect(response.status).to eq(200)
expect(response.cookies['cn']).to eq(nil) expect(response.cookies['cn']).to eq(nil)
expect(response.headers['Set-Cookie']).to match(/^cn=;.*path=\/eviltrout/)
notification.reload notification.reload
expect(notification.read).to eq(true) expect(notification.read).to eq(true)