panda_pal 5.19.0.beta2 → 5.19.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8433b20262277ab9a0e66156b4fb2b865919cbfe73701202c163b1dd4c063c9
-  data.tar.gz: fba4d18d40156ccf1799c33b4b2a5aed33b71c6e0e772a65df04c586f207503f
+  metadata.gz: dc0521710ced7088a0342c4af3b5fc5e0435b3578aafe0ae1223ea98024e78ee
+  data.tar.gz: 48fb53a3d5522496fc93e8f74f4ceff4c3e510c5a8c74a2a16b4b5a83a7e1294
 SHA512:
-  metadata.gz: 33e70423978afce311e1e0d4a5eecddc17e8814e922bea12e854b1b57135cc336e1c418b6f8d0fcca061c4a25485164dab1468805639d16abd6f1c1951f7b4cb
-  data.tar.gz: fa08843f3ad5d268203908c22725c546825102127cce6858c907a84b21e0a58561fab5f1e017b569cb95abd5e42c1715045b699b7790f899e7bbabfbf8f9693c
+  metadata.gz: eceb5025a2c539f4ca2c9d6a2757d34595cc8071a30d34b988310ee06cf5e8224d4b514b8cc73bb0f871f2c810d31070c09c4fa3b6d58d61d5f65344aef35d4e
+  data.tar.gz: 23402bf99ee96e7ecd37bda8750e5463cf12361c703d38112d464bfa8314ca666ff8bc66cfac3d59205cb3874e7d0613e076be0b55cbb4ecd36674ffda2d285c

data/app/models/panda_pal/platform/canvas.rb

@@ -148,28 +148,16 @@ module PandaPal
             scope_tool = existing_installs[0]
 
             # Don't need to do an update if it already exists - Settings are stored on the LTI Key instead of the installation
-            if tool != PandaPal::DEFAULT_TOOL
-              scope_tool ||= bearcat_client.send(:"create_#{ctype}_external_tool", cid, {
+            new_install = !scope_tool
+            scope_tool ||= _with_lti_registration_unlocked(ekey) do
+              bearcat_client.send(:"create_#{ctype}_external_tool", cid, {
                 client_id: ekey[:id],
               })
+            end
 
-              lti_registrations.find_or_create_by!(
-                tool: tool.to_s,
-                client_id: ekey[:id].to_s,
-                deployment_id: (scope_tool[:deployment_id].presence&.to_s if dedicated_deployment),
-              )
-            elsif !scope_tool
-              scope_tool = bearcat_client.send(:"create_#{ctype}_external_tool", cid, {
-                client_id: ekey[:id],
-              })
-
-              new_client_id = "#{ekey[:id]}"
-              new_client_id += "/#{scope_tool[:deployment_id]}" if dedicated_deployment
-
-              self.key = new_client_id
-              self.secret = ekey[:api_key]
-
-              save! if changed?
+            # The default tool's key only moves with a new install; other tools always (re)register
+            if new_install || tool != PandaPal::DEFAULT_TOOL
+              _register_lti_v1p3_key(tool, ekey, deployment_id: (scope_tool[:deployment_id].presence&.to_s if dedicated_deployment))
             end
 
             @new_lti_installation = scope_tool
@@ -244,7 +232,8 @@ module PandaPal
 
         valid_redirect_uris.uniq!
 
-        if !ekey
+        created = !ekey
+        if created
           # Create New
           ekey = bearcat_client.post("api/lti/accounts/self/developer_keys/tool_configuration", {
             developer_key: {
@@ -270,6 +259,10 @@ module PandaPal
 
         ekey = ekey[:developer_key] || ekey
 
+        # Record a new key right away, so a failed install is retried against
+        # this key instead of creating yet another one.
+        _register_lti_v1p3_key(tool, ekey) if created
+
         if ekey[:developer_key_account_binding][:workflow_state] == "off"
           bearcat_client.post("api/v1/accounts/self/developer_keys/#{ekey[:id]}/developer_key_account_bindings", {
             developer_key_account_binding: {
@@ -281,6 +274,42 @@ module PandaPal
         ekey
       end
 
+      # Points this Organization (default tool) or an LtiRegistration (other
+      # tools) at a v1.3 Developer Key.
+      def _register_lti_v1p3_key(tool, ekey, deployment_id: nil)
+        client_id = ekey[:id].to_s
+
+        if tool == PandaPal::DEFAULT_TOOL
+          self.key = deployment_id ? "#{client_id}/#{deployment_id}" : client_id
+          self.secret = ekey[:api_key] if ekey[:api_key].present?
+          save! if changed?
+        else
+          lti_registrations.find_or_create_by!(tool: tool.to_s, client_id: client_id, deployment_id: deployment_id)
+          # Drop the deployment-less placeholder recorded when the key was created
+          lti_registrations.where(tool: tool.to_s, client_id: client_id, deployment_id: nil).delete_all if deployment_id
+        end
+      end
+
+      # Canvas creates LTI Registrations with lock_deploying on, which blocks
+      # installing by client_id (when lock_lti_registrations is enabled). Unlock
+      # for the duration of the block, then put the lock back as it was.
+      def _with_lti_registration_unlocked(ekey)
+        registration_id = ekey[:lti_registration_id]
+        return yield unless registration_id.present?
+
+        registration_url = "api/v1/accounts/self/lti_registrations/#{registration_id}"
+        registration = bearcat_client.get(registration_url)
+        # Inherited registrations can only be changed by their owning account
+        return yield unless registration[:lock_deploying] && !registration[:inherited]
+
+        bearcat_client.put(registration_url, { lock_deploying: false })
+        begin
+          yield
+        ensure
+          bearcat_client.put(registration_url, { lock_deploying: true })
+        end
+      end
+
       def _find_existing_installs(context, exists: nil, &matcher)
         ctype, cid = _parse_lti_context(context)
 

data/lib/panda_pal/version.rb

@@ -1,3 +1,3 @@
 module PandaPal
-  VERSION = '5.19.0.beta2'
+  VERSION = '5.19.0.beta3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panda_pal
 version: !ruby/object:Gem::Version
-  version: 5.19.0.beta2
+  version: 5.19.0.beta3
 platform: ruby
 authors:
 - Instructure CustomDev