coalescing_panda 4.1.12 → 4.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e582faf4e257cd6f9b0360bf944d9ecc409d68bd
-  data.tar.gz: fa0eb65cccf9239f4456de300538e42e45969510
+  metadata.gz: a57e9fac9340339b324a52145f20eb73ba28c663
+  data.tar.gz: 4bf093296076e9e62f387f5055abca2e2798a7b1
 SHA512:
-  metadata.gz: e3a9b034241743508c58b7893d361bbdadae0b14e26a3c0c415b572d3a420368918bac2a318c9ce4e799d97b64e94dfb1a51b13d7d6e77da93ed061c3f98766f
-  data.tar.gz: bbfbd4409297b27e2fbba9224304dc234f78bca7152c04daa143f91d5f8944f66f521f0cd0bed52f9ff3c7245fa697fb452a7166260b2c4ca886870c421bb5c5
+  metadata.gz: 9ca621611fdd63a2966a436295ead5cae020bc84491d2beef4df995b4c3891b00dfd2b9731dfc3ca4db4101cd50b6a314e728423a0e3bb2df7689b79c80ebbdf
+  data.tar.gz: 2ef1f4235da353d15c3e7917f64d5a7627df979099f4f39979167da8608d08d00f06bf2211b02872603307bf5e28d73a5353810529c0ca8ef7b6e0e662732158

data/lib/coalescing_panda/controller_helpers.rb

@@ -7,13 +7,9 @@ module CoalescingPanda
       if lti_authorize!(*roles)
         user_id = params['user_id']
         launch_presentation_return_url = @lti_account.settings[:launch_presentation_return_url] || params['launch_presentation_return_url']
+        launch_presentation_return_url = [BearcatUri.new(request.env["HTTP_REFERER"]).prefix, launch_presentation_return_url].join unless launch_presentation_return_url.include?('http')
         uri = BearcatUri.new(launch_presentation_return_url)
-        @lti_params = params.to_hash
-        session['user_id'] = 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']
+        set_session(launch_presentation_return_url)
 
         if token = CanvasApiAuth.where('user_id = ? and api_domain = ?', user_id, uri.api_domain).pluck(:api_token).first
           @client = Bearcat::Client.new(token: token, prefix: uri.prefix)
@@ -25,6 +21,7 @@ module CoalescingPanda
           @canvas_url = client.auth_redirect_url(client_id, redirect_url)
 
           #delete the added params so the original oauth sig still works
+          @lti_params = params.to_hash
           @lti_params.delete('action')
           @lti_params.delete('controller')
           render 'coalescing_panda/oauth2/oauth2', layout: 'coalescing_panda/application'
@@ -32,6 +29,14 @@ module CoalescingPanda
       end
     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']
+    end
+
     def have_session?
       if params['tool_consumer_instance_guid'] && session['user_id'] != params['user_id']
         reset_session
@@ -61,9 +66,7 @@ module CoalescingPanda
       logger.info 'not authorized on roles' if !authorized
       authorized = authorized && @lti_account.validate_nonce(params['oauth_nonce'], DateTime.strptime(params['oauth_timestamp'], '%s'))
       logger.info 'not authorized on nonce' if !authorized
-      if !authorized
-        render :text => 'Invalid Credentials, please contact your Administrator.', :status => :unauthorized
-      end
+      render :text => 'Invalid Credentials, please contact your Administrator.', :status => :unauthorized unless authorized
       authorized
     end
 

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '4.1.12'
+  VERSION = '4.1.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 4.1.12
+  version: 4.1.13
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails