qalam_oauth_engine 3.0.2 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 670853e86a63843215ca1dcfbf8ae5e8ebe7665e39c484794c433ef7d7086c6e
-  data.tar.gz: 31bb746f4fcc1df2cac7d0dfff30262c91b782aa1b0006b0d0c2eed9cd293320
+  metadata.gz: fedb8888333b8e5593967fd75d34041dabd73bd19af4cc017b77f3ee4125d6b9
+  data.tar.gz: 6bc18fbcb7d0cae6641da7418dad7835bf5890dcc28502b06a42e9737bb35c68
 SHA512:
-  metadata.gz: d24cc4150b92f9f0330a53d1afd32fe1cf50bbff59bf7b2e3fe08334a93021e3ca4ee4d8ccf0fde4fd2079b80339e5883bf23c5a359f67bb4ea7389d337dde21
-  data.tar.gz: 669a149ee5bdc12e2459a2c4c773017f2a5e8a28704d93361e8ad1a45d0618c4cf8155c702a6bbe5accaf433591f2f11c9a1126daca86f5b1f987979e081c0c4
+  metadata.gz: 8cc4173cba1f1fefd30015c358b0e123ab34f329fad944559996a88c14f9d5ca0e36ce4077d7de064a80989c0c9bd7a2893fff621f9644e73168b3670dcb86a0
+  data.tar.gz: 16dd53a5746b3cb1d2166057874a77faeccb53a7fa154dec30cd1804be8db76443d8cf5139ad0f864aeb1f9b5d6a5ec0ebd746b4ed84d35c43ee08e9f808df0f

data/app/controllers/canvas_oauth/canvas_controller.rb

@@ -5,8 +5,10 @@ module CanvasOauth
     def oauth
       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, tool_consumer_instance_guid)
+          if CanvasOauth::Authorization.cache_token(token, refresh_token, user_id, @root_account_id, tool_consumer_instance_guid)
             redirect_to main_app.root_path
           else
             render plain: "Error: unable to save token"
@@ -22,5 +24,13 @@ module CanvasOauth
     def verify_oauth2_state(callback_state)
       callback_state.present? && callback_state == session.delete(:oauth2_state)
     end
+
+    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/app/models/canvas_lti_key.rb

@@ -0,0 +1,4 @@
+class CanvasLtiKey < ApplicationRecord
+    validates :canvas_url, :secret, presence: true
+    validates :key, presence: true, :uniqueness => {:scope=>:canvas_url}
+end

data/app/models/canvas_oauth/authorization.rb

@@ -2,16 +2,25 @@ module CanvasOauth
   class Authorization < ActiveRecord::Base
     validates :canvas_user_id, :token, :refresh_token, :last_used_at, presence: true
 
-    def self.cache_token(token, refresh_token, user_id, tool_consumer_instance_guid)
+    def self.cache_token(token, refresh_token, user_id, account_id, tool_consumer_instance_guid)
       create do |t|
         t.token = token
         t.refresh_token = refresh_token
         t.canvas_user_id = user_id
+        t.canvas_root_account_id = account_id
         t.tool_consumer_instance_guid = tool_consumer_instance_guid
         t.last_used_at = Time.now
       end
     end
 
+    def self.fetch_account(user_id, tool_consumer_instance_guid)
+      user_accounts = where(canvas_user_id: user_id, tool_consumer_instance_guid: tool_consumer_instance_guid).order("created_at DESC")
+      if canvas_auth = user_accounts.first
+        canvas_auth.update_attribute(:last_used_at, Time.now)
+        return canvas_auth.canvas_root_account_id
+      end
+    end
+
     def self.fetch_token(user_id, tool_consumer_instance_guid)
       user_tokens = where(canvas_user_id: user_id, tool_consumer_instance_guid: tool_consumer_instance_guid).order("created_at DESC")
       if canvas_auth = user_tokens.first

data/db/migrate/20121121005358_create_canvas_oauth_authorizations.rb

@@ -2,6 +2,7 @@ class CreateCanvasOauthAuthorizations < ActiveRecord::Migration[4.2]
   def change
     create_table "canvas_oauth_authorizations", :force => true do |t|
       t.integer  "canvas_user_id", :limit => 8
+      t.integer  "canvas_root_account_id", :limit => 8
       t.string   "tool_consumer_instance_guid", :null => false
       t.string   "token"
       t.string   "refresh_token"

data/db/migrate/20210809092919_create_canvas_lti_keys.rb

@@ -0,0 +1,11 @@
+class CreateCanvasLtiKeys < ActiveRecord::Migration[6.0]
+  def change
+    create_table :canvas_lti_keys do |t|
+      t.string :key
+      t.string :secret
+      t.string :canvas_url
+
+      t.timestamps
+    end
+  end
+end

data/lib/canvas_oauth/canvas_api.rb

@@ -6,7 +6,7 @@ module CanvasOauth
     attr_accessor :token, :refresh_token, :key, :secret
     attr_reader :canvas_url, :canvas_user_id
 
-    def initialize(canvas_url, canvas_user_id, token, refresh_token, key, secret)
+    def initialize(canvas_url, canvas_user_id, canvas_root_account_id, token, refresh_token, key, secret)
       unless [key, secret].all?(&:present?)
         raise "Invalid Qalam oAuth configuration"
       end
@@ -14,6 +14,7 @@ module CanvasOauth
       self.refresh_token = refresh_token
       self.canvas_url = canvas_url
       self.canvas_user_id = canvas_user_id
+      self.canvas_root_account_id = canvas_root_account_id
       self.token = token
       self.key = key
       self.secret = secret
@@ -130,6 +131,10 @@ module CanvasOauth
     def canvas_user_id=(value)
       @canvas_user_id = value
     end
+
+    def canvas_root_account_id=(value)
+      @canvas_root_account_id = value
+    end
     
     def hex_sis_id(name, value)
       hex = value.unpack("H*")[0]

data/lib/canvas_oauth/canvas_api_extensions.rb

@@ -1,9 +1,12 @@
 module CanvasOauth
   class CanvasApiExtensions
     def self.build(canvas_url, user_id, tool_consumer_instance_guid)
-      refresh_token = CanvasOauth::Authorization.fetch_refresh_token(user_id, tool_consumer_instance_guid)
+      account_id = CanvasOauth::Authorization.fetch_account(user_id, tool_consumer_instance_guid)
       token = CanvasOauth::Authorization.fetch_token(user_id, tool_consumer_instance_guid)
-      CanvasApi.new(canvas_url, user_id, token, refresh_token, CanvasConfig.key, CanvasConfig.secret)
+      refresh_token = CanvasOauth::Authorization.fetch_refresh_token(user_id, tool_consumer_instance_guid)
+      canvas_key = ((CanvasLtiKey.table_exists? && CanvasLtiKey.find_by(canvas_url: canvas_url)&.key) or CanvasConfig.key)
+      canvas_secret = ((CanvasLtiKey.table_exists? && CanvasLtiKey.find_by(key: canvas_key, canvas_url: canvas_url)&.secret) or CanvasConfig.secret)
+      CanvasApi.new(canvas_url, user_id, account_id, token, refresh_token, canvas_key, canvas_secret)
     end
   end
 end

data/lib/canvas_oauth/canvas_config.rb

@@ -17,15 +17,10 @@ module CanvasOauth
         config = load_config
         self.key = config['key']
         self.secret = config['secret']
-
-        Rails.logger.info "\n> Initializing Key #{config['key']} - Secret #{config['secret']}\n".green
-
       elsif ENV['CANVAS_KEY'].present? && ENV['CANVAS_SECRET'].present?
         Rails.logger.info "Initializing Qalam using environment vars CANVAS_KEY and CANVAS_SECRET"
         self.key = ENV['CANVAS_KEY']
         self.secret = ENV['CANVAS_SECRET']
-
-        Rails.logger.info "\n> Initializing Key #{ENV['CANVAS_KEY']} - Secret #{ENV['CANVAS_SECRET']}\n".green
       else
         warn "Warning: Qalam key and secret not configured (RAILS_ENV = #{ENV['RAILS_ENV']})."
       end

data/lib/canvas_oauth/version.rb

@@ -1,3 +1,3 @@
 module CanvasOauth
-  VERSION = "3.0.2"
+  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.2
+  version: 3.0.6
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -257,10 +257,12 @@ files:
 - Rakefile
 - app/controllers/canvas_oauth/canvas_controller.rb
 - app/controllers/canvas_oauth/oauth_application_controller.rb
+- app/models/canvas_lti_key.rb
 - app/models/canvas_oauth/authorization.rb
 - config/canvas.yml.example
 - config/routes.rb
 - db/migrate/20121121005358_create_canvas_oauth_authorizations.rb
+- db/migrate/20210809092919_create_canvas_lti_keys.rb
 - lib/canvas_oauth.rb
 - lib/canvas_oauth/canvas_api.rb
 - lib/canvas_oauth/canvas_api_extensions.rb
@@ -330,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: CanvasOauth is a mountable engine for handling the oauth workflow with canvas