coalescing_panda 4.8.0.beta.1 → 5.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2890e7eb4eb1f91be53b1a0063850b01a19b6433cd4d58415a0077603ee90ca2
-  data.tar.gz: c687e98abbe7ac80c96a28a07c9b5aa896a4d606e22f32912c78c55df0594bca
+  metadata.gz: 04cba708232c8e0c9b6a463672856af29a163ea5c99f3f1f3cc9a25574384e4a
+  data.tar.gz: 4bf9e5644ef1d4224de236ae57cd966eda287ca1942b8bc6f5350362dc6e2a64
 SHA512:
-  metadata.gz: b1370a25a326aa117263653f4c5ad3e2c033923db39503f18b9d5e4a2676f379e34f6ee9b998c3234cf381ff0fe14a3ff9906c861f335e168f236f5f2b78b6c5
-  data.tar.gz: 85014215aa9943baba3f7946a1459093ffff62e42b0a7f99e11ff2fa2c2c311c117e4be60c4ef22c5e7ab9c69bb3cd84f21e597a7c4125b0834e8a97f83e2125
+  metadata.gz: 4d58f85ac65e2bc2374dfa77ded152c6afd0193c46a0c28f0ef19b14270112888d553efdb22d063a44c31257cd70e0ac5aa9173c2f830da5e1722765bfee85aa
+  data.tar.gz: b59db693a31dc3fe091aa4bfa7838008a43b69f5a4c486dd55a74bcf684a88be3719eff5bc0bdf63ba043111a36324c45584bd0dc39084069daad62a09ecdb37

data/app/models/coalescing_panda/persistent_session.rb

@@ -10,7 +10,7 @@ module CoalescingPanda
 
     def self.create_from_launch(launch_params, account_id)
       session = PersistentSession.new(coalescing_panda_lti_account_id: account_id)
-      session.data[:launch_params] = launch_params.to_unsafe_h
+      session.data[:launch_params] = launch_params.to_unsafe_h.with_indifferent_access
       session.data[:roles] = launch_params['roles'].split(',').map { |role|
         case role.downcase.strip
         when 'admin'

data/lib/coalescing_panda/controller_helpers.rb

@@ -187,11 +187,11 @@ module CoalescingPanda
     end
 
     def organization_key
-      params[:oauth_consumer_key] || current_session_data[:organization_key]
+      params[:oauth_consumer_key] || (current_session_data[:launch_params][:oauth_consumer_key] if @current_session)
     end
 
     def organization_id
-      params[:organization_id]
+      params[:organization_id] || (current_session_data[:launch_params][:organization_id] if @current_session)
     end
 
     def session_key
@@ -218,23 +218,23 @@ module CoalescingPanda
     # nicely with webpack-dev-server live reloading (otherwise
     # you get an access error every time it tries to live reload).
 
-    def redirect_with_session_to(path, id_or_model = nil, params = {})
+    def redirect_with_session_to(path, id_or_resource = nil, params = {})
       if Rails.env.development?
-        redirect_development_mode(path, id_or_model, params)
+        redirect_development_mode(path, id_or_resource, params)
       else
-        redirect_production_mode(path, id_or_model, params)
+        redirect_production_mode(path, id_or_resource, params)
       end
     end
 
-    def redirect_development_mode(path, id_or_model = nil, params)
-      redirect_to send(path, id_or_model, {
+    def redirect_development_mode(path, id_or_resource = nil, params)
+      redirect_to send(path, id_or_resource, {
           session_key: current_session.session_key,
           organization_id: current_lti_account.id
       }.merge(params))
     end
 
-    def redirect_production_mode(path, id_or_model = nil, params)
-      redirect_to send(path, id_or_model, {
+    def redirect_production_mode(path, id_or_resource = nil, params)
+      redirect_to send(path, id_or_resource, {
           encrypted_session_key: encrypted_session_key,
           organization_id: current_lti_account.id
       }.merge(params))

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '4.8.0.beta.1'
+  VERSION = '5.0.0.beta.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 4.8.0.beta.1
+  version: 5.0.0.beta.1
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails