qalam_oauth_engine 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a94aa9f960fad372ccd1ce843c502f7f1f8011f010e29dd095224a0d9a5c701f
-  data.tar.gz: a1f11ff92ae13c52c42271180623616cbf47cd42780e34e3f029a30c6143fe44
+  metadata.gz: c39bb4366b4792b9a2b0746a9073f28d410f181d82147c266939ae96489d5d5f
+  data.tar.gz: 97dd0420a00015b587b5a2ece17cad01fbfe0a78d95a1e8941980d4b8d076a4d
 SHA512:
-  metadata.gz: 8540835b1a123aae6f271195d80443a7627649dc2156c1ec2a6f0e6be6295d99f0669815b5e11250b7b0c7f70c7811d901158107ed1e2424934a0de3ba2c3d7b
-  data.tar.gz: f01b816cc088416ffa80ddfd5908ae40bded8ac8e11f8c784ead5317fd82a3d4039b424aa29cfff82aad4756c5776bbcdc291ec8116ebec48776dd2cb0a3b5a1
+  metadata.gz: 4346ca322ffd60dbb3e78e0106832255d8950e0850f1297669737c3a3ac9867e2bd95c15f4c88543dcf39625df63971341fe2524d40ddc5378d807e7551a491d
+  data.tar.gz: 4b7e0be12099a9312f1e125de7e6eae8d676bde404929979bbb7cc4e274cfb008d8e7e3d3d893cf5d668b75af1d7c6ffed170269343efcc2b7691fabffff8c67

data/app/controllers/canvas_oauth/canvas_controller.rb

@@ -7,7 +7,7 @@ module CanvasOauth
         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, @root_account_id, tool_consumer_instance_guid)
+          if CanvasOauth::Authorization.cache_token(token, refresh_token, user_id, @root_account_id, tool_consumer_instance_guid, canvas_url)
             redirect_to main_app.root_path
           else
             render plain: "Error: unable to save token"
@@ -24,12 +24,5 @@ module CanvasOauth
       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_oauth/authorization.rb

@@ -2,17 +2,35 @@ 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, account_id, tool_consumer_instance_guid)
+    def self.cache_token(token, refresh_token, user_id, account_id, tool_consumer_instance_guid, canvas_url)
       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.canvas_root_account_id = account_id  if CanvasOauth::Authorization.column_names.include?('canvas_root_account_id')
+        t.canvas_url = canvas_url if canvas_url && CanvasOauth::Authorization.column_names.include?('canvas_url')
         t.tool_consumer_instance_guid = tool_consumer_instance_guid
         t.last_used_at = Time.now
       end
     end
 
+    def self.fetch_canvas_auth(user_id, tool_consumer_instance_guid, canvas_url)
+      user_canvas_auths = where(canvas_user_id: user_id, tool_consumer_instance_guid: tool_consumer_instance_guid).order("created_at DESC")
+      user_canvas_auths = user_canvas_auths.where('lower(canvas_url) LIKE :q', q: "%#{canvas_url.downcase}%") if canvas_url && CanvasOauth::Authorization.column_names.include?('canvas_url')
+      if canvas_auth = user_canvas_auths.first
+        canvas_auth.update_attribute(:last_used_at, Time.now)
+        return canvas_auth
+      end
+    end
+
+    def self.fetch_id(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.id
+      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

data/db/migrate/20121121005358_create_canvas_oauth_authorizations.rb

@@ -6,6 +6,7 @@ class CreateCanvasOauthAuthorizations < ActiveRecord::Migration[4.2]
       t.string   "tool_consumer_instance_guid", :null => false
       t.string   "token"
       t.string   "refresh_token"
+      t.string   "canvas_url"
       t.datetime "last_used_at"
       t.datetime "created_at",                  :null => false
       t.datetime "updated_at",                  :null => false

data/lib/canvas_oauth/canvas_api.rb

@@ -4,13 +4,14 @@ module CanvasOauth
     PER_PAGE = 50
 
     attr_accessor :token, :refresh_token, :key, :secret
-    attr_reader :canvas_url, :canvas_user_id, :canvas_root_account_id
+    attr_reader :id, :canvas_url, :canvas_user_id, :canvas_root_account_id
 
-    def initialize(canvas_url, canvas_user_id, canvas_root_account_id, token, refresh_token, key, secret)
+    def initialize(id, 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
-      
+
+      self.id = id
       self.refresh_token = refresh_token
       self.canvas_url = canvas_url
       self.canvas_user_id = canvas_user_id
@@ -140,6 +141,10 @@ module CanvasOauth
     def canvas_root_account_id=(value)
       @canvas_root_account_id = value
     end
+
+    def id=(value)
+      @id = value
+    end
     
     def hex_sis_id(name, value)
       hex = value.unpack("H*")[0]

data/lib/canvas_oauth/canvas_api_extensions.rb

@@ -1,12 +1,22 @@
 module CanvasOauth
   class CanvasApiExtensions
-    def self.build(canvas_url, 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)
-      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)
+    def self.build(user_id, tool_consumer_instance_guid, canvas_url)
+      canvas_auth = CanvasOauth::Authorization.fetch_canvas_auth(user_id, tool_consumer_instance_guid, canvas_url)
+
+      id = canvas_auth&.id
+      account_id = canvas_auth&.canvas_root_account_id
+      token = canvas_auth&.token
+      refresh_token = canvas_auth&.refresh_token
+
+      if canvas_url && CanvasLtiKey.table_exists?
+        canvas_lti_key = CanvasLtiKey.where('lower(canvas_url) LIKE :q', q: "%#{canvas_url.downcase}%").first
+        canvas_key = canvas_lti_key&.key or CanvasConfig.key      
+        canvas_secret = canvas_lti_key&.secret or CanvasConfig.secret
+      else
+        canvas_key = CanvasConfig.key
+        canvas_secret = CanvasConfig.secret
+      end
+      CanvasApi.new(id, canvas_url, user_id, account_id, token, refresh_token, canvas_key, canvas_secret)
     end
   end
 end

data/lib/canvas_oauth/canvas_application.rb

@@ -16,7 +16,7 @@ module CanvasOauth
 
     protected
     def initialize_canvas
-      @canvas = ::CanvasOauth::CanvasApiExtensions.build(canvas_url, user_id, tool_consumer_instance_guid)
+      @canvas = ::CanvasOauth::CanvasApiExtensions.build(user_id, tool_consumer_instance_guid, canvas_url)
     end
 
     def canvas
@@ -58,6 +58,14 @@ module CanvasOauth
     # be overridden or the session data needs to be set up by the time the
     # oauth filter runs (like with the lti_provider_engine)
 
+    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
+    
     def canvas_url
       session[:canvas_url]
     end

data/lib/canvas_oauth/canvas_config.rb

@@ -13,12 +13,12 @@ module CanvasOauth
 
     def self.setup!
       if File.exists?(config_file)
-        Rails.logger.info "Initializing Qalam using configuration in #{config_file}"
+        Rails.logger.info "Initializing Qalam using configuration in #{config_file}".green
         config = load_config
         self.key = config['key']
         self.secret = config['secret']
       elsif ENV['CANVAS_KEY'].present? && ENV['CANVAS_SECRET'].present?
-        Rails.logger.info "Initializing Qalam using environment vars CANVAS_KEY and CANVAS_SECRET"
+        Rails.logger.info "Initializing Qalam using environment vars CANVAS_KEY and CANVAS_SECRET".green
         self.key = ENV['CANVAS_KEY']
         self.secret = ENV['CANVAS_SECRET']
       else

data/lib/canvas_oauth/version.rb

@@ -1,3 +1,3 @@
 module CanvasOauth
-  VERSION = "3.0.8"
+  VERSION = "3.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_oauth_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Dave Donahue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -61,6 +61,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement