qalam_oauth_engine 3.0.1 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a211fbb4dc88d7fdd02b18476934e0aaeb9b8b1fb51264b907a82fbeb594a6f
-  data.tar.gz: a94cb0321d02c42d7aa2cd08b37d138512e71ec6200322f96a97a101e964e1b5
+  metadata.gz: 1993e64ae7d887fb6d5ca81b7d41b841a41f16f6713dfa5750c16131b64b7b04
+  data.tar.gz: f8be0a0e38579e6a171cef590863fcca4ce7b7f06ed891c1824d12fdc07f3b61
 SHA512:
-  metadata.gz: 307140f17ec1b239e871bd6cf198c074f19511cfec07117221a992a4ee0944a0e7296787ecd7a6562ce6ef15ced7d0ba8ac6d6584b42f9f7990062270a4834ae
-  data.tar.gz: 959873829e421e85ba8a53aba9e19d7a30f51742d83d49c6c5d950fadcfdab4c68f4612e3c996e5576cc5959fe41d691a8dc90584a92fa88adae9458ba05f6ea
+  metadata.gz: 11c52e55a0c2f63ac009f6ef29d53601078e343959cc56ecfdc8506684aee1f70b18c65e9f3bc34328af8ddde91ba6facd2ca3277d2d5b2c525cf1ca4a92490b
+  data.tar.gz: bc76c81bedb0aac378b675cd6d7b6f56dc1053f5af6f70ab9518e4a34928ffba4fb6559921444c730df2b89877b645e581bac91b841765a68eac27b29e72e6df

data/app/controllers/canvas_oauth/canvas_controller.rb

@@ -5,8 +5,9 @@ module CanvasOauth
     def oauth
       if verify_oauth2_state(params[:state]) && params[:code]
         if token = canvas.get_access_token(params[:code])
+          set_root_account
           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"
@@ -23,4 +24,12 @@ module CanvasOauth
       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)
+    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.1"
+  VERSION = "3.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_oauth_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.5
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -50,7 +50,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -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