qalam_oauth_engine 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 670853e86a63843215ca1dcfbf8ae5e8ebe7665e39c484794c433ef7d7086c6e
-  data.tar.gz: 31bb746f4fcc1df2cac7d0dfff30262c91b782aa1b0006b0d0c2eed9cd293320
+  metadata.gz: 7d5f44f20e6e7274024cb0db320eea0b44c806fe1071a6b1f22f55126d9705a7
+  data.tar.gz: 98a8dbd9c702bcf62038b8acc8916c2357684995fb44538ac95a073d6254af8d
 SHA512:
-  metadata.gz: d24cc4150b92f9f0330a53d1afd32fe1cf50bbff59bf7b2e3fe08334a93021e3ca4ee4d8ccf0fde4fd2079b80339e5883bf23c5a359f67bb4ea7389d337dde21
-  data.tar.gz: 669a149ee5bdc12e2459a2c4c773017f2a5e8a28704d93361e8ad1a45d0618c4cf8155c702a6bbe5accaf433591f2f11c9a1126daca86f5b1f987979e081c0c4
+  metadata.gz: 33f504f27fad28dd842e8cc0c8e1766e77dc1561b6fbd93e9b798ee29f72355431f7acca0007cdf0b82d2d131b82b4d3b6bb116d0190c12889dcf4bcc2f96699
+  data.tar.gz: fd3270a95699a8cc7c9bedbda1b0ec3cc46a2bf31ff06f363e50b1d5f6dbd459b83487bbf2a8f6ae09793bffe5fdadcb16e8ae5a044f22e0564a413238f5dd14

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/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_extensions.rb

@@ -3,7 +3,9 @@ module CanvasOauth
     def self.build(canvas_url, user_id, tool_consumer_instance_guid)
       refresh_token = CanvasOauth::Authorization.fetch_refresh_token(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)
+      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, 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.3"
 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.3
 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-09 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