Skip to content

A platform for community discussion. Free, open, simple.

FIX: clear push subscriptions on DiscourseConnect single-logout (#39353)

Rafael dos Santos Silva00760f3993d0
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index bae0068219a..6aadd8ea935 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -57,6 +57,7 @@ class SessionController < ApplicationController
data = result.data
if data[:logout]
params[:return_url] = data[:return_sso_url]
+ PushNotificationPusher.clear_subscriptions(current_user) if current_user
destroy
return
end
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index 47479624955..e3a97302b23 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -1664,6 +1664,18 @@ RSpec.describe SessionController do
expect(response.cookies["_t"]).to be_blank
end
+ it "clears all push subscriptions on SSO single-logout" do
+ sign_in(@user)
+ Fabricate(:push_subscription, user: @user)
+ Fabricate(:push_subscription, user: @user)
+
+ @sso.logout = true
+ get "/session/sso_provider",
+ params: Rack::Utils.parse_query(@sso.payload("secretForOverRainbow"))
+
+ expect(@user.push_subscriptions.reload).to be_empty
+ end
+
it "successfully logs out and redirects user to return_sso_url when the user is not logged in" do
@sso.logout = true
get "/session/sso_provider",