coalescing_panda 4.6.0.rc3 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a04cb62b9c121ccb9ee348d441cb952eda9316a
-  data.tar.gz: 7272d39eb8d3659bd0e8d4050dfabf0329e54ff1
+  metadata.gz: 61f78109d263c80140b9f4c04e0d4bb00f5b0c48
+  data.tar.gz: 3a27957a0bca404a35bc7247115de195389b0336
 SHA512:
-  metadata.gz: f562379d4a6752b45b59a8d2733be2176782679aebea3d244f0311f2977f366e8277f0d3794dc1acc9275b2b0039c7a2a71ed1a864eda9a5a45e64ea901c4fb9
-  data.tar.gz: 316930a437fe2eb25b2d39be63b0a592790559c158fcdc35e1382a0937cbdccb344af7634343385236f84f5dc8560f88c50bd9afb2547ae3ac201927ddaa0f65
+  metadata.gz: da367151b06b30cd990b882002d8cf3785fd2985c15fb053d58b86c74785e777193412e97818394ee2a870b7ebaeb98d4362de6401c4f54ea63e438ab502197f
+  data.tar.gz: a65b71236959d35a66eea943594dd12d0134ad6b0920acc0fde6307131161b25c9e6d6ab1dbb1e6e0ac9a26b00772f4ff24cde07cf67b70184103bd07b63fac1

data/lib/coalescing_panda/controller_helpers.rb

@@ -1,6 +1,7 @@
+require 'browser'
+
 module CoalescingPanda
   module ControllerHelpers
-    require 'browser'
 
     def canvas_oauth2(*roles)
       return if have_session?
@@ -110,7 +111,7 @@ module CoalescingPanda
       authorized = authorized && @lti_account.validate_nonce(params['oauth_nonce'], DateTime.strptime(params['oauth_timestamp'], '%s'))
       logger.info 'not authorized on nonce' if !authorized
       render :text => 'Invalid Credentials, please contact your Administrator.', :status => :unauthorized unless authorized
-      check_for_iframes_problem
+      check_for_iframes_problem if authorized
       authorized
     end
 
@@ -173,7 +174,7 @@ module CoalescingPanda
     def check_for_iframes_problem
       if cookies_need_iframe_fix?
         fix_iframe_cookies
-        return
+        return false
       end
 
       # For safari we may have been launched temporarily full-screen by canvas.  This allows us to set the session cookie.
@@ -181,12 +182,13 @@ module CoalescingPanda
       if params[:platform_redirect_url]
         session[:safari_cookie_fixed] = true
         redirect_to params[:platform_redirect_url]
-        return
+        return false
       end
     end
 
     def cookies_need_iframe_fix?
-      browser.safari? && !request.referrer&.include?('sessionless_launch') && !session[:safari_cookie_fixed]  && !params[:platform_redirect_url]
+      @browser ||= Browser.new(request.user_agent)
+      @browser.safari? && !request.referrer&.include?('sessionless_launch') && !session[:safari_cookie_fixed]  && !params[:platform_redirect_url]
     end
 
     def fix_iframe_cookies

data/lib/coalescing_panda/version.rb

@@ -1,3 +1,3 @@
 module CoalescingPanda
-  VERSION = '4.6.0.rc3'
+  VERSION = '4.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coalescing_panda
 version: !ruby/object:Gem::Version
-  version: 4.6.0.rc3
+  version: 4.6.0
 platform: ruby
 authors:
 - Nathan Mills
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -547,9 +547,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14