coalescing_panda 0.0.6 → 0.0.7

data/lib/coalescing_panda/controller_helpers.rb

@@ -3,16 +3,20 @@ module CoalescingPanda
 
     def canvas_oauth2
       user_id = params['user_id']
+      uri = URI.parse(params['launch_presentation_return_url'])
+      api_domain = uri.host
+      api_domain = "#{api_domain}:#{uri.port.to_s}" if uri.port
+      scheme = uri.scheme + '://'
 
-      if token = CanvasApiAuth.where('user_id = ? and api_domain = ?', user_id, request.host).pluck(:api_token).first
-        @client = Bearcat::Client.new(token: token, prefix: request.host)
+      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)
       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: request.host)
+        client = Bearcat::Client.new(prefix: scheme+api_domain)
         @lti_params = params.to_hash
         @canvas_url = client.auth_redirect_url(client_id,
                                                coalescing_panda.oauth2_redirect_url({key: params['oauth_consumer_key'],
-                                               user_id: user_id, api_domain: request.host}))
+                                               user_id: user_id, api_domain: api_domain}))
         #delete the added params so the original oauth sig still works
         @lti_params.delete('action')
         @lti_params.delete('controller')
@@ -64,10 +68,8 @@ module CoalescingPanda
           :test
         when /(localhost)|(127\.0\.0\.1).*/
           :dev
-        when /https:\/\/.*/
-          :production
         else
-          :unknown
+          :production
       end
     end
 

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: