panda_pal 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4301bb60a4ba38f0341681c27b4e442dcfe4fb
-  data.tar.gz: 725712ae4689fde81d974a72604bab8a55c02e38
+  metadata.gz: adf2baeea79a4d933e487e5a6bad74e1ad7ac09a
+  data.tar.gz: 9a1635bb6691fe621819b7b15a0d596d179e3dba
 SHA512:
-  metadata.gz: aecc8adfa67900caa78079a7df007fb24befc29036e1dadb6c11738d584f781a5cc92a1cbd8fef2aaa64f07774233111533165382111aea8e15b6cf7816b4985
-  data.tar.gz: b28cdd4846a21ef177f1edc7f4ed258596e1906d0c5cdf5d4b67d7175bd2622c87fb80436a4d384ed90050657149d452a2a763a8d888d9ccbc172e4fd0f367ab
+  metadata.gz: 3f2965242f0181d7929636012adcdaabb7a243b6dba145237b70b79b1972c268b49ef907908a8bc923f911cb9541fe2fdf01d271f3538845bf3819216ef37e8b
+  data.tar.gz: fe6a037ec8143bc4bf7ce9588c9a8a5d8e8e213fe48f490c2ea05eccf4a1517a56868cb7349111721a0a052805ef52c23b081b5c7ef81b335c9694a499aba34d

data/app/models/panda_pal/session.rb

@@ -1,5 +1,9 @@
 module PandaPal
   class Session < ActiveRecord::Base
+    belongs_to :panda_pal_organization
+
+    validates :panda_pal_organization_id, presence: true
+
     after_initialize do
       self.session_key ||= SecureRandom.urlsafe_base64(60)
     end

data/db/migrate/20160425130344_add_panda_pal_organization_to_session.rb

@@ -0,0 +1,6 @@
+class AddPandaPalOrganizationToSession < ActiveRecord::Migration
+  def change
+    add_column :panda_pal_sessions, :panda_pal_organization_id, :integer
+    add_index :panda_pal_sessions, :panda_pal_organization_id
+  end
+end

data/lib/panda_pal/helpers/controller_helper.rb

@@ -5,12 +5,12 @@ module PandaPal::Helpers::ControllerHelper
 
   def current_session
     @current_session ||= PandaPal::Session.find_by(session_key: session_key) if session_key
-    @current_session ||= PandaPal::Session.new
+    @current_session ||= PandaPal::Session.new(panda_pal_organization_id: current_organization.id)
   end
 
   def current_organization
     @organization ||= PandaPal::Organization.find_by!(key: organization_key) if organization_key
-    @organization ||= PandaPal::Organization.find_by(id: params[:organization_id]) if params[:organization_id]
+    @organization ||= PandaPal::Organization.find_by(id: organization_id) if organization_id
     @organization ||= PandaPal::Organization.find_by_name(Apartment::Tenant.current)
   end
 
@@ -42,7 +42,16 @@ module PandaPal::Helpers::ControllerHelper
   end
 
   def forbid_access_if_lacking_session
-    render text: 'You should do an LTI Tool Launch.', status: :unauthorized unless current_session.persisted?
+    render text: 'You should do an LTI Tool Launch.', status: :unauthorized unless valid_session?
+  end
+
+  def valid_session?
+    [
+      current_session.persisted?,
+      current_organization,
+      current_session.panda_pal_organization_id == current_organization.id,
+      Apartment::Tenant.current == current_organization.name
+    ].all?
   end
 
   private
@@ -50,6 +59,10 @@ module PandaPal::Helpers::ControllerHelper
     params[:oauth_consumer_key] || current_session_data[:organization_key] || session[:organization_key]
   end
 
+  def organization_id
+    params[:organization_id]
+  end
+
   def session_key
     params[:session_key] || session_key_header || flash[:session_key] || session[:session_key]
   end

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ben Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -163,6 +163,7 @@ files:
 - db/migrate/20160412205931_create_panda_pal_organizations.rb
 - db/migrate/20160413132229_create_delayed_jobs.rb
 - db/migrate/20160413135653_create_panda_pal_sessions.rb
+- db/migrate/20160425130344_add_panda_pal_organization_to_session.rb
 - lib/panda_pal.rb
 - lib/panda_pal/engine.rb
 - lib/panda_pal/helpers.rb
@@ -241,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: LTI mountable engine
@@ -294,3 +295,4 @@ test_files:
 - spec/models/panda_pal/session_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+has_rdoc: