coalescing_panda 4.1.10 → 4.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cccef2179435913dc8479713bfe97baca913ffa4
-  data.tar.gz: 6eed848e22fc27854dae01f0383da9189be57bb3
+  metadata.gz: 863946fbd5f47db0f0004cf6846111a0e95c4fd9
+  data.tar.gz: bf977dd224d2d2c6fbbbe49dca3ef9eb33d4ae99
 SHA512:
-  metadata.gz: 2d69a4572462912c8e10129c23a7073a26f401f94e5adc9d73befd852986c5bdb54b8ec95d5547d30d19346f9b650c7bde17d10a217813f707bdcbfc549f3e91
-  data.tar.gz: b1fbeb9b30fb82e3dca1603bbf304c1cba5d95b777de2bac6507b2c62a22134ef0fa716cbcaf72b8473d344f64dde115ea10af8792710a53ff792cd107a48504
+  metadata.gz: 3138b812b0e8db4c16103f185660389e4c562624e756aa881931579de57cf608be9b1ad93e47e37a39d085a7bcff281ddd930f0e6b1aea0424af9e637e1cca0a
+  data.tar.gz: 05f9c464ac7f367ac2102697835c004f9446f8587ce73f7fa458432b22005b5ad4fd355d6527c3a432a37092f62aae0daf82e4b98e46a49a07b3e7ccf21da3de

data/app/controllers/coalescing_panda/oauth2_controller.rb

@@ -13,7 +13,9 @@ module CoalescingPanda
         client_key = lti_account.oauth2_client_key
         user_id = params[:user_id]
         api_domain = params[:api_domain]
-        client = Bearcat::Client.new(prefix: [oauth2_protocol, '://', api_domain].join)
+        prefix = [oauth2_protocol, '://', api_domain].join
+        Rails.logger.info "Creating Bearcat client for auth token retrieval pointed to: #{prefix}"
+        client = Bearcat::Client.new(prefix: prefix)
         token = client.retrieve_token(client_id, coalescing_panda.oauth2_redirect_url, client_key, params['code'])
         CanvasApiAuth.where('user_id = ? and api_domain = ?', user_id, api_domain).first_or_create do |auth|
           auth.api_token = token

data/lib/coalescing_panda/controller_helpers.rb

@@ -7,10 +7,7 @@ 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']
-        uri = URI.parse(launch_presentation_return_url)
-        api_domain = uri.host
-        api_domain = "#{api_domain}:#{uri.port.to_s}" if uri.port
-        scheme = [uri.scheme, '://'].join
+        uri = BearcatURI.new(launch_presentation_return_url)
         @lti_params = params.to_hash
         session['user_id'] = user_id
         session['uri'] = launch_presentation_return_url
@@ -18,15 +15,15 @@ module CoalescingPanda
         session['oauth_consumer_key'] = params['oauth_consumer_key']
         session['custom_canvas_account_id'] = params['custom_canvas_account_id']
 
-        if token = CanvasApiAuth.where('user_id = ? and api_domain = ?', user_id, api_domain).pluck(:api_token).first
-          @client = Bearcat::Client.new(token: token, prefix: [scheme, api_domain].join)
+        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)
         elsif @lti_account = params['oauth_consumer_key'] && LtiAccount.find_by_key(params['oauth_consumer_key'])
           client_id = @lti_account.oauth2_client_id
-          client = Bearcat::Client.new(prefix: [scheme, api_domain].join)
+          client = Bearcat::Client.new(prefix: uri.prefix)
           session['state'] = SecureRandom.hex(32)
           @canvas_url = client.auth_redirect_url(client_id,
                                                  coalescing_panda.oauth2_redirect_url({key: params['oauth_consumer_key'],
-                                                                                       user_id: user_id, api_domain: api_domain, state: session['state']}))
+                                                                                       user_id: user_id, api_domain: uri.api_domain, state: session['state']}))
           #delete the added params so the original oauth sig still works
           @lti_params.delete('action')
           @lti_params.delete('controller')
@@ -43,12 +40,9 @@ module CoalescingPanda
       end
 
       if (session['user_id'] && session['uri'])
-        uri = URI.parse(session['uri'])
-        api_domain = uri.host
-        api_domain = "#{api_domain}:#{uri.port.to_s}" if uri.port
-        scheme = uri.scheme + '://'
-        token = CanvasApiAuth.where('user_id = ? and api_domain = ?', session['user_id'], api_domain).pluck(:api_token).first
-        @client = Bearcat::Client.new(token: token, prefix: scheme+api_domain) if token
+        uri = BearcatURI.new(session['uri'])
+        token = CanvasApiAuth.where('user_id = ? and api_domain = ?', session['user_id'], uri.api_domain).pluck(:api_token).first
+        @client = Bearcat::Client.new(token: token, prefix: uri.prefix) if token
       end
 
       @lti_account = LtiAccount.find_by_key(session['oauth_consumer_key']) if session['oauth_consumer_key']
@@ -128,5 +122,26 @@ module CoalescingPanda
       end
     end
 
+    class BearcatURI
+      attr_accessor :uri
+
+      def initialize(uri)
+        Rails.logger.info "Parsing Bearcat URI: #{uri}"
+        @uri = URI.parse(uri)
+      end
+
+      def api_domain
+        uri.port.present? ? "#{uri.host}:#{uri.port.to_s}" : uri.host
+      end
+
+      def scheme
+        [uri.scheme, '://'].join
+      end
+
+      def prefix
+        [scheme, api_domain].join
+      end
+    end
+
   end
 end

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '4.1.10'
+  VERSION = '4.1.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 4.1.10
+  version: 4.1.11
 platform: ruby
 authors:
 - Nathan Mills