canvas_link_migrator 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db94154546720e46dbc316e28fd6b42ee03c51ee13df32d1601924fd78d158d6
-  data.tar.gz: f4a71b858889356c765fcce8360d6266b1b4cd43648cd99eed291287a5229dcb
+  metadata.gz: 38b2eee1dd99763edbef1c28dc90e5e47c6fb1d0d9d533fca3e0c519de0819d3
+  data.tar.gz: 0ab502f07ec831d35a77d8e0fb3bc4d2b04f2ea2579dce5cf16c9b3670a6bdca
 SHA512:
-  metadata.gz: f2499b2e3764c0bf76ae4f840345104cae6187e970c4bd8f8965254836387221ae84c96041527824fd27edeff602587afb21f629b062c6e83b74e80defd14997
-  data.tar.gz: 49c3e7eb354ea51183ad44706002bb3c92dbc2c98db12371fc420f00eb2616e19fd4b6a8c3e01345d69c7d8b2b81ba71b79341f7ea2802ee8b738b3c56c3a349
+  metadata.gz: be0b2b35cf07e574cf02e9fe70e63c26246126ad058d390a4a7db84917eb24ad56d6c5d77d2a3d683d8c23319922161630dca35990e4a2afd9f76dc1df38c97b
+  data.tar.gz: 9ddeed1d503d7c50c1f8be3b8357fe739c3c8e59aa1e05e2eded14956bfedcac90274803b74f932950f6e5210e6d5b3870cbbdfd793d5736634eba8fa1cd56b6

data/lib/canvas_link_migrator/link_parser.rb

@@ -19,7 +19,6 @@
 
 require "nokogiri"
 require "digest"
-require "addressable"
 
 module CanvasLinkMigrator
   class LinkParser
@@ -144,12 +143,7 @@ module CanvasLinkMigrator
         url.gsub!("%24#{ref}%24", "$#{ref}$")
       end
 
-      begin
-        result = parse_url(url, node, attr)
-      rescue Addressable::URI::InvalidURIError
-        return
-      end
-
+      result = parse_url(url, node, attr)
       if result[:resolved]
         # resolved, just replace and carry on
         new_url = result[:new_url] || url

data/lib/canvas_link_migrator/link_resolver.rb

@@ -18,6 +18,7 @@
 # with this program. If not, see <http://www.gnu.org/licenses/>.
 
 require "active_support/core_ext/object"
+require "addressable"
 require "rack"
 
 module CanvasLinkMigrator
@@ -44,6 +45,14 @@ module CanvasLinkMigrator
       @attachment_path_id_lookup_lower ||= attachment_path_id_lookup&.transform_keys(&:downcase)
     end
 
+    def add_verifier_to_query(url, uuid)
+      parsed_url = Addressable::URI.parse(url)
+      parsed_url.query_values = (parsed_url.query_values || {}).merge("verifier" => uuid)
+      parsed_url.to_s
+    rescue Addressable::InvalidURIError
+      url
+    end
+
     # finds the :new_value to use to replace the placeholder
     def resolve_link!(link)
       case link[:link_type]
@@ -71,13 +80,17 @@ module CanvasLinkMigrator
           linked_wiki_url = @migration_id_converter.convert_wiki_page_migration_id_to_slug(migration_id) || migration_id
           link[:new_value] = "#{context_path}/pages/#{linked_wiki_url}#{query}"
         elsif type == "attachments"
-          att_id = @migration_id_converter.convert_attachment_migration_id(migration_id)
+          att_id, uuid = @migration_id_converter.convert_attachment_migration_id(migration_id)
           if att_id
-            link[:new_value] = "#{context_path}/files/#{att_id}/preview"
+            new_url = "#{context_path}/files/#{att_id}/preview"
+            new_url = add_verifier_to_query(new_url, uuid) if uuid
+            link[:new_value] = new_url
           end
         elsif type == "media_attachments_iframe"
-          att_id = @migration_id_converter.convert_attachment_migration_id(migration_id)
-          link[:new_value] = att_id ? "/media_attachments_iframe/#{att_id}#{link[:query]}" : link[:old_value]
+          att_id, uuid = @migration_id_converter.convert_attachment_migration_id(migration_id)
+          new_url = att_id ? "/media_attachments_iframe/#{att_id}#{link[:query]}" : link[:old_value]
+          new_url = add_verifier_to_query(new_url, uuid) if uuid
+          link[:new_value] = new_url
         else
           object_id = @migration_id_converter.convert_migration_id(type, migration_id)
           if object_id
@@ -116,7 +129,7 @@ module CanvasLinkMigrator
         end
         link[:new_value] = new_url
       when :file_ref
-        file_id = @migration_id_converter.convert_attachment_migration_id(link[:migration_id])
+        file_id, uuid = @migration_id_converter.convert_attachment_migration_id(link[:migration_id])
         if file_id
           rest = link[:rest].presence
           rest ||= "/preview" unless link[:target_blank]
@@ -125,13 +138,15 @@ module CanvasLinkMigrator
           # context prepended to the URL. This prevents
           # redirects to non cross-origin friendly urls
           # during a file fetch
-          if rest&.include?("icon_maker_icon=1")
-            link[:new_value] = "/files/#{file_id}#{rest}"
-          elsif link[:in_media_iframe]
-            link[:new_value] = "/media_attachments_iframe/#{file_id}#{rest}"
-          else
-            link[:new_value] = "#{context_path}/files/#{file_id}#{rest}"
-          end
+          new_url = if rest&.include?("icon_maker_icon=1")
+                      "/files/#{file_id}#{rest}"
+                    elsif link[:in_media_iframe]
+                      "/media_attachments_iframe/#{file_id}#{rest}"
+                    else
+                      "#{context_path}/files/#{file_id}#{rest}"
+                    end
+          new_url = add_verifier_to_query(new_url, uuid) if uuid
+          link[:new_value] = new_url
         else
           link[:missing_url] = link[:old_value].partition("$CANVAS_COURSE_REFERENCE$").last
         end
@@ -200,6 +215,7 @@ module CanvasLinkMigrator
           # CCHelper::file_query_string
           params = Rack::Utils.parse_nested_query(qs.presence || "")
           qs = []
+          qs << "verifier=#{file["uuid"]}" if file["uuid"].present?
           new_action = ""
           params.each do |k, v|
             case k
@@ -217,23 +233,24 @@ module CanvasLinkMigrator
       new_url
     end
 
-    def media_attachment_iframe_url(file_id, media_type = nil)
+    def media_attachment_iframe_url(file_id, uuid = nil, media_type = nil)
       url = "/media_attachments_iframe/#{file_id}?embedded=true"
       url += "&type=#{media_type}" if media_type.present?
+      url += "&verifier=#{uuid}" if uuid.present?
       url
     end
 
     def resolve_media_data(node, rel_path)
       if rel_path && (file = find_file_in_context(rel_path[/^[^?]+/])) # strip query string for this search
-        media_id = file.try(:media_object)&.media_id || file["media_entry_id"]
+        media_id = file["media_entry_id"]
         node["data-media-id"] = media_id # safe to delete?
-        media_attachment_iframe_url(file["id"], node["data-media-type"])
+        media_attachment_iframe_url(file["id"], file["uuid"], node["data-media-type"])
       elsif rel_path&.match(/\/media_attachments_iframe\/\d+/)
         # media attachment from another course or something
         rel_path
       elsif node["data-media-id"].present?
-        file = @migration_id_converter.lookup_attachment_by_media_id(node["data-media-id"])
-        file ? media_attachment_iframe_url(file["id"], node["data-media-type"]) : nil
+        file_id, uuid = @migration_id_converter.convert_attachment_media_id(node["data-media-id"])
+        file_id ? media_attachment_iframe_url(file_id, uuid, node["data-media-type"]) : nil
       else
         node.delete("class")
         node.delete("id")

data/lib/canvas_link_migrator/resource_map_service.rb

@@ -89,7 +89,19 @@ module CanvasLinkMigrator
     end
 
     def convert_attachment_migration_id(migration_id)
-      resources.dig("files", migration_id, "destination", "id")
+      resources.dig("files", migration_id, "destination")&.slice("id", "uuid")&.values
+    end
+
+    def media_map
+      @media_map ||= resources["files"].each_with_object({}) do |(_mig_id, file), map|
+        media_id = file.dig("destination", "media_entry_id")
+        next unless media_id
+        map[media_id] = file
+      end
+    end
+
+    def convert_attachment_media_id(media_id)
+      media_map.dig(media_id, "destination")&.slice("id", "uuid")&.values
     end
 
     def convert_migration_id(type, migration_id)
@@ -106,17 +118,5 @@ module CanvasLinkMigrator
     def lookup_attachment_by_migration_id(migration_id)
       resources.dig("files", migration_id, "destination")
     end
-
-    def media_map
-      @media_map ||= resources["files"].each_with_object({}) do |(_mig_id, file), map|
-        media_id = file.dig("destination", "media_entry_id")
-        next unless media_id
-        map[media_id] = file
-      end
-    end
-
-    def lookup_attachment_by_media_id(media_id)
-      media_map.dig(media_id, "destination")
-    end
   end
 end

data/lib/canvas_link_migrator/version.rb

@@ -1,3 +1,3 @@
 module CanvasLinkMigrator
-  VERSION = "1.0.9"
+  VERSION = "1.0.11"
 end

data/spec/canvas_link_migrator/imported_html_converter_spec.rb

@@ -75,7 +75,7 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
         it "converts data-download-url for files without appending a context" do
           html, bad_links = subject
           expect(html).to eq(
-            "<img src=\"#{@path}files/5/download?download_frd=1\" alt=\"\" data-inst-icon-maker-icon=\"true\" data-download-url=\"/files/5/download?download_frd=1&icon_maker_icon=1\">"
+            "<img src=\"#{@path}files/5/download?download_frd=1&verifier=u5\" alt=\"\" data-inst-icon-maker-icon=\"true\" data-download-url=\"/files/5/download?download_frd=1&icon_maker_icon=1&verifier=u5\">"
           )
           expect(bad_links).to be_nil
         end
@@ -83,7 +83,7 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
 
       it "finds an attachment by migration id" do
         test_string = %{<p>This is an image: <br /><img src="%24CANVAS_OBJECT_REFERENCE%24/attachments/F" alt=":(" /></p>}
-        expect(@converter.convert_exported_html(test_string)).to eq([%{<p>This is an image: <br><img src="#{@path}files/6/preview" alt=":("></p>}, nil])
+        expect(@converter.convert_exported_html(test_string)).to eq([%{<p>This is an image: <br><img src="#{@path}files/6/preview?verifier=u6" alt=":("></p>}, nil])
       end
 
       it "leaves relative user attachments alone" do
@@ -106,20 +106,20 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
         expect(bad_links[0]).to include({ link_type: :file, missing_url: "/courses/2/file_contents/course%20files/test.png" })
 
         expect(@converter.link_resolver).to receive(:attachment_path_id_lookup).twice.and_call_original
-        expect(@converter.convert_exported_html(test_string)).to eq([%{<p>This is an image: <br><img src="#{@path}files/5/preview" alt=":("></p>}, nil])
+        expect(@converter.convert_exported_html(test_string)).to eq([%{<p>This is an image: <br><img src="#{@path}files/5/preview?verifier=u5" alt=":("></p>}, nil])
       end
 
       it "finds an attachment by a path with a space" do
         test_string = %(<img src="subfolder/with%20a%20space/test.png" alt="nope" />)
-        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/6/preview" alt="nope">), nil])
+        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/6/preview?verifier=u6" alt="nope">), nil])
 
         test_string = %(<img src="subfolder/with+a+space/test.png" alt="nope" />)
-        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/6/preview" alt="nope">), nil])
+        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/6/preview?verifier=u6" alt="nope">), nil])
       end
 
       it "finds an attachment even if the link has an extraneous folder" do
         test_string = %(<img src="anotherfolder/subfolder/test.png" alt="nope" />)
-        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/7/preview" alt="nope">), nil])
+        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/7/preview?verifier=u7" alt="nope">), nil])
       end
 
       it "finds an attachment by path if capitalization is different" do
@@ -127,18 +127,18 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
         expect(@converter.link_resolver).to receive(:attachment_path_id_lookup).twice.and_return({ "subfolder/withcapital/test.png" => "F" })
 
         test_string = %(<img src="subfolder/WithCapital/TEST.png" alt="nope" />)
-        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/6/preview" alt="nope">), nil])
+        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/6/preview?verifier=u6" alt="nope">), nil])
       end
 
       it "finds an attachment with query params" do
         test_string = %(<img src="%24IMS_CC_FILEBASE%24/test.png?canvas_customaction=1&canvas_qs_customparam=1" alt="nope" />)
-        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/5/customaction?customparam=1" alt="nope">), nil])
+        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/5/customaction?verifier=u5&customparam=1" alt="nope">), nil])
 
         test_string = %(<img src="%24IMS_CC_FILEBASE%24/test.png?canvas_qs_customparam2=3" alt="nope" />)
-        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/5/preview?customparam2=3" alt="nope">), nil])
+        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/5/preview?verifier=u5&customparam2=3" alt="nope">), nil])
 
         test_string = %(<img src="%24IMS_CC_FILEBASE%24/test.png?notarelevantparam" alt="nope" />)
-        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/5/preview" alt="nope">), nil])
+        expect(@converter.convert_exported_html(test_string)).to eq([%(<img src="#{@path}files/5/preview?verifier=u5" alt="nope">), nil])
       end
     end
 
@@ -221,9 +221,9 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
 
       expected_string = <<~HTML.strip
         <p>
-          with media object url: <iframe id="media_comment_m-stuff" class="instructure_inline_media_comment video_comment" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/5?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe>
-          with file content url: <iframe id="media_comment_0_bq09qam2" class="instructure_inline_media_comment video_comment" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/6?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="0_bq09qam2"></iframe>
-          with mediahref url: <iframe data-media-type="video" src="/media_attachments_iframe/9?type=video&embedded=true" data-media-id="m-yodawg"></iframe>
+          with media object url: <iframe id="media_comment_m-stuff" class="instructure_inline_media_comment video_comment" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/5?embedded=true&amp;type=video&amp;verifier=u5" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe>
+          with file content url: <iframe id="media_comment_0_bq09qam2" class="instructure_inline_media_comment video_comment" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/6?embedded=true&amp;type=video&amp;verifier=u6" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="0_bq09qam2"></iframe>
+          with mediahref url: <iframe data-media-type="video" src="/media_attachments_iframe/9?embedded=true&type=video&verifier=u9" data-media-id="m-yodawg"></iframe>
         </p>
       HTML
 
@@ -272,8 +272,8 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
       HTML
       expected_string = <<~HTML.strip
         <p>
-          with wrong file in href: <iframe class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/5?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe><br><br>
-          with no href: <iframe class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff" style="width: 320px; height: 240px; display: inline-block;" title="" data-media-type="video" src="/media_attachments_iframe/5?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe><br><br>
+          with wrong file in href: <iframe class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff" style="width: 320px; height: 240px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/5?embedded=true&amp;type=video&amp;verifier=u5" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe><br><br>
+          with no href: <iframe class="instructure_inline_media_comment video_comment" id="media_comment_m-stuff" style="width: 320px; height: 240px; display: inline-block;" title="" data-media-type="video" src="/media_attachments_iframe/5?embedded=true&amp;type=video&amp;verifier=u5" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"></iframe><br><br>
         </p>
       HTML
       expect(@converter.convert_exported_html(test_string)).to eq([expected_string, nil])
@@ -281,33 +281,33 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
 
     it "converts old RCE media object iframes" do
       test_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_objects_iframe/m-lolcat?type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
-      replacement_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/8?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
+      replacement_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/8?embedded=true&amp;type=video&amp;verifier=u8" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([replacement_string, nil])
     end
 
     it "handles and repair half broken new RCE media iframes" do
       test_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="%24IMS_CC_FILEBASE%24/#" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
-      repaired_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/8?embedded=true&amp;type=video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
+      repaired_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" src="/media_attachments_iframe/8?embedded=true&amp;type=video&amp;verifier=u8" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([repaired_string, nil])
     end
 
     it "converts source tags to RCE media iframes" do
       test_string = %(<video style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat"><source src="/media_objects_iframe/m-lolcat?type=video" data-media-id="m-lolcat" data-media-type="video"></video>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat" src="/media_attachments_iframe/8?embedded=true&amp;type=video"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-lolcat" src="/media_attachments_iframe/8?embedded=true&amp;type=video&amp;verifier=u8"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
 
       test_string = %(<audio style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-yodawg"><source src="/media_objects_iframe/m-yodawg?type=audio" data-media-id="m-yodawg" data-media-type="audio"></audio>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-yodawg" src="/media_attachments_iframe/9?embedded=true&amp;type=audio"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-yodawg" src="/media_attachments_iframe/9?embedded=true&amp;type=audio&amp;verifier=u9"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
     end
 
     it "converts source tags to RCE media attachment iframes" do
       test_string = %(<video style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-stuff"><source src="$IMS-CC-FILEBASE$/subfolder/with a space/yodawg.mov?canvas_=1&canvas_qs_type=video&canvas_qs_amp=&canvas_qs_embedded=true&media_attachment=true" data-media-id="m-stuff" data-media-type="video"></video>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg" src="/media_attachments_iframe/9?embedded=true&amp;type=video"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg" src="/media_attachments_iframe/9?embedded=true&amp;type=video&amp;verifier=u9"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
 
       test_string = %(<audio style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-stuff"><source src="$IMS-CC-FILEBASE$/lolcat.mp3?canvas_=1&canvas_qs_type=audio&canvas_qs_amp=&canvas_qs_embedded=true&media_attachment=true" data-media-id="m-stuff" data-media-type="audio"></video>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat" src="/media_attachments_iframe/8?embedded=true&amp;type=audio"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat" src="/media_attachments_iframe/8?embedded=true&amp;type=audio&amp;verifier=u8"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
     end
 
@@ -323,11 +323,11 @@ describe CanvasLinkMigrator::ImportedHtmlConverter do
 
     it "converts course copy style media attachmet iframe links" do
       test_string = %(<video style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg"><source src="$CANVAS_COURSE_REFERENCE$/file_ref/I?media_attachment=true&type=video" data-media-id="m-yodawg" data-media-type="video"></video>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg" src="/media_attachments_iframe/9?type=video&embedded=true"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="video" allowfullscreen="allowfullscreen" allow="fullscreen" data-media-id="m-yodawg" src="/media_attachments_iframe/9?embedded=true&type=video&verifier=u9"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
 
       test_string = %(<audio style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat"><source src="$CANVAS_COURSE_REFERENCE$/file_ref/H?media_attachment=true&type=audio" data-media-id="m-lolcat" data-media-type="audio"></audio>)
-      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat" src="/media_attachments_iframe/8?type=audio&embedded=true"></iframe>)
+      converted_string = %(<iframe style="width: 400px; height: 225px; display: inline-block;" title="this is a media comment" data-media-type="audio" data-media-id="m-lolcat" src="/media_attachments_iframe/8?embedded=true&type=audio&verifier=u8"></iframe>)
       expect(@converter.convert_exported_html(test_string)).to eq([converted_string, nil])
     end
 

data/spec/canvas_link_migrator/link_resolver_spec.rb

@@ -48,25 +48,25 @@ describe CanvasLinkMigrator::LinkResolver do
     it "converts file_ref urls" do
       link = { link_type: :file_ref, migration_id: "F" }
       resolver.resolve_link!(link)
-      expect(link[:new_value]).to eq("/courses/2/files/6/preview")
+      expect(link[:new_value]).to eq("/courses/2/files/6/preview?verifier=u6")
     end
 
     it "does not suffix /preview to target blank links" do
       link = { link_type: :file_ref, target_blank: true, migration_id: "F" }
       resolver.resolve_link!(link)
-      expect(link[:new_value]).to eq("/courses/2/files/6")
+      expect(link[:new_value]).to eq("/courses/2/files/6?verifier=u6")
     end
 
     it "converts attachment urls" do
       link = { link_type: :object, type: "attachments", migration_id: "E", query: "?foo=bar" }
       resolver.resolve_link!(link)
-      expect(link[:new_value]).to eq("/courses/2/files/5/preview")
+      expect(link[:new_value]).to eq("/courses/2/files/5/preview?verifier=u5")
     end
 
     it "converts media_attachments_iframe urls" do
       link = { link_type: :object, type: "media_attachments_iframe", migration_id: "F", query: "?foo=bar" }
       resolver.resolve_link!(link)
-      expect(link[:new_value]).to eq("/media_attachments_iframe/6?foo=bar")
+      expect(link[:new_value]).to eq("/media_attachments_iframe/6?foo=bar&verifier=u6")
     end
 
     it "converts discussion_topic links" do

data/spec/fixtures/canvas_resource_map.json

@@ -50,49 +50,60 @@
       "E": {
         "destination": {
           "id": "5",
-          "media_entry_id": "m-stuff"
+          "media_entry_id": "m-stuff",
+          "uuid": "u5"
         },
         "source": {
           "id": "3",
-          "media_entry_id": "m-stuff"
+          "media_entry_id": "m-stuff",
+          "uuid": "u3"
         }
       },
       "F": {
         "destination": {
           "id": "6",
-          "media_entry_id": "0_bq09qam2"
+          "media_entry_id": "0_bq09qam2",
+          "uuid": "u6"
         },
         "source": {
           "id": "4",
-          "media_entry_id": "0_bq09qam2"
+          "media_entry_id": "0_bq09qam2",
+          "uuid": "u4"
         }
       },
       "G": {
         "destination": {
-          "id": "7"
+          "id": "7",
+          "uuid": "u7"
         },
         "source": {
-          "id": "2"
+          "id": "2",
+          "uuid": "u2"
         }
       },
       "H": {
         "destination": {
           "id": "8",
-          "media_entry_id": "m-lolcat"
+          "media_entry_id": "m-lolcat",
+          "uuid": "u8"
+
         },
         "source": {
           "id": "3",
-          "media_entry_id": "m-lolcat"
+          "media_entry_id": "m-lolcat",
+          "uuid": "u3"
         }
       },
       "I": {
         "destination": {
           "id": "9",
-          "media_entry_id": "m-yodawg"
+          "media_entry_id": "m-yodawg",
+          "uuid": "u9"
         },
         "source": {
           "id": "4",
-          "media_entry_id": "m-yodawg"
+          "media_entry_id": "m-yodawg",
+          "uuid": "u4"
         }
       }
     },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_link_migrator
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Mysti Lilla
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="