htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added separate value for the actual external_id of the external user.

Browse Source
This commit is contained in:
Tom Staubitz
2016-12-31 00:58:36 +01:00
parent f318c62818
commit edb813ab14
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/concerns/lti.rb
View File

@ -19,9 +19,11 @@ module Lti
#Todo replace session with lti_parameter /done #Todo replace session with lti_parameter /done
#TODO decide if we need to remove all LtiParameters for user/consumer #TODO decide if we need to remove all LtiParameters for user/consumer
if (exercise_id.nil?) if (exercise_id.nil?)
LtiParameter.destroy_all(consumers_id: session[:consumer_id], external_user_id: session[:external_user_id]) LtiParameter.destroy_all(consumers_id: session[:consumer_id], external_user_id: session[:external_user_external_id])
else #TODO: probably it does not make sense to keep the LtiParameters if the session is deleted else #TODO: probably it does not make sense to keep the LtiParameters if the session is deleted
LtiParameter.destroy_all(consumers_id: session[:consumer_id], external_user_id: session[:external_user_id], exercises_id: exercise_id) LtiParameter.destroy_all(consumers_id: session[:consumer_id],
external_user_id: session[:external_user_external_id],
exercises_id: exercise_id)
end end
session.delete(:consumer_id) session.delete(:consumer_id)
session.delete(:external_user_id) session.delete(:external_user_id)
@ -102,8 +104,10 @@ module Lti
fail(Error, "Score #{score} must be between 0 and #{MAXIMUM_SCORE}!") unless (0..MAXIMUM_SCORE).include?(score) fail(Error, "Score #{score} must be between 0 and #{MAXIMUM_SCORE}!") unless (0..MAXIMUM_SCORE).include?(score)
#Todo replace session with lti_parameter /done #Todo replace session with lti_parameter /done
lti_parameter = LtiParameter.where(consumers_id: session[:consumer_id], lti_parameter = LtiParameter.where(consumers_id: session[:consumer_id],
external_user_id: session[:external_user_id], external_user_id: session[:external_user_external_id],
exercises_id: exercise_id).first exercises_id: exercise_id).first
# lti_parameters = JSON.parse(lti_parameter.lti_parameters)
consumer = Consumer.find_by(id: session[:consumer_id]) consumer = Consumer.find_by(id: session[:consumer_id])
provider = build_tool_provider(consumer: consumer, parameters: lti_parameter.lti_parameters) provider = build_tool_provider(consumer: consumer, parameters: lti_parameter.lti_parameters)
# provider = build_tool_provider(consumer: Consumer.find_by(id: session[:consumer_id]), parameters: session[:lti_parameters]) # provider = build_tool_provider(consumer: Consumer.find_by(id: session[:consumer_id]), parameters: session[:lti_parameters])
@ -136,6 +140,7 @@ module Lti
lti_parameters.save! lti_parameters.save!
session[:consumer_id] = options[:consumer].id session[:consumer_id] = options[:consumer].id
session[:external_user_external_id] = @current_user.external_id
session[:external_user_id] = @current_user.id session[:external_user_id] = @current_user.id
end end
private :store_lti_session_data private :store_lti_session_data

2
app/controllers/exercises_controller.rb
View File

@ -159,7 +159,7 @@ class ExercisesController < ApplicationController
def redirect_to_lti_return_path def redirect_to_lti_return_path
#Todo replace session with lti_parameter /done #Todo replace session with lti_parameter /done
lti_parameter = LtiParameter.where(consumers_id: session[:consumer_id], lti_parameter = LtiParameter.where(consumers_id: session[:consumer_id],
external_user_id: session[:external_user_id], external_user_id: session[:external_user_external_id],
exercises_id: @submission.exercise_id).first exercises_id: @submission.exercise_id).first
path = lti_return_path(consumer_id: session[:consumer_id], path = lti_return_path(consumer_id: session[:consumer_id],

2
app/helpers/lti_helper.rb
View File

@ -2,7 +2,7 @@ module LtiHelper
def lti_outcome_service?(exercise_id) def lti_outcome_service?(exercise_id)
#Todo replace session with lti_parameter /done #Todo replace session with lti_parameter /done
lti_parameters = LtiParameter.where(consumers_id: session[:consumer_id], lti_parameters = LtiParameter.where(consumers_id: session[:consumer_id],
external_user_id: session[:external_user_id], external_user_id: session[:external_user_external_id],
exercises_id: exercise_id).lis_outcome_service_url? exercises_id: exercise_id).lis_outcome_service_url?
!lti_parameters.nil? && lti_parameters.size > 0 !lti_parameters.nil? && lti_parameters.size > 0
# session[:lti_parameters].try(:has_key?, 'lis_outcome_service_url') # session[:lti_parameters].try(:has_key?, 'lis_outcome_service_url')