coalescing_panda 4.1.11 → 4.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863946fbd5f47db0f0004cf6846111a0e95c4fd9
-  data.tar.gz: bf977dd224d2d2c6fbbbe49dca3ef9eb33d4ae99
+  metadata.gz: e582faf4e257cd6f9b0360bf944d9ecc409d68bd
+  data.tar.gz: fa0eb65cccf9239f4456de300538e42e45969510
 SHA512:
-  metadata.gz: 3138b812b0e8db4c16103f185660389e4c562624e756aa881931579de57cf608be9b1ad93e47e37a39d085a7bcff281ddd930f0e6b1aea0424af9e637e1cca0a
-  data.tar.gz: 05f9c464ac7f367ac2102697835c004f9446f8587ce73f7fa458432b22005b5ad4fd355d6527c3a432a37092f62aae0daf82e4b98e46a49a07b3e7ccf21da3de
+  metadata.gz: e3a9b034241743508c58b7893d361bbdadae0b14e26a3c0c415b572d3a420368918bac2a318c9ce4e799d97b64e94dfb1a51b13d7d6e77da93ed061c3f98766f
+  data.tar.gz: bbfbd4409297b27e2fbba9224304dc234f78bca7152c04daa143f91d5f8944f66f521f0cd0bed52f9ff3c7245fa697fb452a7166260b2c4ca886870c421bb5c5

data/lib/coalescing_panda/bearcat_uri.rb

@@ -0,0 +1,20 @@
+class CoalescingPanda::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

data/lib/coalescing_panda/controller_helpers.rb

@@ -7,7 +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 = BearcatURI.new(launch_presentation_return_url)
+        uri = BearcatUri.new(launch_presentation_return_url)
         @lti_params = params.to_hash
         session['user_id'] = user_id
         session['uri'] = launch_presentation_return_url
@@ -21,9 +21,9 @@ module CoalescingPanda
           client_id = @lti_account.oauth2_client_id
           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: uri.api_domain, state: session['state']}))
+          redirect_url = [coalescing_panda_url, coalescing_panda.oauth2_redirect_path({key: params['oauth_consumer_key'], user_id: user_id, api_domain: uri.api_domain, state: session['state']})].join
+          @canvas_url = client.auth_redirect_url(client_id, redirect_url)
+
           #delete the added params so the original oauth sig still works
           @lti_params.delete('action')
           @lti_params.delete('controller')
@@ -40,7 +40,7 @@ module CoalescingPanda
       end
 
       if (session['user_id'] && session['uri'])
-        uri = BearcatURI.new(session['uri'])
+        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
@@ -122,26 +122,5 @@ 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.11'
+  VERSION = '4.1.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 4.1.11
+  version: 4.1.12
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -379,6 +379,7 @@ files:
 - db/migrate/20150526144713_add_account_to_canvas_batches.rb
 - db/migrate/20150602205257_add_option_to_canvas_batches.rb
 - lib/coalescing_panda.rb
+- lib/coalescing_panda/bearcat_uri.rb
 - lib/coalescing_panda/controller_helpers.rb
 - lib/coalescing_panda/engine.rb
 - lib/coalescing_panda/route_helpers.rb