DEV: Fix broken specs related to the recent server session changes

Author: Flink

app/controllers/discourse_activity_pub/authorization_controller.rb

@@ -190,11 +190,11 @@ def ensure_authorization
     end
 
     def get_session_value(key)
-      secure_session[key]
+      server_session[key]
     end
 
     def set_session_value(key, value)
-      secure_session.set(key, value, expires: SESSION_EXPIRY_MINUTES.minutes)
+      server_session.set(key, value, expires: SESSION_EXPIRY_MINUTES.minutes)
     end
 
     def redirect_params

spec/requests/discourse_activity_pub/authorization_controller_spec.rb

@@ -121,7 +121,7 @@
 
           it "sets the domain as the verified domain in the session" do
             post "/ap/auth/verify", params: { domain: external_domain1, auth_type: "mastodon" }
-            expect(read_secure_session[described_class::DOMAIN_SESSION_KEY]).to eq(external_domain1)
+            expect(server_session[described_class::DOMAIN_SESSION_KEY]).to eq(external_domain1)
           end
 
           it "creates a client" do
@@ -158,7 +158,7 @@
 
         it "does not set the domain in the session" do
           post "/ap/auth/verify", params: { domain: external_domain2, auth_type: "mastodon" }
-          expect(read_secure_session[described_class::DOMAIN_SESSION_KEY]).to eq(nil)
+          expect(server_session[described_class::DOMAIN_SESSION_KEY]).to eq(nil)
         end
 
         it "does not create a client" do
@@ -211,7 +211,7 @@
 
         it "sets the domain as the verified domain in the session" do
           post "/ap/auth/verify", params: { domain: external_domain1, auth_type: "discourse" }
-          expect(read_secure_session[described_class::DOMAIN_SESSION_KEY]).to eq(external_domain1)
+          expect(server_session[described_class::DOMAIN_SESSION_KEY]).to eq(external_domain1)
         end
 
         it "creates a client" do
@@ -239,10 +239,9 @@
 
     context "with a verified domain in the session" do
       before do
-        write_secure_session(
-          DiscourseActivityPub::AuthorizationController::DOMAIN_SESSION_KEY,
-          external_domain1,
-        )
+        server_session[
+          DiscourseActivityPub::AuthorizationController::DOMAIN_SESSION_KEY
+        ] = external_domain1
       end
 
       context "with an invalid auth_type" do
@@ -288,15 +287,15 @@
           get "/ap/auth/authorize/discourse"
           expect(
             DiscourseActivityPubAuthorization.exists?(
-              read_secure_session[described_class::AUTHORIZATION_SESSION_KEY].to_i,
+              server_session[described_class::AUTHORIZATION_SESSION_KEY].to_i,
             ),
           ).to eq(true)
         end
 
         it "saves a nonce to the session" do
           ENV["ACTIVITY_PUB_TEST_RANDOM_HEX"] = "123"
           get "/ap/auth/authorize/discourse"
-          expect(read_secure_session[described_class::NONCE_SESSION_KEY]).to eq("123")
+          expect(server_session[described_class::NONCE_SESSION_KEY]).to eq("123")
         end
 
         it "redirects to the authorize url for the app" do
@@ -323,10 +322,9 @@
       let!(:authorization) { Fabricate(:discourse_activity_pub_authorization_mastodon, user: user) }
 
       before do
-        write_secure_session(
-          DiscourseActivityPub::AuthorizationController::AUTHORIZATION_SESSION_KEY,
-          authorization.id,
-        )
+        server_session[
+          DiscourseActivityPub::AuthorizationController::AUTHORIZATION_SESSION_KEY
+        ] = authorization.id
       end
 
       context "with mastodon" do
@@ -436,20 +434,18 @@
           end
 
           before do
-            write_secure_session(
-              DiscourseActivityPub::AuthorizationController::AUTHORIZATION_SESSION_KEY,
-              authorization.id,
-            )
+            server_session[
+              DiscourseActivityPub::AuthorizationController::AUTHORIZATION_SESSION_KEY
+            ] = authorization.id
           end
 
           context "with a nonce in the session" do
             let!(:nonce) { "12345" }
 
             before do
-              write_secure_session(
-                DiscourseActivityPub::AuthorizationController::NONCE_SESSION_KEY,
-                nonce,
-              )
+              server_session[
+                DiscourseActivityPub::AuthorizationController::NONCE_SESSION_KEY
+              ] = nonce
             end
 
             context "when the callback has a valid payload" do