canvas_sync 0.27.3 → 0.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 778924d69dbb2a1f29a6e9b5101851ebda4042536949619b1aa5a2ebdd0f1f69
-  data.tar.gz: 06ce5ef0c498612f864dd54f817cb24200b9f64d6dcce644ab235ba784bd4d79
+  metadata.gz: d6f24c18ebf86f750d70099ea3e005f7036a757b37585c6b90e8cb8118320a6d
+  data.tar.gz: 1228fee5adaec59e4fbd29b464950d2a1a60e0f4d3d0fd2dfacdacb36ae800e8
 SHA512:
-  metadata.gz: 571f4296981c5fd72386d6b58d68864f719340da7862b4a5720a5d21d7ba5d146c23e1cfaf2f88b33c55bf80b0b02dd174a22e49519eecea8793b82d7c95b883
-  data.tar.gz: 484661a54a3b0fbeee189b9ee64e9554e6baa455da0ef3ed641327c71ba7cfbb40ddcab8394c23f4992f6d98447afe5c7abf58c56f225ef0fdf2689f7f8dfb1c
+  metadata.gz: dad20a38ebc24dfb459f6993ad9a24e02a40f5a6c68c4403df3bb90500b0676857e07fb93a582fcd5b28c0a78501d823143c3364e93fbb9a3d9f40134a9af2da
+  data.tar.gz: fefc18626e5222c0402a399ca8caf3c131e9cebe0ce16df6233ce3cba9904839f0ffc7ccebe3deee2cd7695c2db33735957662935340695a63592385449a91ca

data/app/controllers/canvas_sync/api/v1/live_events_controller.rb

@@ -46,7 +46,9 @@ module CanvasSync::Api
           event = JSON.parse(request.raw_post) rescue nil
         end
 
-        event ||= JSON::JWT.decode(params[:_json], dataservices_jwks)
+        jwt = params[:_json] || request.raw_post
+        jwt = jwt.strip.gsub(/^"(.*)"$/, '\1') if jwt.is_a?(String) # Strip quotes if quoted
+        event ||= JSON::JWT.decode(jwt, dataservices_jwks)
         event = event.to_h.with_indifferent_access
 
         Rails.logger.debug("Processing event type: #{event['metadata']['event_name']}")

data/lib/canvas_sync/jobs/report_starter.rb

@@ -51,7 +51,7 @@ module CanvasSync
       def process(file)
         processor_class_name = options[:legacy_report_starter][:processor]
         processor_class = processor_class_name.constantize
-        account_id = options[:account_id] || batch_context[:account_id] || "self"
+        account_id = options[:account_id] || context[:account_id] || "self"
 
         # The old processor signature: process(file_path, options, report_id)
         # Note: The third param was report_id in ReportProcessorJob but was account_id in practice

data/lib/canvas_sync/jobs/report_sync_task.rb

@@ -216,7 +216,7 @@ module CanvasSync
 
           case report_status["status"].downcase
           when "complete"
-            ProcessJob.perform_later(report_status["attachment"]["url"])
+            report_task.class::ProcessJob.perform_later(report_status["attachment"]["url"])
           when "error", "deleted"
             max_tries = options[:report_max_tries] || batch_context[:report_max_tries] || report_task.max_tries || MAX_TRIES
             report_attempt = batch_context[:report_attempt]

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.27.3".freeze
+  VERSION = "0.27.5".freeze
 end

data/spec/canvas_sync/live_events/live_events_controller_spec.rb

@@ -50,5 +50,21 @@ RSpec.describe CanvasSync::Api::V1::LiveEventsController, type: :controller do
       post :process_event, params: { "_json" => event.to_json }
       expect(response).to_not be_successful
     end
+
+    it "supports application/jwt" do
+      expect(controller).to receive(:dispatch_event)
+      expect(controller).to receive(:validate_tenant!)
+      request.headers['Content-Type'] = 'application/jwt'
+      post :process_event, body: JSON::JWT.new(event).sign(jwk).to_s
+      expect(response).to be_successful
+    end
+
+    it "supports application/jwt (quoted)" do
+      expect(controller).to receive(:dispatch_event)
+      expect(controller).to receive(:validate_tenant!)
+      request.headers['Content-Type'] = 'application/jwt'
+      post :process_event, body: %["#{JSON::JWT.new(event).sign(jwk).to_s}"]
+      expect(response).to be_successful
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,9 @@ Bundler.require :default, :development
 Combustion::Application.configure do
   config.enable_reloading = true # Required for with_model
 end
+
+# Register application/jwt MIME type for testing
+Mime::Type.register "application/jwt", :jwt
 Combustion.initialize! :active_record, :active_job
 
 require 'rspec/rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.27.3
+  version: 0.27.5
 platform: ruby
 authors:
 - Instructure CustomDev