From 6f1d8b2d3889137fc706536c53d4a335e4bd1884 Mon Sep 17 00:00:00 2001
From: Tom Staubitz <thomas.staubitz@hpi.uni-potsdam.de>
Date: Tue, 27 Dec 2016 07:48:59 +0100
Subject: [PATCH] Marked more locations that might require to be changed when
 we switch from session to LtiParameters Object

---
 app/controllers/application_controller.rb    | 1 -
 app/controllers/concerns/lti.rb              | 1 +
 spec/concerns/lti_spec.rb                    | 3 +++
 spec/controllers/sessions_controller_spec.rb | 3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0c302db5..0aa26303 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,7 +11,6 @@ class ApplicationController < ActionController::Base
 
   def current_user
     #Todo replace session with lti_parameter
-    ::NewRelic::Agent.add_custom_parameters({ external_user_id: session[:external_user_id], session_user_id: session[:user_id] })
     @current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources
   end
 
diff --git a/app/controllers/concerns/lti.rb b/app/controllers/concerns/lti.rb
index 92fc490f..b5e53e1a 100644
--- a/app/controllers/concerns/lti.rb
+++ b/app/controllers/concerns/lti.rb
@@ -15,6 +15,7 @@ module Lti
   private :build_tool_provider
 
   def clear_lti_session_data
+    #Todo replace session with lti_parameter
     session.delete(:consumer_id)
     session.delete(:external_user_id)
     session.delete(:lti_parameters)
diff --git a/spec/concerns/lti_spec.rb b/spec/concerns/lti_spec.rb
index a1448661..ab047306 100644
--- a/spec/concerns/lti_spec.rb
+++ b/spec/concerns/lti_spec.rb
@@ -17,6 +17,7 @@ describe Lti do
 
   describe '#clear_lti_session_data' do
     it 'clears the session' do
+      #Todo replace session with lti_parameter
       expect(controller.session).to receive(:delete).with(:consumer_id)
       expect(controller.session).to receive(:delete).with(:external_user_id)
       expect(controller.session).to receive(:delete).with(:lti_parameters)
@@ -163,11 +164,13 @@ describe Lti do
   end
 
   describe '#store_lti_session_data' do
+    #Todo replace session with lti_parameter
     let(:parameters) { {} }
     before(:each) { controller.instance_variable_set(:@current_user, FactoryGirl.create(:external_user)) }
     after(:each) { controller.send(:store_lti_session_data, consumer: FactoryGirl.build(:consumer), parameters: parameters) }
 
     it 'stores data in the session' do
+      #Todo replace session with lti_parameter
       expect(controller.session).to receive(:[]=).with(:consumer_id, anything)
       expect(controller.session).to receive(:[]=).with(:external_user_id, anything)
       expect(controller.session).to receive(:[]=).with(:lti_parameters, kind_of(Hash))
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index f56bd708..06fc68dc 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -94,6 +94,7 @@ describe SessionsController do
       end
 
       it 'stores LTI parameters in the session' do
+        #Todo replace session with lti_parameter
         expect(controller).to receive(:store_lti_session_data)
         request
       end
@@ -160,6 +161,7 @@ describe SessionsController do
       end
 
       it 'clears the session' do
+        #Todo replace session with lti_parameter
         expect(controller).to receive(:clear_lti_session_data)
         delete :destroy
       end
@@ -183,6 +185,7 @@ describe SessionsController do
     before(:each) { request.call }
 
     it 'clears the session' do
+      #Todo replace session with lti_parameter
       expect(controller).to receive(:clear_lti_session_data)
       request.call
     end