canvas_sync 0.26.0.beta3 → 0.26.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d9a7ca1c4977531695e3a9b2dd906e661a07527272424f5ee60ad6cc05c64cea
4
- data.tar.gz: 7771201b79a64de81d71e7c8ce648d513ab0a43f963c179677b777af88ab73d1
3
+ metadata.gz: 4df6839f29a0cd2bf0dfe0f3203a117ccc1bc14c1422a2d2bbb8020fed7a29e5
4
+ data.tar.gz: f07f9efcf576dce523e34dd4ee77819ed5ceb502265fb0f167659a34e53db8c2
5
5
  SHA512:
6
- metadata.gz: 0da82d015af89d0c926952c908952e229b78658c601c39da35f2acfde7fcef42c924ff374cb80c3d2bf348edfb1f388cd3b6dbeae444ceff56c0a6bd88678fdf
7
- data.tar.gz: 1fae55b2a72ea81bfa372eab3e47e9cc89a41e1c126f320b8269a7c9e013daf2e70c52642d33a920416046a0cbb0270552bc09465ccf8ecc3b19ccaf563dd7d8
6
+ metadata.gz: a633c8a2c949083c1b5d177235283dda2a959d6471519034265e585daf3b2305b4f7832cc8a8ee0b9b2839ba8625834fc37b7c4a34fb3d3be2c563d638b433ab
7
+ data.tar.gz: 4f173ff8a8437776e2cb37ce321c8fc826ee01119a6e5ec6f05d54793d303d570d51ae63de2b2a03b0e531740597d5b752a10cef7bc4a325f736ced1595f6ec0
@@ -22,7 +22,14 @@ module CanvasSync::Concerns
22
22
  return @user if defined?(@user)
23
23
 
24
24
  canvas_user_id = panda_pal_session.get_lti_cust_param('custom_canvas_user_id')
25
- @user = load_canvas_model(::User, canvas_user_id) if canvas_user_id.present?
25
+ if canvas_user_id.present?
26
+ begin
27
+ @user = load_canvas_model(::User, canvas_user_id)
28
+ rescue Footrest::HttpError::NotFound => err
29
+ # Mainly catches SiteAdmin users not found via the API
30
+ @user = nil
31
+ end
32
+ end
26
33
  @user
27
34
  end
28
35
 
@@ -19,7 +19,10 @@ module CanvasSync::Concerns
19
19
  context.instance_variable_set(:@api_response, api_response)
20
20
 
21
21
  api_sync_race_create!(rec, save: true) do |inst2|
22
- throw :jit_found, inst2 unless inst2 === rec # Some other thread ended up creating the record before us, so assume that it handled everything beyond this point
22
+ # Some other thread ended up creating the record before us, so assume that it handled
23
+ # everything beyond this point, including the after_jit_sync hooks
24
+ throw :jit_found, inst2 unless inst2 === rec
25
+
23
26
  inst2.assign_from_api_params(api_response)
24
27
  end
25
28
 
@@ -1,3 +1,3 @@
1
1
  module CanvasSync
2
- VERSION = "0.26.0.beta3".freeze
2
+ VERSION = "0.26.1".freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: canvas_sync
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.26.0.beta3
4
+ version: 0.26.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Instructure CustomDev