qalam_oauth_engine 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1993e64ae7d887fb6d5ca81b7d41b841a41f16f6713dfa5750c16131b64b7b04
-  data.tar.gz: f8be0a0e38579e6a171cef590863fcca4ce7b7f06ed891c1824d12fdc07f3b61
+  metadata.gz: fedb8888333b8e5593967fd75d34041dabd73bd19af4cc017b77f3ee4125d6b9
+  data.tar.gz: 6bc18fbcb7d0cae6641da7418dad7835bf5890dcc28502b06a42e9737bb35c68
 SHA512:
-  metadata.gz: 11c52e55a0c2f63ac009f6ef29d53601078e343959cc56ecfdc8506684aee1f70b18c65e9f3bc34328af8ddde91ba6facd2ca3277d2d5b2c525cf1ca4a92490b
-  data.tar.gz: bc76c81bedb0aac378b675cd6d7b6f56dc1053f5af6f70ab9518e4a34928ffba4fb6559921444c730df2b89877b645e581bac91b841765a68eac27b29e72e6df
+  metadata.gz: 8cc4173cba1f1fefd30015c358b0e123ab34f329fad944559996a88c14f9d5ca0e36ce4077d7de064a80989c0c9bd7a2893fff621f9644e73168b3670dcb86a0
+  data.tar.gz: 16dd53a5746b3cb1d2166057874a77faeccb53a7fa154dec30cd1804be8db76443d8cf5139ad0f864aeb1f9b5d6a5ec0ebd746b4ed84d35c43ee08e9f808df0f

data/app/controllers/canvas_oauth/canvas_controller.rb

@@ -6,6 +6,7 @@ module CanvasOauth
       if verify_oauth2_state(params[:state]) && params[:code]
         if token = canvas.get_access_token(params[:code])
           set_root_account
+          puts @root_account_id.inspect.green
           refresh_token = canvas.refresh_token
           if CanvasOauth::Authorization.cache_token(token, refresh_token, user_id, @root_account_id, tool_consumer_instance_guid)
             redirect_to main_app.root_path
@@ -23,13 +24,13 @@ module CanvasOauth
     def verify_oauth2_state(callback_state)
       callback_state.present? && callback_state == session.delete(:oauth2_state)
     end
-  end
 
-  def set_root_account
-    if current_account_id
-      @root_account_id = canvas.root_account_id(current_account_id)
-    elsif current_course_id
-      @root_account_id = canvas.course_root_account_id(current_course_id)
+    def set_root_account
+      if session[:account_id]
+        @root_account_id = canvas.root_account_id(session[:account_id])
+      elsif session[:course_id]
+        @root_account_id = canvas.course_root_account_id(session[:course_id])
+      end
     end
   end
 end

data/lib/canvas_oauth/version.rb

@@ -1,3 +1,3 @@
 module CanvasOauth
-  VERSION = "3.0.5"
+  VERSION = "3.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_oauth_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Dave Donahue