coalescing_panda 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683daed32c44f738fe0747932f43a2be9ee00490ac44b6bbda7a0c5f2e513660
-  data.tar.gz: 893aca1614fee0eef49a1bf9eeb2f0b02de240df3168ae82940a0f102a7e6a30
+  metadata.gz: 306dfeeb30b6ae7918306493e16fad1153218caff10326e85e20767fe65e6939
+  data.tar.gz: 8e1d71edd52810dc203bffabc505f4bf1d594b9dd6a41af69850d00d9a7a49bf
 SHA512:
-  metadata.gz: 5c1666f7c708b34cd1161e53fcc2346c5122fd847797d9d2ddb7e9887ddb30e4e54a8992fc50b7998bf15153f6fc3bd851a1542bf7b93e0de34fa3a5b7aff4ca
-  data.tar.gz: c385b2c0e634fa4edc0bef7c2f14f7b6c5c484e8c0cee109095aed1bc1fd57c91d742aa401e6f2ad85cf8aeb232c0dea60c9dbb4f149706edb24cd0713c7ae92
+  metadata.gz: c07375ac5edf196130f97ad74d87b78895c0c75ee22452b739932b525a5cb79a29e6e4a751ad0addf2e92782e466f4403ace209399245d5fb0d26f20764e892d
+  data.tar.gz: 923158157e37c46b0374ccebcd5b3c9dac3e7f70d2df759aa6f340fec35f4b179b2fc3fe8ac51babe7a95ea0f569ff066f07bd46ee536e5679ad89da3b77472e

data/app/models/coalescing_panda/json_with_indifferent_access.rb

@@ -0,0 +1,13 @@
+module CoalescingPanda
+  class JSONWithIndifferentAccess
+    def self.load(str)
+      return nil unless str.present?
+      parsed = JSON.parse(str)
+      parsed.is_a?(Hash) ? HashWithIndifferentAccess.new(parsed) : parsed
+    end
+
+    def self.dump(obj)
+      JSON.dump(obj)
+    end
+  end
+end

data/app/models/coalescing_panda/persistent_session.rb

@@ -1,10 +1,11 @@
 module CoalescingPanda
   class PersistentSession < ActiveRecord::Base
-    serialize :data, Hash
+    serialize :data, JSONWithIndifferentAccess
     belongs_to :coalescing_panda_lti_account, :class_name => 'CoalescingPanda::LtiAccount'
     validates :coalescing_panda_lti_account_id, presence: true
 
     after_initialize do
+      self.data ||= {}
       self.session_key ||= SecureRandom.urlsafe_base64(60)
     end
 

data/lib/coalescing_panda/controller_helpers.rb

@@ -2,15 +2,32 @@ require 'browser'
 
 module CoalescingPanda
   module ControllerHelpers
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method :rails_session, :session
+
+      helper_method :encrypted_session_key, :current_session_data, :current_session
+      append_after_action :save_session, if: -> { @current_session && session_changed? }
+    end
+
+    class_methods do
+      def use_native_sessions
+        after_action do
+          rails_session['persistent_session_key'] = current_session.session_key if @current_session.present?
+        end
+      end
+    end
+
     def current_session
-      @current_session ||= CoalescingPanda::PersistentSession.find_by(session_key: session_key) if session_key
-      @current_session ||= CoalescingPanda::PersistentSession.create_from_launch(params, current_lti_account.id)
+      @current_session ||= (CoalescingPanda::PersistentSession.find_by(session_key: session_key) if session_key)
+      @current_session ||= (CoalescingPanda::PersistentSession.create_from_launch(params, current_lti_account.id) if current_lti_account.present?)
       @current_session
     end
 
     def current_lti_account
-      @account ||= CoalescingPanda::LtiAccount.find_by!(key: organization_key) if organization_key
-      @account ||= CoalescingPanda::LtiAccount.find_by(id: organization_id) if organization_id
+      @account ||= (CoalescingPanda::LtiAccount.find_by!(key: organization_key) if organization_key)
+      @account ||= (CoalescingPanda::LtiAccount.find_by(id: organization_id) if organization_id)
       @account
     end
 
@@ -83,42 +100,42 @@ module CoalescingPanda
     end
 
     def check_refresh_token
-      return unless session['uri'] && session['user_id'] && session['oauth_consumer_key']
-      uri = BearcatUri.new(session['uri'])
-      api_auth = CanvasApiAuth.find_by(user_id: session['user_id'], api_domain: uri.api_domain)
-      @lti_account = LtiAccount.find_by(key: session['oauth_consumer_key'])
+      return unless current_session_data['uri'] && current_session_data['user_id'] && current_session_data['oauth_consumer_key']
+      uri = BearcatUri.new(current_session_data['uri'])
+      api_auth = CanvasApiAuth.find_by(user_id: current_session_data['user_id'], api_domain: uri.api_domain)
+      @lti_account = LtiAccount.find_by(key: current_session_data['oauth_consumer_key'])
       return if @lti_account.nil? || api_auth.nil? # Not all tools use oauth
 
       refresh_token(uri, api_auth) if api_auth.expired?
     rescue Footrest::HttpError::BadRequest
-      render_oauth2_page uri, session['user_id']
+      render_oauth2_page uri, current_session_data['user_id']
     end
 
     def set_session(launch_presentation_return_url)
-      session['user_id'] = params['user_id']
-      session['uri'] = launch_presentation_return_url
-      session['lis_person_sourcedid'] = params['lis_person_sourcedid']
-      session['oauth_consumer_key'] = params['oauth_consumer_key']
-      session['custom_canvas_account_id'] = params['custom_canvas_account_id']
+      current_session_data['user_id'] = params['user_id']
+      current_session_data['uri'] = launch_presentation_return_url
+      current_session_data['lis_person_sourcedid'] = params['lis_person_sourcedid']
+      current_session_data['oauth_consumer_key'] = params['oauth_consumer_key']
+      current_session_data['custom_canvas_account_id'] = params['custom_canvas_account_id']
     end
 
     def have_session?
-      if params['tool_consumer_instance_guid'] && session['user_id'] != params['user_id']
+      if params['tool_consumer_instance_guid'] && current_session_data['user_id'] != params['user_id']
         reset_session
         logger.info("resetting session params")
-        session['user_id'] = params['user_id']
+        current_session_data['user_id'] = params['user_id']
       end
 
-      if (session['user_id'] && session['uri'])
-        uri = BearcatUri.new(session['uri'])
-        api_auth = CanvasApiAuth.find_by('user_id = ? and api_domain = ?', session['user_id'], uri.api_domain)
+      if (current_session_data['user_id'] && current_session_data['uri'])
+        uri = BearcatUri.new(current_session_data['uri'])
+        api_auth = CanvasApiAuth.find_by('user_id = ? and api_domain = ?', current_session_data['user_id'], uri.api_domain)
         if api_auth && !api_auth.expired?
           @client = Bearcat::Client.new(token: api_auth.api_token, prefix: uri.prefix)
           @client.user_profile 'self'
         end
       end
 
-      @lti_account = LtiAccount.find_by_key(session['oauth_consumer_key']) if session['oauth_consumer_key']
+      @lti_account = LtiAccount.find_by_key(current_session_data['oauth_consumer_key']) if current_session_data['oauth_consumer_key']
 
       !!@client
     rescue Footrest::HttpError::Unauthorized
@@ -198,7 +215,7 @@ module CoalescingPanda
       if params[:encrypted_session_key]
         return msg_encryptor.decrypt_and_verify(params[:encrypted_session_key])
       end
-      params[:session_key] || session_key_header
+      params[:session_key] || session_key_header || rails_session['persistent_session_key']
     end
 
     def session_key_header

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '5.0.2'
+  VERSION = '5.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -423,6 +423,7 @@ files:
 - app/models/coalescing_panda/group.rb
 - app/models/coalescing_panda/group_category.rb
 - app/models/coalescing_panda/group_membership.rb
+- app/models/coalescing_panda/json_with_indifferent_access.rb
 - app/models/coalescing_panda/lti_account.rb
 - app/models/coalescing_panda/lti_nonce.rb
 - app/models/coalescing_panda/oauth_state.rb